aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xTristan Darricau2016-02-183-0/+20
|\
| * Merge pull request #4185 from marc1706/ticket/13681Tristan Darricau2016-02-183-0/+20
| |\
| | * [ticket/13681] Invalidate and reset opcache where necessaryMarc Alexander2016-02-183-0/+20
* | | Merge pull request #4165 from Nicofuma/ticket/14457Marc Alexander2016-02-187-46/+76
|\ \ \
| * | | [ticket/14457] Replaces unique_id implementation by random_bytes()Tristan Darricau2016-02-183-19/+53
| * | | [ticket/14457] Set the config values related to the RNG in the installer configTristan Darricau2016-02-181-1/+3
| * | | [ticket/14457] Handle the case where there isn't any 'definition' bagTristan Darricau2016-02-181-2/+5
| * | | [ticket/14457] Don't set CSS to JS and JS to CSSTristan Darricau2016-02-181-2/+2
| * | | [ticket/14457] CSTristan Darricau2016-02-181-4/+4
| * | | [ticket/14457] Fix twig/twig::assign_displayTristan Darricau2016-02-181-1/+1
| * | | [ticket/14457] Uses a random placeholder to inject css and jsTristan Darricau2016-02-182-26/+17
* | | | Merge pull request #4166 from marc1706/ticket/14315Tristan Darricau2016-02-184-31/+70
|\ \ \ \
| * | | | [ticket/14315] Add functional tests for permission roles and fix non-jsMarc Alexander2016-02-172-2/+9
| * | | | [ticket/14315] Add back roles select for disable javascriptMarc Alexander2016-02-164-1/+30
| * | | | [ticket/14315] Tweak location of drop-downMarc Alexander2016-02-161-1/+1
| * | | | [ticket/14315] Apply roles options format for multiple forums tooMarc Alexander2016-02-161-4/+5
| * | | | [ticket/14315] Build role options for each permission groupMarc Alexander2016-02-162-7/+8
| * | | | [ticket/14315] Correctly set default values and reset valuesMarc Alexander2016-02-163-22/+20
| * | | | [ticket/14315] Only add role options specified for each groupMarc Alexander2016-02-162-0/+3
| |/ / /
* | | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-181-0/+31
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'prep-release-3.1.8' into 3.1.xJoas Schilling2016-02-182-2/+33
| |\ \ \ | | |_|/ | |/| |
| | * | Add migration for 3.1.8Joas Schilling2016-02-181-0/+31
| | * | Update version for final 3.1.8 releaseJoas Schilling2016-02-182-2/+2
| | * | [ticket/14485] Update composer.lockMarc Alexander2016-02-181-2/+2
* | | | Merge pull request #4127 from RMcGirr83/ticket_14416Marc Alexander2016-02-181-0/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | [ticket/14416] Revert changes and use twig spacelessRichard McGirr2016-02-031-2/+14
| * | | [ticket/14416] footer nav links have incorrect tooltip styling appliedRichard McGirr2016-01-171-10/+2
* | | | Merge pull request #4171 from CHItA/ticket/14462Tristan Darricau2016-02-1638-352/+1116
|\ \ \ \
| * | | | [ticket/14462] Not show timeout messages in convertorsMate Bartus2016-02-141-4/+4
| * | | | [ticket/14462] Make timeout error translateableOliver Schramm2016-02-143-3/+16
| * | | | [ticket/14462] Update ordering in install db configMate Bartus2016-02-131-4/+4
| * | | | [ticket/14462] Fix commentsMate Bartus2016-02-127-11/+11
| * | | | [ticket/14462] Fix CS and typoMate Bartus2016-02-121-1/+1
| * | | | [ticket/14462] Refactor tasks to be more modularMate Bartus2016-02-1212-168/+860
| * | | | [ticket/14462] Further speed improvementsMate Bartus2016-02-1225-178/+237
* | | | | Merge pull request #4157 from VSEphpbb/ticket/14447Tristan Darricau2016-02-1550-144/+144
|\ \ \ \ \
| * | | | | [ticket/14447] Remove trailing white spaces in ProsilverMatt Friedman2016-02-0250-144/+144
* | | | | | Merge pull request #4179 from marc1706/ticket/14477Tristan Darricau2016-02-151-5/+5
|\ \ \ \ \ \
| * | | | | | [ticket/14477] Update text-formatter dependencyMarc Alexander2016-02-141-5/+5
* | | | | | | [ticket/14478] Move facebook/webdriver dependency to main composer fileMarc Alexander2016-02-142-2/+46
|/ / / / / /
* | | | | | 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-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 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-135-7/+7
| |/ / / /