aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | [ticket/12930] Update to RC4brunoais2014-08-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12930
| | * | [ticket/12930] core.ucp_pm_compose_compose_pm_quotepost_query_afterbrunoais2014-08-081-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the core.ucp_pm_compose_compose_pm_quotepost_query_after event to ucp backend. PHPBB3-12930
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-061-0/+36
|\ \ \ \ | |/ / /
| * | | Merge pull request #2827 from brunoais/ticket/12929Joas Schilling2014-10-061-0/+36
| |\ \ \ | | | | | | | | | | | | | | | [ticket/12929] core.ucp_pm_compose_compose_pm_basic_info_query_before
| | * | | [ticket/12929] BUMP to RC5brunoais2014-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12929
| | * | | [ticket/12929] Fixing event comment block and variablebrunoais2014-09-191-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12929
| | * | | [ticket/12929] Adding more variables to event.brunoais2014-08-101-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More variables added that may be useful to events at this stage. PHPBB3-12929
| | * | | [ticket/12929] Update to RC4brunoais2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12929
| | * | | [ticket/12929] core.ucp_pm_compose_compose_pm_basic_info_query_beforebrunoais2014-08-091-0/+22
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Adding the core.ucp_pm_compose_compose_pm_basic_info_query_before event to mcp backend. PHPBB3-12929
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-011-2/+5
|\ \ \ \ | |/ / /
| * | | Merge pull request #2888 from Nicofuma/ticket/12993Joas Schilling2014-10-011-2/+5
| |\ \ \ | | | | | | | | | | | | | | | [ticket/12993] Improve get_user_ranks
| | * | | [ticket/12993] Return an array instead of reference passingTristan Darricau2014-08-191-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12993
| | * | | [ticket/12993] Fix includes of functions_displayTristan Darricau2014-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12993
| | * | | [ticket/12993] Rename to phpbb_get_user_rankTristan Darricau2014-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12993
| | * | | [ticket/12993] Improve get_user_ranksForumhulp.com2014-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explanation in http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=46051 PHPBB3-12993
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-242-6/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/timezone_option.html
| * | | | Merge pull request #2844 from marc1706/ticket/12858Joas Schilling2014-09-242-6/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
| | * | | | [ticket/12858] Directly return and use timezone selectsMarc Alexander2014-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858
| | * | | | [ticket/12858] Generate timezone selects with template loopMarc Alexander2014-09-172-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12858
* | | | | | Merge branch 'develop-ascraeus' into developDhruv2014-09-211-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Jakub Senko # Via Dhruv Goel (1) and Jakub Senko (1) * develop-ascraeus: [ticket/13045] Remove Pragma headers
| * | | | | [ticket/13045] Remove Pragma headersJakub Senko2014-09-171-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13045
* | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-101-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12976] Correctly use plurals for attachment count in UCP navigation Conflicts: phpBB/styles/subsilver2/template/ucp_attachments.html
| * | | | Merge pull request #2936 from nickvergessen/ticket/12976Tristan Darricau2014-09-101-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12976] Correctly use plurals for attachment count in UCP navigation * nickvergessen/ticket/12976: [ticket/12976] Correctly use plurals for attachment count in UCP navigation
| | * | | | [ticket/12976] Correctly use plurals for attachment count in UCP navigationJoas Schilling2014-09-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12976
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-091-1/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13052] Use request class instead of $_POST and request_var() [ticket/13052] Fix appearances with multiple parameters [ticket/13052] Remove additional parameter from check_form_key()
| * | | | | [ticket/13052] Fix appearances with multiple parametersJoas Schilling2014-09-091-1/+5
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13052
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-071-6/+18
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/12983] Correctly validate sorting options in the UCPJoas Schilling2014-09-051-6/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-12983
* | | | | Merge branch 'develop-ascraeus' into developDhruv2014-08-292-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Dhruv Goel (1) and Marc Alexander (1) * develop-ascraeus: [ticket/12966] Sort by post_time and post_id where applicable [ticket/12966] Sort posts by post_id in addition to sorting by post_time
| * | | | Merge pull request #2865 from marc1706/ticket/12966Dhruv Goel2014-08-292-4/+4
| |\ \ \ \ | | | | | | | | | | | | [ticket/12966] Sort posts by post_id in addition to sorting by post_time
| | * | | | [ticket/12966] Sort by post_time and post_id where applicableMarc Alexander2014-08-232-4/+4
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This change was not applied to the search as this would require a larger rewrite of the search methods. PHPBB3-12966
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-213-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/12990] Use protected instead of privateTristan Darricau2014-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12990
| * | | | [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-163-7/+7
| | |/ / | |/| | | | | | | | | | PHPBB3-12990
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-112-37/+44
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes Conflicts: phpBB/styles/subsilver2/template/ucp_groups_manage.html phpBB/styles/subsilver2/template/ucp_profile_avatar.html
| * | | Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-112-37/+44
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes
| | * | | [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-072-37/+44
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method will take care of the actual deletion process in the avatar manager. Additionally, we'll be using a confirm box while deleting the avatar to prevent users from accidentally deleting their avatars. PHPBB3-12822
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-113-7/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | | [ticket/11854] Rename captchas.factory service to captcha.factoryTristan Darricau2014-08-113-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11854
| * | | [ticket/11854] Move captcha stuff to phpbb/ and use DI for pluginsTristan Darricau2014-08-113-7/+5
| | | | | | | | | | | | | | | | PHPBB3-11854
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-101-7/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12938] Remove functional tests for 'Download all attachments'. [ticket/12938] Remove the 'Download all attachments' feature.
| * | | [ticket/12938] Remove the 'Download all attachments' feature.Andreas Fischer2014-08-091-7/+0
| |/ / | | | | | | | | | PHPBB3-12938
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-021-6/+6
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/12895] Rename user style setting to resolve conflict with style param
| * | [ticket/12895] Rename user style setting to resolve conflict with style paramMarc Alexander2014-07-291-6/+6
| | | | | | | | | | | | | | | | | | | | | The style URL parameter, i.e. style=1, will conflict with the user's style setting due to it also being named style. This patch with solve this conflict. PHPBB3-12895
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-07-161-3/+21
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/12828] Add ucp_prefs.php common core event
| * | Merge pull request #2709 from rxu/ticket/12828Joas Schilling2014-07-161-3/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12828] Add ucp_prefs.php common core event * rxu/ticket/12828: [ticket/12828] Add ucp_prefs.php common core event
| | * | [ticket/12828] Add ucp_prefs.php common core eventrxu2014-07-131-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add common core event at the bottom of the includes/ucp/ucp_prefs.php to allow additional actions (like template variable assignments etc.) before the page load. PHPBB3-12828
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-07-081-2/+3
|\ \ \ \ | |/ / /
| * | | [ticket/12804] Dont use ternary formPayBas2014-07-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12804
| * | | [ticket/12804] Hide Jabber from UCP & member search when disabledPayBas2014-07-071-2/+3
| |/ / | | | | | | | | | PHPBB3-12804