aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-10-074-4/+14
|\
| * Merge pull request #3615 from rxu/ticket/13846Marc Alexander2015-10-074-4/+14
| |\ | | | | | | | | | [ticket/13846] Fix softdelete feature workflow in viewtopic
| | * [ticket/13846] Fix MCP to disallow softdeleted posts deletion if not permitted.rxu2015-07-302-2/+3
| | | | | | | | | | | | PHPBB3-13846
| | * [ticket/13846] Fix softdelete feature workflow in viewtopicrxu2015-05-172-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - For permanent deletion of softdeleted post, disapprove mode has been changed to delete mode; - If post delete and softdelete are allowed, delete button triggers softdelete mode; - If a user can't permanently delete posts but can restore softdeleted posts, delete button won't be displayed for softdeleted posts. Subsilver2 is unaffected. PHPBB3-13846
* | | Merge pull request #3871 from Zoddo/ticket/10165Marc Alexander2015-10-073-0/+41
|\ \ \ | | | | | | | | | | | | [ticket/10165] Add a "Send test email" feature
| * | | [ticket/10165] Add more information when sending the test emailZoddo2015-09-121-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10165
| * | | [ticket/10165] Add a "Send test email" featureZoddo2015-09-093-0/+41
| | | | | | | | | | | | | | | | PHPBB3-10165
* | | | Merge pull request #3857 from Nicofuma/ticket/14124Marc Alexander2015-10-0710-4/+119
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14124] Automatically translate exceptions in CLI
| * | | | [ticket/14124] CSTristan Darricau2015-08-261-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-14124
| * | | | [ticket/14124] Update cron testsTristan Darricau2015-08-261-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-14124
| * | | | [ticket/14124] Migrate cron:run exceptionsTristan Darricau2015-08-251-4/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14124
| * | | | [ticket/14124] Automatically translate exceptions in CLITristan Darricau2015-08-259-0/+109
| | | | | | | | | | | | | | | | | | | | PHPBB3-14124
* | | | | Merge pull request #3947 from marc1706/ticket/14199Marc Alexander2015-10-071-36/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14199] Correctly resolve merge conflicts
| * | | | | [ticket/14199] Correctly resolve merge conflictsMarc Alexander2015-10-071-36/+0
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-14199
* | | | | Merge branch '3.1.x'Marc Alexander2015-10-072-2/+9
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #3716 from javiexin/ticket/13748Marc Alexander2015-10-072-2/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13748] Wrong tooltip after poll vote change
| | * | | | [ticket/13748] Wrong tooltip after poll vote changejaviexin2015-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the "voted" tooltip in an extra attribute in HTML, and use it with the JS that refreshes after poll vote. Use L_ language string instead of LA_ language string. PHPBB3-13748
| | * | | | [ticket/13748] Wrong tooltip after poll vote changejaviexin2015-06-192-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the "voted" tooltip in an extra attribute in HTML, and use it with the JS that refreshes after poll vote. PHPBB3-13748
* | | | | | Merge pull request #3904 from Zoddo/ticket/14162Marc Alexander2015-10-078-35/+272
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14162] Add CLI commands to manage migrations
| * | | | | | [ticket/14162] Add CLI command db:listZoddo2015-09-203-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This command lists all installed and uninstalled migrations. Note: The class is named `list_command`, because `list` is a reserved word and can't be used as class name in PHP. PHPBB3-14162
| * | | | | | [ticket/14162] Add CLI command db:revertZoddo2015-09-207-35/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This command allow to revert a migration from the CLI PHPBB3-14162
* | | | | | | Merge pull request #3927 from hanakin/ticket/14199Marc Alexander2015-10-0733-175/+211
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14199] Fix screen reader compatability Conflicts: phpBB/styles/prosilver/template/mcp_topic.html phpBB/styles/prosilver/template/overall_header.html phpBB/styles/prosilver/template/pagination.html phpBB/styles/prosilver/template/posting_buttons.html phpBB/styles/prosilver/template/posting_topic_review.html phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/ucp_pm_history.html phpBB/styles/prosilver/template/ucp_pm_message_header.html phpBB/styles/prosilver/template/ucp_pm_viewmessage.html phpBB/styles/prosilver/template/viewforum_body.html phpBB/styles/prosilver/template/viewtopic_body.html phpBB/styles/prosilver/template/viewtopic_topic_tools.html
| * | | | | | | [ticket/14199]Add aria-hidden to all iconsMichael Miday2015-10-0133-183/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14199
* | | | | | | | Merge pull request #3940 from hanakin/ticket/14206Marc Alexander2015-10-073-20/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [Ticket/14206]Fix jumpbox UI consistency
| * | | | | | | | [ticket/14206]Fix button UIMichael Miday2015-09-282-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14206
| * | | | | | | | [ticket/14206]Fix arrow placementMichael Miday2015-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14206
* | | | | | | | | Merge pull request #3932 from hanakin/ticket/14193Marc Alexander2015-10-0717-77/+107
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14193]Fix secondary buttons
| * | | | | | | | | [ticket/14193]Minor cleanupsMichael Miday2015-10-032-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14193
| * | | | | | | | | [ticket/14193]Fix posting buttonsMichael Miday2015-10-0317-76/+104
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14193
* | | | | | | | | Merge pull request #3945 from marc1706/ticket/14216Tristan Darricau2015-10-041-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14216] Do not run thumbnail test if gd is disabled * marc1706/ticket/14216: [ticket/14216] Do not run thumbnail test if gd is disabled
| * | | | | | | | | [ticket/14216] Do not run thumbnail test if gd is disabledMarc Alexander2015-10-041-0/+5
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14216
* | | | | | | | | Merge pull request #3939 from Nicofuma/ticket/14205Marc Alexander2015-10-0419-50/+60
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | [ticket/14205] Bump PHP requirement to PHP 5.4
| * | | | | | | | [ticket/14205] Bump PHP requirement to PHP 5.4Tristan Darricau2015-10-0419-50/+60
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14205
* | | | | | | | Merge pull request #3933 from hanakin/ticket/14202Marc Alexander2015-10-019-22/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14202]Add missing sr-only classes
| * | | | | | | | [ticket/14202]Remove blank lineMichael Miday2015-09-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14202
| * | | | | | | | [ticket/14202]Add missing sr-only classesMichael Miday2015-09-289-22/+24
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14202
* | | | | | | | Merge pull request #3941 from hanakin/ticket/14195Marc Alexander2015-10-011-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | [ticket/14195]Fix pupload & polls hiding
| * | | | | | | [ticket/14195]Revert hidden classMichael Miday2015-09-281-2/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-14195
* | | | | | | Merge pull request #3919 from hanakin/ticket/12554Andreas Fischer2015-09-241-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12554] Fix blockquote overflow in lists * hanakin/ticket/12554: [ticket/12554]Remove left margin when li [ticket/12554]Overide blockquote overflow in lists
| * | | | | | | [ticket/12554]Remove left margin when liMichael Miday2015-09-231-0/+1
| | | | | | | |
| * | | | | | | [ticket/12554]Overide blockquote overflow in listsMichael Miday2015-09-221-0/+4
| | | | | | | |
* | | | | | | | Merge pull request #3916 from Nicofuma/ticket/12633Andreas Fischer2015-09-221-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12633] Doesn't use DEBUG to debug templates events * Nicofuma/ticket/12633: [ticket/12633] Doesn't use DEBUG to debug templates events
| * | | | | | | | [ticket/12633] Doesn't use DEBUG to debug templates eventsTristan Darricau2015-09-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check the templates events on runtime only when Twig debug is on PHPBB3-12633
* | | | | | | | | Merge branch '3.1.x'Andreas Fischer2015-09-221-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | | * 3.1.x: [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()
| * | | | | | | Merge pull request #3920 from marc1706/ticket/14186Andreas Fischer2015-09-221-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting() * marc1706/ticket/14186: [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()
| | * | | | | | | [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()Marc Alexander2015-09-221-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14186
* | | | | | | | Merge pull request #3917 from Nicofuma/ticket/14182Marc Alexander2015-09-211-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14182] Move v310\notifications_board migration to v320\...
| * | | | | | | | [ticket/14182] Move v310\notifications_board migration to v320\...Tristan Darricau2015-09-211-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14182
* | | | | | | | Merge pull request #3911 from Nicofuma/ticket/12577Marc Alexander2015-09-201-7/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12577] Lazy initialize the password manager
| * | | | | | | | [ticket/12577] DocblockTristan Darricau2015-09-181-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12577