aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-261-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13193] Swap ternary condition members [ticket/13193] Make template more readable [ticket/13193] Add load_search config check [ticket/13193] Add link to post count in PMs
| * | | | Merge pull request #3054 from Senky/ticket/13193Andreas Fischer2014-10-261-0/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13193] Post count in PMs not a link * Senky/ticket/13193: [ticket/13193] Swap ternary condition members [ticket/13193] Make template more readable [ticket/13193] Add load_search config check [ticket/13193] Add link to post count in PMs
| | * | | [ticket/13193] Swap ternary condition membersJakub Senko2014-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13193
| | * | | [ticket/13193] Add load_search config checkJakub Senko2014-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13193
| | * | | [ticket/13193] Add link to post count in PMsJakub Senko2014-10-211-0/+1
| | |/ / | | | | | | | | | | | | PHPBB3-13193
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-10-221-1/+23
|\ \ \ \ | |/ / /
| * | | Merge pull request #3058 from naderman/ticket/13205Marc Alexander2014-10-221-1/+23
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13205] Add a mark all messages read link to PM folders
| | * | | [ticket/13205] Explicitly cast ids to integers and reformat SQLNils Adermann2014-10-221-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-13205
| | * | | [ticket/13205] Remove superfluous newlineNils Adermann2014-10-221-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-13205
| | * | | [ticket/13205] Add a mark all messages read link to PM foldersNils Adermann2014-10-221-1/+25
| | | | | | | | | | | | | | | | | | | | PHPBB3-13205
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-221-2/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/security-159] Only show first 8 characters of login keys in UCP
| * | | | [ticket/security-159] Only show first 8 characters of login keys in UCPMarc Alexander2014-10-221-2/+7
| |/ / / | | | | | | | | | | | | SECURITY-159
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-211-24/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/13189] Do not use confirm box for marking all notifications read
| * | | [ticket/13189] Do not use confirm box for marking all notifications readMarc Alexander2014-10-201-24/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | We already use a token for preventing CSRF when marking notifications read. Making a user confirm the marking read action serves no real purpose. No information will be lost by just marking the notifications read but it will prevent users from always having to confirm this action. PHPBB3-13189
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-061-2/+35
|\ \ \ | |/ /
| * | Merge pull request #2828 from brunoais/ticket/12930Joas Schilling2014-10-061-2/+35
| |\ \ | | | | | | | | | | | | [ticket/12930] core.ucp_pm_compose_compose_pm_quotepost_query_after
| | * | [ticket/12930] BUMP to RC5brunoais2014-10-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12930
| | * | [ticket/12930] Fixing event comment block and variablebrunoais2014-09-191-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | According to comments on pull request PHPBB3-12930
| | * | [ticket/12930] Adding more variables to the eventbrunoais2014-08-101-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | More variables, according to comments, were added to the event. PHPBB3-12930
| | * | [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