aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xTristan Darricau2016-02-182-0/+10
|\ | | | | | | | | * 3.1.x: [ticket/13681] Invalidate and reset opcache where necessary
| * Merge pull request #4185 from marc1706/ticket/13681Tristan Darricau2016-02-182-0/+10
| |\ | | | | | | | | | | | | | | | | | | [ticket/13681] Invalidate and reset opcache where necessary * marc1706/ticket/13681: [ticket/13681] Invalidate and reset opcache where necessary
| | * [ticket/13681] Invalidate and reset opcache where necessaryMarc Alexander2016-02-182-0/+10
| | | | | | | | | | | | PHPBB3-13681
* | | Merge pull request #4165 from Nicofuma/ticket/14457Marc Alexander2016-02-183-26/+20
|\ \ \ | | | | | | | | | | | | [ticket/14457] Uses a random placeholder to inject css and js
| * | | [ticket/14457] Handle the case where there isn't any 'definition' bagTristan Darricau2016-02-181-2/+5
| | | | | | | | | | | | | | | | PHPBB3-14457
| * | | [ticket/14457] Don't set CSS to JS and JS to CSSTristan Darricau2016-02-181-2/+2
| | | | | | | | | | | | | | | | PHPBB3-14457
| * | | [ticket/14457] CSTristan Darricau2016-02-181-4/+4
| | | | | | | | | | | | | | | | PHPBB3-14457
| * | | [ticket/14457] Fix twig/twig::assign_displayTristan Darricau2016-02-181-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14457
| * | | [ticket/14457] Uses a random placeholder to inject css and jsTristan Darricau2016-02-182-26/+17
| | | | | | | | | | | | | | | | PHPBB3-14457
* | | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-181-0/+31
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | Conflicts: build/build.xml phpBB/composer.lock
| * | Add migration for 3.1.8Joas Schilling2016-02-181-0/+31
| |/
* | Merge pull request #4171 from CHItA/ticket/14462Tristan Darricau2016-02-1629-337/+1031
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14462] Try to prevent timeouts in the installer * CHItA/ticket/14462: [ticket/14462] Not show timeout messages in convertors [ticket/14462] Make timeout error translateable [ticket/14462] Update ordering in install db config [ticket/14462] Fix comments [ticket/14462] Fix tests [ticket/14462] Fix CS and typo [ticket/14462] Set instance of db driver for database access using global [ticket/14462] Fix installation in tests [ticket/14462] Refactor tasks to be more modular [ticket/14462] Further speed improvements
| * | [ticket/14462] Fix commentsMate Bartus2016-02-127-11/+11
| | | | | | | | | | | | PHPBB3-14462
| * | [ticket/14462] Fix CS and typoMate Bartus2016-02-121-1/+1
| | | | | | | | | | | | PHPBB3-14462
| * | [ticket/14462] Refactor tasks to be more modularMate Bartus2016-02-129-165/+835
| | | | | | | | | | | | PHPBB3-14462
| * | [ticket/14462] Further speed improvementsMate Bartus2016-02-1220-173/+197
| | | | | | | | | | | | | | | | | | | | | | | | - Cache the secondary container - Only initialize tasks/modules that are being used - Add timeout error message in the AJAX UI PHPBB3-14462
* | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-132-0/+34
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/includes/constants.php phpBB/includes/functions_user.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | Merge pull request #4176 from Elsensee/ticket/14409Joas Schilling2016-02-131-0/+2
| |\ \ | | | | | | | | | | | | [ticket/14409] Update session page info before displaying online list
| | * | [ticket/14409] Update session page info before displaying online listOliver Schramm2016-02-131-0/+2
| | | | | | | | | | | | | | | | PHPBB3-14409
| * | | [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] Correctly remove the web root path in update_web_root_path
| * | | [ticket/14440] Add commentsTristan Darricau2016-02-111-0/+1
| | | | | | | | | | | | | | | | PHPBB3-14440
| * | | [ticket/14440] Correctly remove the web root path in update_web_root_pathTristan Darricau2016-02-041-1/+7
| | | | | | | | | | | | | | | | PHPBB3-14440
* | | | Merge pull request #4159 from marc1706/ticket/14448Tristan Darricau2016-02-112-94/+65
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14448] Use guzzle for remote files uploading * marc1706/ticket/14448: [ticket/14448] Correctly pass verify setting if available [ticket/14448] Let user decide if remote upload certs should be checked [ticket/14448] Add new vendor files and dirs to clean task [ticket/14448] Do not try to test remote upload timeout [ticket/14448] Remove no longer needed guzzle 3.9.3 [ticket/14448] Use GuzzleHttp and try to verify certs [ticket/14448] Update composer.json and lock file for guzzlehttp [ticket/14431] Remote avatar uploading [ticket/14431] Remote avatar uploading
| * | | [ticket/14448] Correctly pass verify setting if availableMarc Alexander2016-02-081-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14448
| * | | [ticket/14448] Let user decide if remote upload certs should be checkedMarc Alexander2016-02-042-20/+45
| | | | | | | | | | | | | | | | | | | | | | | | Also fixed some minor issues like coding style. PHPBB3-14448
| * | | [ticket/14448] Use GuzzleHttp and try to verify certsMarc Alexander2016-02-031-12/+36
| | | | | | | | | | | | | | | | PHPBB3-14448
| * | | [ticket/14431] Remote avatar uploadingScott Dutton2016-02-031-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed content length bug Ran composer update PHPBB3-14431
| * | | [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 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-02 06:20:22 +0000