aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14478] Move facebook/webdriver dependency to main composer fileMarc Alexander2016-02-142-2/+46
| | | | | | | Also updated to latest version and now using proper version in composer.json. PHPBB3-14478
* Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-137-15/+91
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * [3.1.x] Increase dev version for 3.1.9Joas Schilling2016-02-132-2/+2
| |
| * [prep-release-3.1.8] Update changelogJoas Schilling2016-02-131-0/+2
| |
| * Merge pull request #4176 from Elsensee/ticket/14409Joas Schilling2016-02-134-4/+8
| |\ | | | | | | | | | [ticket/14409] Update session page info before displaying online list
| | * [ticket/14409] Update session page info before displaying online listOliver Schramm2016-02-134-4/+8
| | | | | | | | | | | | PHPBB3-14409
| * | Merge pull request #4177 from marc1706/ticket/14475Joas Schilling2016-02-131-10/+13
| |\ \ | | | | | | | | | | | | [ticket/14475] Do not log removal of users from newly registered group
| | * | [ticket/14475] Do not log removal of users from newly registered groupMarc Alexander2016-02-131-10/+13
| | |/ | | | | | | | | | PHPBB3-14475
| * | [prep-release-3.1.8] Add changelog for 3.1.8-RC1Joas Schilling2016-02-131-1/+36
| | |
| * | [prep-release-3.1.8] Add migration for 3.1.8-RC1Joas Schilling2016-02-131-0/+32
| | |
| * | [prep-release-3.1.8] Update version to 3.1.8-RC1Joas Schilling2016-02-135-7/+7
| |/
* | 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-118-394/+276
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-046-20/+50
| | | | | | | | | | | | | | | | | | | | | | | | Also fixed some minor issues like coding style. PHPBB3-14448
| * | | [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-031-12/+36
| | | | | | | | | | | | | | | | 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 pull request #4172 from Crizz0/ticket/14307Marc Alexander2016-02-101-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14307] Fixes wording in install.php file/dir exist/writeable
| * | | | [ticket/14307] Fixes wording in install.php file/dir exist/writeableCrizzo2016-02-061-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-14307
* | | | | Merge branch '3.1.x'Marc Alexander2016-02-091-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | [ticket/14467] Fix height calculation in autoResizecyberalien2016-02-081-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14467
* | | | | 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-074-15/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-043-15/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14312
| * | | | | | [ticket/14312] Push migration error messages to the userMate Bartus2016-02-041-0/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | PHPBB3-14312
* | | | | | Merge pull request #4167 from Mauron/ticket/14458Tristan Darricau2016-02-071-0/+10
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | | | | | | | | | | | | fixes #4167 * 3.1.x: [ticket/14458] Explicitly state RewriteBase into .htaccess root file
| * | | | [ticket/14458] Explicitly state RewriteBase into .htaccess root fileMauron2016-02-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | The statement RewriteBase / needs to be explicitly typed down into the .htaccess file in root in order to reduce all the support requests about the implicit statement and the URL rewriting not working. PHPBB3-14458
* | | | | [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-053-3/+3
| | | | |
* | | | | Merge branch 'prep-release-3.2.0-b1'Tristan Darricau2016-02-059-9/+3485
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-035-6/+6
| | |_|_|/ | |/| | |
* | | | | 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
* | | | | [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