aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* [ticket/14457] Handle the case where there isn't any 'definition' bagTristan Darricau2016-02-181-2/+5
* [ticket/14457] Don't set CSS to JS and JS to CSSTristan Darricau2016-02-181-2/+2
* [ticket/14457] CSTristan Darricau2016-02-181-4/+4
* [ticket/14457] Fix twig/twig::assign_displayTristan Darricau2016-02-181-1/+1
* [ticket/14457] Uses a random placeholder to inject css and jsTristan Darricau2016-02-182-26/+17
* Merge pull request #4171 from CHItA/ticket/14462Tristan Darricau2016-02-1629-337/+1031
|\
| * [ticket/14462] Fix commentsMate Bartus2016-02-127-11/+11
| * [ticket/14462] Fix CS and typoMate Bartus2016-02-121-1/+1
| * [ticket/14462] Refactor tasks to be more modularMate Bartus2016-02-129-165/+835
| * [ticket/14462] Further speed improvementsMate Bartus2016-02-1220-173/+197
* | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-132-0/+34
|\ \
| * \ Merge pull request #4176 from Elsensee/ticket/14409Joas Schilling2016-02-131-0/+2
| |\ \
| | * | [ticket/14409] Update session page info before displaying online listOliver Schramm2016-02-131-0/+2
| * | | [prep-release-3.1.8] Add migration for 3.1.8-RC1Joas Schilling2016-02-131-0/+32
| |/ /
* | | Merge pull request #4160 from Nicofuma/ticket/14440Marc Alexander2016-02-111-1/+8
|\ \ \
| * | | [ticket/14440] Add commentsTristan Darricau2016-02-111-0/+1
| * | | [ticket/14440] Correctly remove the web root path in update_web_root_pathTristan Darricau2016-02-041-1/+7
* | | | Merge pull request #4159 from marc1706/ticket/14448Tristan Darricau2016-02-112-94/+65
|\ \ \ \ | |_|_|/ |/| | |
| * | | [ticket/14448] Correctly pass verify setting if availableMarc Alexander2016-02-081-1/+1
| * | | [ticket/14448] Let user decide if remote upload certs should be checkedMarc Alexander2016-02-042-20/+45
| * | | [ticket/14448] Use GuzzleHttp and try to verify certsMarc Alexander2016-02-031-12/+36
| * | | [ticket/14431] Remote avatar uploadingScott Dutton2016-02-031-1/+7
| * | | [ticket/14431] Remote avatar uploadingScott Dutton2016-02-031-103/+19
* | | | Merge pull request #4169 from CHItA/ticket/14460Tristan Darricau2016-02-075-18/+13
|\ \ \ \
| * | | | [ticket/14460] Use the selected language with AJAX requests as wellMate Bartus2016-02-065-18/+13
* | | | | Merge pull request #4161 from CHItA/ticket/14312Tristan Darricau2016-02-073-15/+39
|\ \ \ \ \
| * | | | | [ticket/14312] Allow updating without having the update directoryMate Bartus2016-02-042-15/+38
| * | | | | [ticket/14312] Push migration error messages to the userMate Bartus2016-02-041-0/+1
| | |/ / / | |/| | |
* | | | | [ticket/14461] Correctly count up $processed_recordsOliver Schramm2016-02-061-1/+1
| |/ / / |/| | |
* | | | Merge branch 'prep-release-3.2.0-b1'Tristan Darricau2016-02-051-0/+39
|\ \ \ \
| * | | | [ticket/14453] Add missing dependency in the text_reparser migrationTristan Darricau2016-02-051-1/+4
| * | | | [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
| |/ / |/| |
* | | Merge branch '3.1.x'Marc Alexander2016-02-031-2/+11
|\ \ \ | |/ / |/| / | |/
* | Merge pull request #4017 from CHItA/ticket/14262Tristan Darricau2016-02-026-3/+144
|\ \
| * | [ticket/14262] Move convertor to controllerMate Bartus2016-01-296-3/+144
* | | Merge pull request #4155 from marc1706/ticket/14446Tristan Darricau2016-02-022-3/+4
|\ \ \
| * | | [ticket/14446] Add predefined placeholder variables to twig definitionMarc Alexander2016-02-022-3/+4
* | | | Merge pull request #4156 from CHItA/ticket/14445Tristan Darricau2016-02-022-3/+16
|\ \ \ \
| * | | | [ticket/14445] Force refresh before schema generationMate Bartus2016-02-022-3/+16
* | | | | [ticket/14321] Clean up arcihve controller logicMate Bartus2016-02-021-3/+3
| |/ / / |/| | |
* | | | Merge pull request #4144 from VSEphpbb/ticket/14434Tristan Darricau2016-02-025-22/+54
|\ \ \ \
| * | | | [ticket/14434] Refactored to check migrations when setting themMatt Friedman2016-01-285-34/+26
| * | | | [ticket/14434] Check migrations in the database updater taskMatt Friedman2016-01-281-0/+9
| * | | | [ticket/14434] Do not include non-migrations in CLI listMatt Friedman2016-01-271-0/+6
| * | | | [ticket/14434] Remove redundant conditionalMatt Friedman2016-01-271-3/+3
| * | | | [ticket/14434] Fix whitespace mistakesMatt Friedman2016-01-271-3/+3
| * | | | [ticket/14434] Remove recursion to simplify is_migration methodMatt Friedman2016-01-273-26/+17
| * | | | [ticket/14434] Extract migration check to a reusable methodMatt Friedman2016-01-273-23/+47
| * | | | [ticket/14434] Schema generator should ignore migration helpersMatt Friedman2016-01-261-1/+11