aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14431] Remote avatar uploadingScott Dutton2016-02-031-103/+19
| | | | | | | | replace the 3.1 way with guzzle Adds guzzle as a dependency Removed a test as it wont wont with guzzle (as far as I know) PHPBB3-14431
* 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
* | | | | Merge pull request #4121 from marc1706/ticket/11875Tristan Darricau2016-01-184-5/+371
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11875] Use 4-byte integer instead of 3-byte integer for ID columns * marc1706/ticket/11875: [ticket/11875] Add back new line [ticket/11875] Change more columns to use UINT and add missings ones [ticket/11875] Add migration file [ticket/11875] Recreate schemas for install [ticket/11875] Create new map for UNSIGNED 4-byte integer [ticket/11875] Upgrade default data type from MEDIUMINT to INT
| * | | | | [ticket/11875] Change more columns to use UINT and add missings onesMarc Alexander2016-01-131-14/+120
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11875
| * | | | | [ticket/11875] Add migration fileMarc Alexander2016-01-131-0/+252
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11875
| * | | | | Merge pull request #2064 from hjpotter92/ticket/11875Marc Alexander2016-01-133-5/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11875] Set default data type from MEDIUMINT (3byte) to INT(10) (4byte) Conflicts: phpBB/includes/db/schema_data.php phpBB/install/schemas/mysql_40_schema.sql phpBB/install/schemas/mysql_41_schema.sql phpBB/install/schemas/oracle_schema.sql phpBB/install/schemas/postgres_schema.sql phpBB/phpbb/db/tools/tools.php
| | * | | | | [ticket/11875] Recreate schemas for installhjpotter922014-03-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11875
| | * | | | | [ticket/11875] Create new map for UNSIGNED 4-byte integerhjpotter922014-03-181-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ULINT => Unsigned Large INTeger
* | | | | | | Merge branch '3.1.x'Marc Alexander2016-01-171-0/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #3718 from javiexin/ticket/13908Marc Alexander2016-01-171-0/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13908] "After" clause in migration not working
| | * | | | | [ticket/13908] "After" clause in migration not workingjaviexin2015-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a migration file, if you try to add a column to a table and specify the order, by specifying an "after" clause, it is not used at all, even for databases that support it (like mysql). This fixes the issue, for mysql databases. Typo fixed. PHPBB3-13908