aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2017-04-261-1/+29
|\
| * Merge pull request #4674 from senky/ticket/13730Marc Alexander2017-04-261-1/+29
| |\ | | | | | | | | | [ticket/13730] Add core.delete_post_end event
| | * [ticket/13730] Add core.delete_post_after eventJakub Senko2017-02-081-1/+29
| | | | | | | | | | | | PHPBB3-13730
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-04-261-0/+2
|\ \ \ | |/ /
| * | Merge pull request #4672 from senky/ticket/13603Marc Alexander2017-04-263-0/+12
| |\ \ | | | | | | | | | | | | [ticket/13603] Add index_body_stat_blocks_after event
| | * | [ticket/13603] Add index_body_stat_blocks_after eventJakub Senko2017-01-233-0/+12
| | |/ | | | | | | | | | PHPBB3-13603
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-04-261-0/+11
|\ \ \ | |/ /
| * | Merge pull request #4671 from senky/ticket/13605Marc Alexander2017-04-261-0/+11
| |\ \ | | | | | | | | | | | | [ticket/13605] Add core.ucp_pm_compose_predefined_message event
| | * | [ticket/13605] Add core.ucp_pm_compose_predefined_message eventJakub Senko2017-01-231-0/+11
| | |/ | | | | | | | | | PHPBB3-13605
* | | Merge pull request #4809 from VSEphpbb/ticket/15198Marc Alexander2017-04-262-40/+22
|\ \ \ | | | | | | | | | | | | [ticket/15198] Add PHP version to board stats in the ACP
| * | | [ticket/15198] Add PHP version to board stats in the ACPMatt Friedman2017-04-262-40/+22
|/ / / | | | | | | | | | PHPBB3-15198
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-210-0/+0
|\ \ \ | |/ / | | | | | | * 3.1.x:
| * | Merge pull request #4780 from marc1706/ticket/8116Tristan Darricau2017-04-214-12/+272
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/8116] Add pagination for IP tables and post info * github.com:phpbb/phpbb: [ticket/8116] Add missing new line [ticket/8116] Correctly get other users who posted under IP [ticket/8116] Improve code and add tests for helper functions [ticket/8116] Add pagination for IP tables on post info
* | \ \ Merge pull request #4802 from marc1706/ticket/8116-rheaTristan Darricau2017-04-214-10/+270
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/8116] Add pagination for IP tables and post info -- Rhea version * github.com:phpbb/phpbb: [ticket/8116] Add missing new line [ticket/8116] Correctly get other users who posted under IP [ticket/8116] Improve code and add tests for helper functions [ticket/8116] Add pagination for IP tables on post info
| * \ \ \ Merge branch 'ticket/8116' into ticket/8116-rheaMarc Alexander2017-04-194-10/+270
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [ticket/8116] Add missing new lineMarc Alexander2017-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-8116
| | * | | [ticket/8116] Correctly get other users who posted under IPMarc Alexander2017-04-182-21/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-8116
| | * | | [ticket/8116] Improve code and add tests for helper functionsMarc Alexander2017-03-293-36/+158
| | | | | | | | | | | | | | | | | | | | PHPBB3-8116
| | * | | [ticket/8116] Add pagination for IP tables on post infoMarc Alexander2017-03-282-8/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff from previous patch by nickvergessen. PHPBB3-8116
* | | | | Merge pull request #4806 from javiexin/ticket/15011v32Tristan Darricau2017-04-211-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15011] Use exception interface for 3.2 * github.com:phpbb/phpbb: [ticket/15011] Use exception interface for 3.2
| * | | | | [ticket/15011] Use exception interface for 3.2javiexin2017-04-211-3/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the mentioned ticket to 3.2 by using exception_inteface instead of the actual exception class. Also, use adm_back_link consistently. PHPBB3-15011
* | | | | Merge pull request #4805 from rmcgirr83/ticket-15144Tristan Darricau2017-04-201-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | [ticket/15144] Attachment icon display should only occur * github.com:phpbb/phpbb: [ticket/15144] Attachment icon display should only occur
| * | | | [ticket/15144] Attachment icon display should only occurRichard McGirr2017-04-201-4/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | if there are attachments in reports https://tracker.phpbb.com/browse/PHPBB3-15144 PHPBB3-15144
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-191-0/+12
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * 3.1.x: [ticket/13608] Add core.ucp_restore_permissions event
| * | | Merge pull request #4670 from senky/ticket/13608Tristan Darricau2017-04-191-0/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13608] Add core.ucp_restore_permissions event * github.com:phpbb/phpbb: [ticket/13608] Add core.ucp_restore_permissions event
| | * | | [ticket/13608] Add core.ucp_restore_permissions eventJakub Senko2017-01-231-0/+12
| | | |/ | | |/| | | | | | | | | PHPBB3-13608
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-191-0/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/13609] Add core.ucp_switch_permissions event
| * | | Merge pull request #4669 from senky/ticket/13609Tristan Darricau2017-04-191-0/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13609] Add core.ucp_switch_permissions event * github.com:phpbb/phpbb: [ticket/13609] Add core.ucp_switch_permissions event
| | * | | [ticket/13609] Add core.ucp_switch_permissions eventJakub Senko2017-01-231-0/+13
| | |/ / | | | | | | | | | | | | PHPBB3-13609
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-192-8/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/7336] Index first post when splitting topics [ticket/7336] Add tests for indexing first post after splitting topics
| * \ \ \ Merge pull request #4657 from marc1706/ticket/7336Tristan Darricau2017-04-192-7/+54
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/7336] Index first post when splitting topics * github.com:phpbb/phpbb: [ticket/7336] Index first post when splitting topics [ticket/7336] Add tests for indexing first post after splitting topics
| | * | | [ticket/7336] Index first post when splitting topicsMarc Alexander2017-01-161-0/+42
| | | | | | | | | | | | | | | | | | | | PHPBB3-7336
| | * | | [ticket/7336] Add tests for indexing first post after splitting topicsMarc Alexander2017-01-161-7/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-7336
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-191-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/15146] Date profile field validation incorrect
| * | | | Merge pull request #4763 from javiexin/ticket/15146Tristan Darricau2017-04-191-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15146] Date profile field validation incorrect * github.com:phpbb/phpbb: [ticket/15146] Date profile field validation incorrect
| | * | | | [ticket/15146] Date profile field validation incorrectjaviexin2017-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix by changing select input field options to match validation range PHPBB3-15146
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-191-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13735] Fix input type number for Firefox in prosilver
| * | | | | Merge pull request #4798 from javiexin/ticket/13735Tristan Darricau2017-04-191-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13735] Fix input type number for Firefox in prosilver * github.com:phpbb/phpbb: [ticket/13735] Fix input type number for Firefox in prosilver
| | * | | | | [ticket/13735] Fix input type number for Firefox in prosilverjaviexin2017-04-171-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-13735
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-192-4/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/15151] Use redirected link for consistency [ticket/15151] ACP Cookie settings explanatory text [ticket/15151] ACP Cookie settings add explanatory text where it was missing
| * | | | | Merge pull request #4781 from nomind60s/ticket/15151Tristan Darricau2017-04-192-4/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15151] ACP Cookie settings add explanatory text * github.com:phpbb/phpbb: [ticket/15151] Use redirected link for consistency [ticket/15151] ACP Cookie settings explanatory text [ticket/15151] ACP Cookie settings add explanatory text where it was missing
| | * | | | | [ticket/15151] Use redirected link for consistencynomind60s2017-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other phpbb.com links used in the core use a redirect rather than a direct link so change to make the Cookie settings link a redirect also. PHPBB3-15151
| | * | | | | [ticket/15151] ACP Cookie settings explanatory textnomind60s2017-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed extraneous whitespace at end of line. PHPBB3-15151
| | * | | | | [ticket/15151] ACP Cookie settings add explanatory text where it was missingnomind60s2017-03-292-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the lead section to include a link to the phpBB.com Knowledge Base and add explanation text for the Cookie domain, Cookie name and Cookie path fields. PHPBB3-15151
* | | | | | | Merge pull request #4786 from vinny/ticket/15158Tristan Darricau2017-04-181-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15158] Update oauth to v0.8.10 * github.com:phpbb/phpbb: [ticket/15158] Update oauth to v0.8.10
| * | | | | | | [ticket/15158] Update oauth to v0.8.10Vinny2017-04-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15158
* | | | | | | | Merge pull request #4792 from Louis7777/ticket/15173Tristan Darricau2017-04-181-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15173] Fix message area resizing lag * github.com:phpbb/phpbb: [ticket/15173] Fix message area resizing lag
| * | | | | | | | [ticket/15173] Fix message area resizing lagLouis77772017-04-141-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resizing the posting editor's text area lags, because there is an all-inclusive CSS transition. This fix excludes the height property from having a noticeable transition. PHPBB3-15173
* | | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-181-7/+14
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/15174] Split timeout message to extra method and set timeout to 60s [ticket/15174] Increase timeout for loading indicator
| * | | | | | | | Merge pull request #4796 from marc1706/ticket/15174Tristan Darricau2017-04-181-7/+14
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15174] Increase timeout for loading indicator * github.com:phpbb/phpbb: [ticket/15174] Split timeout message to extra method and set timeout to 60s [ticket/15174] Increase timeout for loading indicator