aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14448] Remove no longer needed guzzle 3.9.3Marc Alexander2016-02-031-95/+0
| | | | PHPBB3-14448
* [ticket/14448] Use GuzzleHttp and try to verify certsMarc Alexander2016-02-032-13/+37
| | | | PHPBB3-14448
* [ticket/14448] Update composer.json and lock file for guzzlehttpMarc Alexander2016-02-032-206/+206
| | | | 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-032-103/+20
| | | | | | | | 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 #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
* | | | | | 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-012-3/+42
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | [ticket/14432] Adds a method to get raw language values
| * | | | | | [ticket/14432] Adds a method to get raw language valuesTristan Darricau2016-01-262-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14432
* | | | | | | Merge pull request #4149 from CHItA/ticket/14438Marc Alexander2016-01-312-9/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14438] Allign progressbar text to center
| * | | | | | | [ticket/14438] Allign progressbar text to centerMate Bartus2016-01-292-9/+26
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-14438
* | | | | | | Merge branch '3.1.x'Marc Alexander2016-01-311-2/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #4150 from rxu/ticket/14439Marc Alexander2016-01-311-2/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14439] Do not call avatar manager if avatars are disabled
| | * | | | | [ticket/14439] Do not call avatar manager if avatars are disabledrxu2016-01-311-2/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14439
* | | | | | Merge branch '3.1.x'Marc Alexander2016-01-272-0/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4029 from RMcGirr83/ticket_14289Marc Alexander2016-01-272-0/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14289] Add events to navbar header
| | * | | | | [ticket/14289] Fix location in events.md fileRichard McGirr2016-01-191-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14289
| | * | | | | [ticket/14289] Move append before prepend in events docRichard McGirr2016-01-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14289
| | * | | | | [ticket/14289] Change to 3.1.8-RC1 and rename eventRichard McGirr2016-01-102-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14289