aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.2.x'Joas Schilling2016-02-137-15/+91
|\
| * Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-137-15/+91
| |\
| | * [3.1.x] Increase dev version for 3.1.9Joas Schilling2016-02-133-3/+3
| | * Merge branch 'prep-release-3.1.8' into 3.1.xJoas Schilling2016-02-1313-23/+99
| | |\
| | | * [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 listOliver Schramm2016-02-134-4/+8
| | | |/ | | |/|
| | | * Merge pull request #4177 from marc1706/ticket/14475Joas Schilling2016-02-131-10/+13
| | | |\
| | | | * [ticket/14475] Do not log removal of users from newly registered groupMarc Alexander2016-02-131-10/+13
| | | |/ | | |/|
| | | * [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-136-8/+8
| | |/
* | | Merge branch '3.2.x'Marc Alexander2016-02-112-1/+45
|\ \ \ | |/ /
| * | Merge pull request #4160 from Nicofuma/ticket/14440Marc Alexander2016-02-112-1/+45
| |\ \ |/ / /
| * | [ticket/14440] Add commentsTristan Darricau2016-02-111-0/+1
| * | [ticket/14440] Add testsTristan Darricau2016-02-071-0/+37
| * | [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-1111-412/+323
|\ \ \
| * | | [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-048-25/+61
| * | | [ticket/14448] Add new vendor files and dirs to clean taskMarc Alexander2016-02-031-0/+36
| * | | [ticket/14448] Do not try to test remote upload timeoutMarc Alexander2016-02-031-13/+0
| * | | [ticket/14448] Remove no longer needed guzzle 3.9.3Marc Alexander2016-02-031-95/+0
| * | | [ticket/14448] Use GuzzleHttp and try to verify certsMarc Alexander2016-02-032-13/+37
| * | | [ticket/14448] Update composer.json and lock file for guzzlehttpMarc Alexander2016-02-032-206/+206
| * | | [ticket/14431] Remote avatar uploadingScott Dutton2016-02-031-1/+7
| * | | [ticket/14431] Remote avatar uploadingScott Dutton2016-02-032-103/+20
* | | | Merge pull request #4172 from Crizz0/ticket/14307Marc Alexander2016-02-101-4/+4
|\ \ \ \
| * | | | [ticket/14307] Fixes wording in install.php file/dir exist/writeableCrizzo2016-02-061-4/+4
* | | | | Merge branch '3.1.x'Marc Alexander2016-02-091-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #4174 from cyberalien/ticket/14467Marc Alexander2016-02-091-2/+2
| |\ \ \ \
| | * | | | [ticket/14467] Fix height calculation in autoResizecyberalien2016-02-081-2/+2
| |/ / / /
* | | | | 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-074-15/+40
|\ \ \ \ \ \
| * | | | | | [ticket/14312] Allow updating without having the update directoryMate Bartus2016-02-043-15/+39
| * | | | | | [ticket/14312] Push migration error messages to the userMate Bartus2016-02-041-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #4167 from Mauron/ticket/14458Tristan Darricau2016-02-071-0/+10
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | |
| * | | | Merge pull request #4167 from Mauron/ticket/14458Tristan Darricau2016-02-071-0/+10
| |\ \ \ \
| | * | | | [ticket/14458] Explicitly state RewriteBase into .htaccess root fileMauron2016-02-071-0/+10
| |/ / / /
* | | | | Merge pull request #4170 from Elsensee/ticket/14461Marc Alexander2016-02-061-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/14461] Correctly count up $processed_recordsOliver Schramm2016-02-061-1/+1
|/ / / /
* | | | Merge branch '3.1.x'Tristan Darricau2016-02-051-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #4164 from rxu/ticket/14356-fixTristan Darricau2016-02-051-1/+1
| |\ \ \
| | * | | [ticket/14356] Fix viewtopic_body_postrow_back2top_append descriptionrxu2016-02-061-1/+1
* | | | | [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] 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
| * | | | | [ticket/14452] Define $progressFillerText in installer.jsMarc Alexander2016-02-051-0/+1