aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2016-01-272-0/+16
|\
| * Merge pull request #4029 from RMcGirr83/ticket_14289Marc Alexander2016-01-272-0/+16
| |\ | | | | | | | | | [ticket/14289] Add events to navbar header
| | * [ticket/14289] Fix location in events.md fileRichard McGirr2016-01-191-14/+14
| | | | | | | | | | | | PHPBB3-14289
| | * [ticket/14289] Move append before prepend in events docRichard McGirr2016-01-161-4/+4
| | | | | | | | | | | | PHPBB3-14289
| | * [ticket/14289] Change to 3.1.8-RC1 and rename eventRichard McGirr2016-01-102-6/+6
| | | | | | | | | | | | PHPBB3-14289
| | * [ticket/14289] Add events to navbar headerRichard McGirr2015-11-132-0/+16
| | | | | | | | | | | | PHPBB3-14289
* | | Merge pull request #4142 from Nicofuma/ticket/14129Marc Alexander2016-01-273-1/+41
|\ \ \ | | | | | | | | | | | | [ticket/14129] Caches extensions autoloaders
| * | | [ticket/14129] Caches extensions autoloadersTristan Darricau2016-01-263-1/+41
| | | | | | | | | | | | | | | | PHPBB3-14129
* | | | Merge branch '3.1.x'Marc Alexander2016-01-261-0/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge pull request #4143 from VSEphpbb/ticket/14433Marc Alexander2016-01-261-0/+2
| |\ \ | | | | | | | | | | | | [ticket/14433] Purge cache setting up extension functional tests
| | * | [ticket/14433] Purge cache setting up extension functional testsMatt Friedman2016-01-251-0/+2
| |/ / | | | | | | | | | PHPBB3-14433
* | | Merge pull request #4009 from cunha17/ticket/14253Tristan Darricau2016-01-253-4/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cunha17-master: [ticket/14253] Show group requests pending aproval at the ACP groups summary [ticket/14253] Show group requests pending aproval at the ACP groups summary fixes #4009
| * | | [ticket/14253] Show group requests pending aproval at the ACP groups summarycunha172016-01-253-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currenty, you need to open each existing group in ACP to know if there are pending group requests or not. Doing so is really boring and annoying... :/ This patch displays the number of pending group requests at the ACP groups summary page. PHPBB3-14253
| * | | [ticket/14253] Show group requests pending aproval at the ACP groups summarycunha172016-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currenty, you need to open each existing group in ACP to know if there are pending group requests or not. Doing so is really boring and annoying... :/ This patch displays the number of pending group requests at the ACP groups summary page. PHPBB3-14253
* | | | Merge pull request #4131 from Nicofuma/ticket/13717Marc Alexander2016-01-255-48/+175
|\ \ \ \ | |/ / / |/| | | | | | | [ticket/13717] Set the assets after rendering the whole template
| * | | [ticket/13717] Fix testsTristan Darricau2016-01-251-1/+16
| | | | | | | | | | | | | | | | PHPBB3-13717
| * | | [ticket/13717] Set the assets after rendering the whole templateTristan Darricau2016-01-255-48/+160
| | | | | | | | | | | | | | | | | | | | | | | | The goal being to be able to call INCLUDECSS/JS from anywhere in any tempalte or event PHPBB3-13717
* | | | Merge pull request #4126 from marc1706/ticket/13733Tristan Darricau2016-01-256-32/+162
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13733] Allow non-migration files inside migrations folder * marc1706/ticket/13733: [ticket/13733] Remove validate_classes method argument [ticket/13733] Make sure migration classes always have same order in tests [ticket/13733] Properly test setting validate_classes to false/true [ticket/13733] Use interface for migratinos [ticket/13733] Update comment explaining migration class validation [ticket/13733] Add isInstantiable() check. [ticket/13733] Braces on their own lines [ticket/13733] Allow tests the skip class validation [ticket/13733] Properly handle nonexistent classes as well [ticket/13733] Handle nonexistent classes as well [ticket/13733] Only use migration classes that extension the base migration class.
| * | | [ticket/13733] Remove validate_classes method argumentMarc Alexander2016-01-242-28/+12
| | | | | | | | | | | | | | | | PHPBB3-13733
| * | | [ticket/13733] Make sure migration classes always have same order in testsMarc Alexander2016-01-201-4/+4
| | | | | | | | | | | | | | | | PHPBB3-13733
| * | | [ticket/13733] Properly test setting validate_classes to false/trueMarc Alexander2016-01-193-2/+76
| | | | | | | | | | | | | | | | PHPBB3-13733
| * | | [ticket/13733] Use interface for migratinosMarc Alexander2016-01-183-29/+79
| | | | | | | | | | | | | | | | PHPBB3-13733
| * | | [ticket/13733] Update comment explaining migration class validationMarc Alexander2016-01-151-6/+2
| | | | | | | | | | | | | | | | PHPBB3-13733
| * | | Merge pull request #3626 from imkingdavid/ticket/13733Marc Alexander2016-01-152-2/+28
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13733] Allow non-migration files inside migrations folder
| | * | | [ticket/13733] Add isInstantiable() check.David King2015-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13733
| | * | | [ticket/13733] Braces on their own linesDavid King2015-05-231-2/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-13733
| | * | | [ticket/13733] Allow tests the skip class validationDavid King2015-05-232-15/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-13733
| | * | | [ticket/13733] Properly handle nonexistent classes as wellDavid King2015-05-231-4/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-13733
| | * | | [ticket/13733] Handle nonexistent classes as wellDavid King2015-05-231-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13733
| | * | | [ticket/13733] Only use migration classes that extension the base migration ↵David King2015-05-231-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class. PHPBB3-13733
* | | | | Merge pull request #4140 from Crizz0/ticket/14418Tristan Darricau2016-01-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14418] Wrong language variable in viewtopic_topic_tools.html … * Crizz0/ticket/14418: [ticket/14418] Wrong language variable in viewtopic_topic_tools.html fixed
| * | | | | [ticket/14418] Wrong language variable in viewtopic_topic_tools.html fixedCrizzo2016-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In viewtopic_topic_tools.html was used the language variable L_PM_TOOLS it had to be changed to L_TOPIC_TOOLS to display the right title in the moderation wrench in viewtopic.php PHPBB3-14418
* | | | | | Merge branch '3.1.x'Tristan Darricau2016-01-241-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * 3.1.x: [ticket/14411] Permanently delete post if delete_permanent is set
| * | | | | Merge pull request #4124 from marc1706/ticket/14411Tristan Darricau2016-01-241-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14411] Permanently delete post if delete_permanent is set * marc1706/ticket/14411: [ticket/14411] Permanently delete post if delete_permanent is set
| | * | | | | [ticket/14411] Permanently delete post if delete_permanent is setMarc Alexander2016-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14411
* | | | | | | Merge branch '3.1.x'Tristan Darricau2016-01-241-4/+11
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14425] Allow setting unix socket in database tests
| * | | | | | Merge pull request #4136 from marc1706/ticket/14425Tristan Darricau2016-01-241-4/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14425] Allow setting unix socket in database tests * marc1706/ticket/14425: [ticket/14425] Allow setting unix socket in database tests
| | * | | | | | [ticket/14425] Allow setting unix socket in database testsMarc Alexander2016-01-211-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14425
* | | | | | | | Merge pull request #4138 from marc1706/ticket/14428Tristan Darricau2016-01-241-6/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14428] Fix files types remote tests * marc1706/ticket/14428: [ticket/14428] Fix files types remote tests
| * | | | | | | [ticket/14428] Fix files types remote testsMarc Alexander2016-01-231-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14428
* | | | | | | | Merge pull request #4132 from VSEphpbb/ticket/14420Marc Alexander2016-01-242-24/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | [ticket/14420] Fix up search results topic lists
| * | | | | | | [ticket/14420] Fix up search results topic listsMatt Friedman2016-01-182-24/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14420
* | | | | | | | Merge branch '3.1.x'Marc Alexander2016-01-231-20/+12
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #4137 from RMcGirr83/ticket_14427Marc Alexander2016-01-231-20/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14427] Memberlist displays inaccurate information
| | * | | | | | | [ticket/14427] Memberlist displays inaccruate informationRichard McGirr2016-01-221-20/+12
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14427
* | | | | | | | Merge branch '3.1.x'Marc Alexander2016-01-211-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | Merge pull request #4135 from lavigor/ticket/14423Marc Alexander2016-01-211-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | [ticket/14423] Display database size for Aria storage engine
| | * | | | | [ticket/14423] Display database size for Aria storage enginelavigor2016-01-201-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14423
* | | | | | Merge pull request #4116 from marc1706/ticket/14402Tristan Darricau2016-01-182-4/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14402] Tidy plupload cron should not rely on user id/ip being available * marc1706/ticket/14402: [ticket/14402] Directly pass user id and ip [ticket/14402] Get rid of globals in tidy_plupload cron [ticket/14402] Do not expect user id and ip to be available in cron
| * | | | | | [ticket/14402] Directly pass user id and ipMarc Alexander2016-01-151-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14402