aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14307] Fixes wording in install.php file/dir exist/writeableCrizzo2016-02-061-4/+4
| | | | PHPBB3-14307
* Merge pull request #4170 from Elsensee/ticket/14461Marc Alexander2016-02-061-1/+1
|\ | | | | | | [ticket/14461] Correctly count up $processed_records
| * [ticket/14461] Correctly count up $processed_recordsOliver Schramm2016-02-061-1/+1
|/ | | | PHPBB3-14461
* Merge branch '3.1.x'Tristan Darricau2016-02-051-1/+1
|\ | | | | | | | | * 3.1.x: [ticket/14356] Fix viewtopic_body_postrow_back2top_append description
| * Merge pull request #4164 from rxu/ticket/14356-fixTristan Darricau2016-02-051-1/+1
| |\ | | | | | | | | | | | | | | | | | | [ticket/14356] Fix viewtopic_body_postrow_back2top_append description * rxu/ticket/14356-fix: [ticket/14356] Fix viewtopic_body_postrow_back2top_append description
| | * [ticket/14356] Fix viewtopic_body_postrow_back2top_append descriptionrxu2016-02-061-1/+1
| | | | | | | | | | | | PHPBB3-14356
* | | [release-3.2.0-b1] Update version to 3.2.0-b2-devTristan Darricau2016-02-054-6/+6
| | |
* | | Merge branch 'prep-release-3.2.0-b1'Tristan Darricau2016-02-0510-12/+3488
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | [prep-release-3.2.0-b1] Add changelog for 3.2.0-b1Tristan Darricau2016-02-051-1/+49
| | | |
| * | | [ticket/14453] Add missing dependency in the text_reparser migrationTristan Darricau2016-02-051-1/+4
| | | | | | | | | | | | | | | | PHPBB3-14453
| * | | [ticket/14452] Define $progressFillerText in installer.jsMarc Alexander2016-02-051-0/+1
| | | | | | | | | | | | | | | | PHPBB3-14452
| * | | [prep-release-3.2.0-b1] Add migration for 3.2.0-b1Tristan Darricau2016-02-051-0/+39
| | | |
| * | | [prep-release-3.2.0-b1] Update language help filesTristan Darricau2016-02-031-2/+2
| | | |
| * | | [prep-release-3.2.0-b1] Add schema.jsonTristan Darricau2016-02-031-0/+3389
| | | |
| * | | [prep-release-3.2.0-b1] Update version to 3.2.0-b1Tristan Darricau2016-02-036-9/+9
| | | |
* | | | Merge pull request #4163 from Nicofuma/ticket/14453Tristan Darricau2016-02-051-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14453] Add missing dependency in the text_reparser migration * Nicofuma/ticket/14453: [ticket/14453] Add missing dependency in the text_reparser migration
| * | | | [ticket/14453] Add missing dependency in the text_reparser migrationTristan Darricau2016-02-051-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-14453
* | | | | Merge pull request #4162 from marc1706/ticket/14452Tristan Darricau2016-02-051-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | [ticket/14452] Define $progressFillerText in installer.js * marc1706/ticket/14452: [ticket/14452] Define $progressFillerText in installer.js
| * | | | [ticket/14452] Define $progressFillerText in installer.jsMarc Alexander2016-02-051-0/+1
|/ / / / | | | | | | | | | | | | PHPBB3-14452
* | | | Merge branch '3.1.x'Marc Alexander2016-02-031-2/+11
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Conflicts: phpBB/includes/functions_upload.php
| * | Merge pull request #4141 from exussum12/ticket/14431-3.1Marc Alexander2016-02-031-2/+11
| |\ \ | | | | | | | | | | | | [ticket/14431] Remote avatar uploading
| | * | [ticket/14430] Remote avatar uploadingScott Dutton2016-02-031-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove support for redirects PHPBB3-14431
| | * | [ticket/14431] Remote avatar uploadingScott Dutton2016-01-251-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow HTTPS images to be remotely uploaded. Also includes support for redirects (currently up to 5) PHPBB3-14431
* | | | Merge pull request #4017 from CHItA/ticket/14262Tristan Darricau2016-02-0216-3/+2944
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Add error handling and small CS fixesMate Bartus2016-02-023-8/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-14262
| * | | | [ticket/14262] Remove converter template duplicateMate Bartus2016-01-291-134/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-14262
| * | | | [ticket/14262] Fix stage navigationMate Bartus2016-01-291-22/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-14262
| * | | | [ticket/14262] Move convertor to controllerMate Bartus2016-01-2917-3/+3082
| | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge pull request #4158 from CHItA/ticket/14321Tristan Darricau2016-02-021-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14321] Clean up arcihve controller logic * CHItA/ticket/14321: [ticket/14321] Clean up arcihve controller logic
| * | | | | | [ticket/14321] Clean up arcihve controller logicMate Bartus2016-02-021-3/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14321
* | | | | | Merge pull request #4154 from Nicofuma/ticket/14444Marc Alexander2016-02-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14444] Fix fatal error in functions_messenger.php
| * | | | | | [ticket/14444] Fix fatal error in functions_messenger.phpTristan Darricau2016-02-021-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14444
* | | | | | Merge pull request #4144 from VSEphpbb/ticket/14434Tristan Darricau2016-02-026-26/+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-286-38/+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 #4152 from marc1706/ticket/14442Tristan Darricau2016-02-024-35/+228
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14442] Use Goutte 2.0 for functional tests * marc1706/ticket/14442: [ticket/14442] Use get_content() in functional test case [ticket/14442] Properly set plupload header [ticket/14442] Use get_content() in plupload functional tests [ticket/14442] Use Goutte 2.0 instead of outdated 1.0
| * | | | | | | [ticket/14442] Use get_content() in functional test caseMarc Alexander2016-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14442
| * | | | | | | [ticket/14442] Properly set plupload headerMarc Alexander2016-02-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14442
| * | | | | | | [ticket/14442] Use get_content() in plupload functional testsMarc Alexander2016-02-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14442
| * | | | | | | [ticket/14442] Use Goutte 2.0 instead of outdated 1.0Marc Alexander2016-02-013-29/+222
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-14442