aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #4169 from CHItA/ticket/14460Tristan Darricau2016-02-075-18/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14460] Use the selected language with AJAX requests as well * CHItA/ticket/14460: [ticket/14460] Use the selected language with AJAX requests as well
| * | | | [ticket/14460] Use the selected language with AJAX requests as wellMate Bartus2016-02-065-18/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-14460
* | | | | Merge pull request #4161 from CHItA/ticket/14312Tristan Darricau2016-02-073-15/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14312] Enable running database update only * CHItA/ticket/14312: [ticket/14312] Allow updating without having the update directory [ticket/14312] Push migration error messages to the user
| * | | | | [ticket/14312] Allow updating without having the update directoryMate Bartus2016-02-042-15/+38
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14312
| * | | | | [ticket/14312] Push migration error messages to the userMate Bartus2016-02-041-0/+1
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-14312
* | | | | [ticket/14461] Correctly count up $processed_recordsOliver Schramm2016-02-061-1/+1
| |/ / / |/| | | | | | | | | | | PHPBB3-14461
* | | | Merge branch 'prep-release-3.2.0-b1'Tristan Darricau2016-02-051-0/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.2.0-b1: [prep-release-3.2.0-b1] Add changelog for 3.2.0-b1 [ticket/14453] Add missing dependency in the text_reparser migration [ticket/14452] Define $progressFillerText in installer.js [prep-release-3.2.0-b1] Add migration for 3.2.0-b1 [prep-release-3.2.0-b1] Update language help files [prep-release-3.2.0-b1] Add schema.json [prep-release-3.2.0-b1] Update version to 3.2.0-b1
| * | | | [ticket/14453] Add missing dependency in the text_reparser migrationTristan Darricau2016-02-051-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-14453
| * | | | [prep-release-3.2.0-b1] Add migration for 3.2.0-b1Tristan Darricau2016-02-051-0/+39
| | |/ / | |/| |
* | | | [ticket/14453] Add missing dependency in the text_reparser migrationTristan Darricau2016-02-051-1/+4
| |/ / |/| | | | | | | | PHPBB3-14453
* | | Merge branch '3.1.x'Marc Alexander2016-02-031-2/+11
|\ \ \ | |/ / |/| / | |/ | | Conflicts: phpBB/includes/functions_upload.php
* | Merge pull request #4017 from CHItA/ticket/14262Tristan Darricau2016-02-026-3/+144
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14262] Move convertor to controller * CHItA/ticket/14262: [ticket/14262] Add error handling and small CS fixes [ticket/14262] Remove converter template duplicate [ticket/14262] Fix stage navigation [ticket/14262] Move convertor to controller
| * | [ticket/14262] Move convertor to controllerMate Bartus2016-01-296-3/+144
| | | | | | | | | | | | PHPBB3-14262
* | | Merge pull request #4155 from marc1706/ticket/14446Tristan Darricau2016-02-022-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14446] Add predefined placeholder variables to twig definition * marc1706/ticket/14446: [ticket/14446] Add predefined placeholder variables to twig definition
| * | | [ticket/14446] Add predefined placeholder variables to twig definitionMarc Alexander2016-02-022-3/+4
| | | | | | | | | | | | | | | | PHPBB3-14446
* | | | Merge pull request #4156 from CHItA/ticket/14445Tristan Darricau2016-02-022-3/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14445] Force refresh before schema generation * CHItA/ticket/14445: [ticket/14445] Force refresh before schema generation
| * | | | [ticket/14445] Force refresh before schema generationMate Bartus2016-02-022-3/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-14445
* | | | | [ticket/14321] Clean up arcihve controller logicMate Bartus2016-02-021-3/+3
| |/ / / |/| | | | | | | | | | | PHPBB3-14321
* | | | Merge pull request #4144 from VSEphpbb/ticket/14434Tristan Darricau2016-02-025-22/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14434] Allow non-migration files inside migrations folder (continued) * VSEphpbb/ticket/14434: [ticket/14434] Refactored to check migrations when setting them [ticket/14434] Check migrations in the database updater task [ticket/14434] Do not include non-migrations in CLI list [ticket/14434] Remove redundant conditional [ticket/14434] Fix whitespace mistakes [ticket/14434] Remove recursion to simplify is_migration method [ticket/14434] Extract migration check to a reusable method [ticket/14434] Schema generator should ignore migration helpers
| * | | | [ticket/14434] Refactored to check migrations when setting themMatt Friedman2016-01-285-34/+26
| | | | | | | | | | | | | | | | | | | | PHPBB3-14434
| * | | | [ticket/14434] Check migrations in the database updater taskMatt Friedman2016-01-281-0/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-14434
| * | | | [ticket/14434] Do not include non-migrations in CLI listMatt Friedman2016-01-271-0/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-14434
| * | | | [ticket/14434] Remove redundant conditionalMatt Friedman2016-01-271-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14434
| * | | | [ticket/14434] Fix whitespace mistakesMatt Friedman2016-01-271-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14434
| * | | | [ticket/14434] Remove recursion to simplify is_migration methodMatt Friedman2016-01-273-26/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-14434
| * | | | [ticket/14434] Extract migration check to a reusable methodMatt Friedman2016-01-273-23/+47
| | | | | | | | | | | | | | | | | | | | PHPBB3-14434
| * | | | [ticket/14434] Schema generator should ignore migration helpersMatt Friedman2016-01-261-1/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-14434
* | | | | Merge pull request #4147 from marc1706/ticket/14436Oliver Schramm2016-02-011-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14436] Add dependency on oauth_states migration
| * | | | | [ticket/14436] Add dependency on oauth_states migrationMarc Alexander2016-01-271-1/+4
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-14436
* | | | | Merge pull request #4145 from Nicofuma/ticket/14432Marc Alexander2016-02-011-3/+23
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | [ticket/14432] Adds a method to get raw language values
| * | | | [ticket/14432] Adds a method to get raw language valuesTristan Darricau2016-01-261-3/+23
| |/ / / | | | | | | | | | | | | PHPBB3-14432
* | | | [ticket/14129] Caches extensions autoloadersTristan Darricau2016-01-262-1/+31
|/ / / | | | | | | | | | PHPBB3-14129
* | | 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-253-28/+94
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-241-16/+10
| | | | | | | | | | | | 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-151-1/+27
| |\ \ | | | | | | | | | | | | [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-231-14/+19
| | | | | | | | | | | | | | | | 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 #4116 from marc1706/ticket/14402Tristan Darricau2016-01-181-4/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
| * | | | [ticket/14402] Get rid of globals in tidy_plupload cronMarc Alexander2016-01-151-6/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-14402
| * | | | [ticket/14402] Do not expect user id and ip to be available in cronMarc Alexander2016-01-151-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14402