aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2017-05-021-0/+9
|\
| * [ticket/15187] Use $this->template propertykasimi2017-04-291-1/+1
| * [ticket/15187] Add ACP style after enabling an extensionkasimi2017-04-291-0/+9
| * Merge pull request #4657 from marc1706/ticket/7336Tristan Darricau2017-04-281-0/+42
| |\
* | \ 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_after eventJakub Senko2017-02-081-1/+29
* | | | 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 eventJakub Senko2017-01-231-0/+11
| | |/ /
| * | | Merge pull request #4780 from marc1706/ticket/8116Tristan Darricau2017-04-211-11/+103
| |\ \ \
* | \ \ \ Merge pull request #4802 from marc1706/ticket/8116-rheaTristan Darricau2017-04-211-9/+101
|\ \ \ \ \
| * \ \ \ \ Merge branch 'ticket/8116' into ticket/8116-rheaMarc Alexander2017-04-191-9/+101
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | [ticket/8116] Correctly get other users who posted under IPMarc Alexander2017-04-181-6/+2
| | * | | | [ticket/8116] Improve code and add tests for helper functionsMarc Alexander2017-03-291-36/+18
| | * | | | [ticket/8116] Add pagination for IP tables on post infoMarc Alexander2017-03-281-7/+121
* | | | | | [ticket/15011] Use exception interface for 3.2javiexin2017-04-211-3/+3
|/ / / / /
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-191-1/+42
|\ \ \ \ \
| * \ \ \ \ Merge pull request #4657 from marc1706/ticket/7336Tristan Darricau2017-04-191-0/+42
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |
| | * | | [ticket/7336] Index first post when splitting topicsMarc Alexander2017-01-161-0/+42
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-191-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4781 from nomind60s/ticket/15151Tristan Darricau2017-04-191-3/+3
| |\ \ \ \
| | * | | | [ticket/15151] ACP Cookie settings add explanatory text where it was missingnomind60s2017-03-291-3/+3
| * | | | | Merge pull request #4581 from javiexin/ticket/14919Marc Alexander2017-04-161-62/+62
| |\ \ \ \ \
| | * | | | | [ticket/14919] Do not directly use globals in acp_extensionsjaviexin2016-12-251-1/+1
| | * | | | | [ticket/14919] Do not directly use globals in acp_extensionsjaviexin2016-12-191-0/+1
| | * | | | | [ticket/14919] Do not directly use globals in acp_extensionsjaviexin2016-12-171-66/+65
| * | | | | | Merge pull request #4761 from VSEphpbb/ticket/15142Marc Alexander2017-04-111-6/+3
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #4705 from nomind60s/ticket/15097Tristan Darricau2017-04-181-0/+1
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15097] Resolve travis-ci errornomind60s2017-02-171-1/+1
| * | | | | | | [ticket/15097] Add PHP version to Board statisticsnomind60s2017-02-171-1/+1
| * | | | | | | [ticket/15097] Add PHP version to Board statisticsnomind60s2017-02-171-0/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | [ticket/14990] Move dispatcher object to the front of the options arrayrxu2017-04-161-2/+2
* | | | | | | [ticket/14990] Fix event name, email parsing, installer and dispatcher callsrxu2017-04-161-2/+4
* | | | | | | Merge pull request #4698 from javiexin/ticket/15087Marc Alexander2017-04-161-70/+105
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15087] Optimize creation of metadata objects by cachingjaviexin2017-02-121-4/+41
| * | | | | | | [ticket/15087] Optimize creation of metadata objects by cachingjaviexin2017-02-121-73/+71
* | | | | | | | [ticket/15142] Merge branch 'ticket/15142' into 32xMatt Friedman2017-04-101-4/+1
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | [ticket/15142] Check extension updates on current branchMatt Friedman2017-03-241-6/+3
* | | | | | | | Merge pull request #4762 from Nicofuma/ticket/15137Marc Alexander2017-03-251-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/15137] Global Announcements shouldn't always be never endingTristan Darricau2017-03-251-2/+2
* | | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-241-4/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | [ticket/15143] Fix display of version update in ACPMatt Friedman2017-03-221-4/+1
| |/ / / / / /
* | | | | | | [ticket/15135] Correctly pass exception arguments and add back link againMarc Alexander2017-03-231-2/+3
* | | | | | | [ticket/15135] Parse language files in acp_extensions instead of md managerMarc Alexander2017-03-191-1/+2
* | | | | | | Merge pull request #4711 from javiexin/ticket/15102Tristan Darricau2017-03-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15102] Missing parameter calling version_checkjaviexin2017-02-241-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-191-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4734 from rxu/ticket/14806Tristan Darricau2017-03-191-2/+2
| |\ \ \ \ \ \
| | * | | | | | [ticket/14806] Fix ACP test emails authentication failurerxu2017-03-111-2/+2