Commit graph

22590 commits

Author SHA1 Message Date
Tristan Darricau
1b0aceee48 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12120] Add nicofuma to the developers
2014-07-02 22:56:03 +02:00
Tristan Darricau
868179c295 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12120] Add nicofuma to the developers

Conflicts:
	phpBB/docs/AUTHORS
2014-07-02 22:55:00 +02:00
Tristan Darricau
a6d66b2ab0 Merge pull request #2685 from nickvergessen/ticket/12120
[ticket/12120] Add nicofuma to the developers

* nickvergessen/ticket/12120:
  [ticket/12120] Add nicofuma to the developers
2014-07-02 22:43:12 +02:00
Joas Schilling
eff07032c0 [ticket/12120] Add nicofuma to the developers
PHPBB3-12120
2014-07-02 22:26:32 +02:00
Joas Schilling
4487b6f4c8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12790] Use \phpbb\db\driver\driver_interface in prune_shadow_topics
2014-07-01 20:48:06 +02:00
Joas Schilling
b83c623480 Merge pull request #2681 from Nicofuma/ticket/12790
[ticket/12790] Use \phpbb\db\driver\driver_interface in prune_shadow_topics

* Nicofuma/ticket/12790:
  [ticket/12790] Use \phpbb\db\driver\driver_interface in prune_shadow_topics
2014-07-01 20:47:57 +02:00
Tristan Darricau
2b729c67bd [ticket/12790] Use \phpbb\db\driver\driver_interface in prune_shadow_topics
PHPBB3-12790
2014-07-01 19:46:19 +02:00
Dhruv
a99725d27c Merge branch 'develop-ascraeus' into develop
# By Oliver Schramm
# Via Dhruv (1) and Oliver Schramm (1)
* develop-ascraeus:
  [ticket/12674] Use user's colour in 'Last edited' line in sent PMs
2014-07-01 00:36:45 +05:30
Dhruv
54a143c968 Merge remote-tracking branch 'Elsensee/ticket/12674' into develop-ascraeus
# By Oliver Schramm
# Via Oliver Schramm
* Elsensee/ticket/12674:
  [ticket/12674] Use user's colour in 'Last edited' line in sent PMs
2014-07-01 00:35:45 +05:30
Dhruv
edc07c9f9d Merge branch 'develop-ascraeus' into develop
# By Joas Schilling
# Via Dhruv Goel (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12779] Change order of file lists on automatic update
2014-07-01 00:28:49 +05:30
Dhruv Goel
f870bc0f18 Merge pull request #2677 from nickvergessen/ticket/12779
[ticket/12779] Change order of file lists on automatic update
2014-07-01 00:27:55 +05:30
Oliver Schramm
6d1403cb13 [ticket/12674] Use user's colour in 'Last edited' line in sent PMs
PHPBB3-12674
2014-06-30 00:01:14 +02:00
Joas Schilling
7ad88ba32b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12777] Add tests for unavailable extension
  [ticket/12777] Add tests
  [ticket/12777] Add is_purged()
  [ticket/12777] Update doc block of is_configured()
  [ticket/12777] Rename extension status functions and add is_configured()
2014-06-29 23:41:28 +02:00
Joas Schilling
5652f33ccc Merge pull request #2669 from Nicofuma/ticket/12777
[ticket/12777] Rename extension status functions and add is_configured()

* Nicofuma/ticket/12777:
  [ticket/12777] Add tests for unavailable extension
  [ticket/12777] Add tests
  [ticket/12777] Add is_purged()
  [ticket/12777] Update doc block of is_configured()
  [ticket/12777] Rename extension status functions and add is_configured()
2014-06-29 23:33:47 +02:00
Joas Schilling
97725db3f4 [ticket/12779] Change order of file lists on automatic update
Also allow collapsing all the groups and collapse categories without user
interaction per default

PHPBB3-12779
2014-06-29 22:13:33 +02:00
Tristan Darricau
daeb635d6c [ticket/12777] Add tests for unavailable extension
PHPBB3-12777
2014-06-27 18:35:35 +02:00
Tristan Darricau
e6b8ae6bd5 [ticket/12777] Add tests
PHPBB3-12777
2014-06-27 16:53:14 +02:00
Joas Schilling
fb3baba3e0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12716] Use a string as session_id
  [ticket/12716] Add regression test
  [ticket/12716] Add the missing parameters in the call of clearToken
2014-06-27 16:00:42 +02:00
Joas Schilling
404c2f1144 Merge pull request #2598 from Nicofuma/ticket/12716
[ticket/12716] Add the missing parameters in the call of clearToken

* Nicofuma/ticket/12716:
  [ticket/12716] Use a string as session_id
  [ticket/12716] Add regression test
  [ticket/12716] Add the missing parameters in the call of clearToken
2014-06-27 16:00:29 +02:00
Joas Schilling
b228b0e1f9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12764] Properly handle errors upon connecting to MySQLi database
2014-06-27 15:39:24 +02:00
Joas Schilling
919e1a6bc8 Merge pull request #2660 from marc1706/ticket/12764
[ticket/12764] Properly handle errors upon connecting to MySQLi database

* marc1706/ticket/12764:
  [ticket/12764] Properly handle errors upon connecting to MySQLi database
2014-06-27 15:39:07 +02:00
Joas Schilling
2a4930304b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12771] Shanging substr to strpos
  [ticket/12771] Change var name
  [ticket/12771] Bug in profilefield_base_migration when used in ext
2014-06-27 15:30:59 +02:00
Joas Schilling
8fa4ca49e0 Merge pull request #2658 from lucifer4o/ticket/12771
[ticket/12771] Bug in profilefield_base_migration when used in ext

* lucifer4o/ticket/12771:
  [ticket/12771] Shanging substr to strpos
  [ticket/12771] Change var name
  [ticket/12771] Bug in profilefield_base_migration when used in ext
2014-06-27 15:30:49 +02:00
Joas Schilling
79e909dcda Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12759] Fix type_bool and type_dropdown's UCP fields
  [ticket/12759] Remove lang_helper from profilefields_manager
  [ticket/12759] Cache all lang_options in lang_helper instead
  [ticket/12759] Extra line in profilefields_manager
  [ticket/12759] Cache lang_options for pm_viewmessage
  [ticket/12759] Cache lang_options on memberlist
  [ticket/12759] Add phpDoc comments to explain get_option_lang
  [ticket/12759] Little code cleanup
  [ticket/12759] Make sure $field_id has unique elements
  [ticket/12759] Cache the lang options earlier
  [ticket/12759] Cache lang options for all fields while displaying
  [ticket/12759] Allow multiple fields to be loaded via get_option_lang
2014-06-27 15:20:55 +02:00
Joas Schilling
b0286bf854 Merge pull request #2636 from Dragooon/ticket/12759
[ticket/12759] Resolve query flooding while displaying large number of custom profile fields

* Dragooon/ticket/12759:
  [ticket/12759] Fix type_bool and type_dropdown's UCP fields
  [ticket/12759] Remove lang_helper from profilefields_manager
  [ticket/12759] Cache all lang_options in lang_helper instead
  [ticket/12759] Extra line in profilefields_manager
  [ticket/12759] Cache lang_options for pm_viewmessage
  [ticket/12759] Cache lang_options on memberlist
  [ticket/12759] Add phpDoc comments to explain get_option_lang
  [ticket/12759] Little code cleanup
  [ticket/12759] Make sure $field_id has unique elements
  [ticket/12759] Cache the lang options earlier
  [ticket/12759] Cache lang options for all fields while displaying
  [ticket/12759] Allow multiple fields to be loaded via get_option_lang
2014-06-27 15:20:21 +02:00
Marc Alexander
46ca16e2fc Merge branch 'develop-ascraeus' into develop 2014-06-27 15:18:41 +02:00
Marc Alexander
aadc6de9c4 Merge remote-tracking branch 'dragoon/ticket/12772' into develop-ascraeus 2014-06-27 15:17:51 +02:00
Shitiz Garg
6d464e0bc4 [ticket/12759] Fix type_bool and type_dropdown's UCP fields
PHPBB3-12759
2014-06-27 17:58:28 +05:30
Shitiz Garg
98262a5a17 [ticket/12759] Remove lang_helper from profilefields_manager
No longer required

PHPBB3-12759
2014-06-27 17:48:37 +05:30
Shitiz Garg
2cf4a4f6fe [ticket/12759] Cache all lang_options in lang_helper instead
PHPBB3-12759
2014-06-27 17:48:37 +05:30
Shitiz Garg
c1df2ce62a [ticket/12759] Extra line in profilefields_manager
PHPBB3-12759
2014-06-27 17:48:37 +05:30
Shitiz Garg
f776ac7d58 [ticket/12759] Cache lang_options for pm_viewmessage
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
7484859c71 [ticket/12759] Cache lang_options on memberlist
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
c82a0b74cf [ticket/12759] Add phpDoc comments to explain get_option_lang
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
51bc31da20 [ticket/12759] Little code cleanup
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
6251d68be4 [ticket/12759] Make sure $field_id has unique elements
Otherwise it would cause a bunch of repetitive IDs passed to the IN clause

PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
aebe03f88c [ticket/12759] Cache the lang options earlier
Previously it would re-run on every post

PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
6cf6ec3354 [ticket/12759] Cache lang options for all fields while displaying
Previously these would be fetched one field at one time, causing a large
number of queries in case there were large number of custom profile fields
and/or unique number of users in areas such as viewing topics. Resolve this
by caching them at once when generating data for displaying them in templates.

PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
6d23cc3a0e [ticket/12759] Allow multiple fields to be loaded via get_option_lang
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Joas Schilling
0f538b10cb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12325] Fix the language var name
  [ticket/12325] Update coding style in template
  [ticket/12325] Fix: add a missing colon
  [ticket/12325] Don't use L_COLON
  [ticket/12325] Fix: it's not stuck in an inifinite loop anymore
  [ticket/12325] Automatic update should notify about outdated files
2014-06-27 14:01:49 +02:00
Joas Schilling
18763d7286 Merge pull request #2493 from Nicofuma/ticket/12325
[ticket/12325] Automatic update should notify about outdated files

* Nicofuma/ticket/12325:
  [ticket/12325] Fix the language var name
  [ticket/12325] Update coding style in template
  [ticket/12325] Fix: add a missing colon
  [ticket/12325] Don't use L_COLON
  [ticket/12325] Fix: it's not stuck in an inifinite loop anymore
  [ticket/12325] Automatic update should notify about outdated files
2014-06-27 14:01:31 +02:00
Tristan Darricau
8e8b493fae [ticket/12777] Add is_purged()
PHPBB3-12777
2014-06-27 11:28:13 +02:00
Tristan Darricau
4d9e451f60 [ticket/12777] Update doc block of is_configured()
PHPBB3-12777
2014-06-27 11:23:11 +02:00
Tristan Darricau
d13e02c7b1 [ticket/12777] Rename extension status functions and add is_configured()
PHPBB3-12777
2014-06-27 10:49:13 +02:00
Andreas Fischer
eef50ae41b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12196] Fix typo in "referrer"
2014-06-26 23:46:40 +02:00
Andreas Fischer
cc4f1e401e Merge pull request #2665 from nickvergessen/ticket/12196-ascraeus
[ticket/12196] Fix typo in "referrer"

* nickvergessen/ticket/12196-ascraeus:
  [ticket/12196] Fix typo in "referrer"
2014-06-26 23:46:40 +02:00
Andreas Fischer
50135b0c6a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12773] Fix language variable name in cli extension enable command
2014-06-26 23:44:41 +02:00
Andreas Fischer
e8d7204580 Merge pull request #2661 from n-aleha/ticket/12773
[ticket/12773] Fix language variable name in cli extension enable command

* n-aleha/ticket/12773:
  [ticket/12773] Fix language variable name in cli extension enable command
2014-06-26 23:44:41 +02:00
Joas Schilling
7e769083bf [ticket/12196] Fix typo in "referrer"
Referer is a typo in the HTTP RFC and should not be used in the UI

PHPBB3-12196
2014-06-26 23:44:21 +02:00
Andreas Fischer
dd835790c6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12196] Revert Fix typo "referer" in acp/attachments
2014-06-26 23:33:47 +02:00