aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/14495] Updates the version to 3.3.0-a1-devTristan Darricau2016-02-2411-16/+16
* Merge branch '3.2.x'Tristan Darricau2016-02-221-0/+7
|\
| * Merge pull request #4188 from marc1706/ticket/13842Tristan Darricau2016-02-221-0/+7
| |\
| | * [ticket/13842] Prevent internal server errors without rewrite module on IISMarc Alexander2016-02-191-0/+7
* | | Merge branch '3.2.x'Tristan Darricau2016-02-221-0/+2
|\ \ \ | |/ /
| * | Merge pull request #4186 from marc1706/ticket/14488Tristan Darricau2016-02-221-0/+2
| |\ \
| | * | [ticket/14488] Delete cookies to get correct session ID during loginMarc Alexander2016-02-181-0/+2
* | | | Merge branch '3.2.x'Marc Alexander2016-02-191-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #4187 from markshawtoronto/ticket/14489Marc Alexander2016-02-191-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/14489] Fix bug where extension custom compiler pass cannot be found.Mark Shaw2016-02-181-1/+1
| |/ /
* | | Merge branch '3.2.x'Tristan Darricau2016-02-183-0/+20
|\ \ \ | |/ /
| * | 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 branch '3.2.x'Marc Alexander2016-02-189-46/+84
|\ \ \ \ | |/ / /
| * | | Merge pull request #4165 from Nicofuma/ticket/14457Marc Alexander2016-02-189-46/+84
| |\ \ \
| | * | | [ticket/14457] Replaces unique_id implementation by random_bytes()Tristan Darricau2016-02-184-19/+60
| | * | | [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-182-2/+3
| | * | | [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 branch '3.2.x'Tristan Darricau2016-02-187-31/+443
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4166 from marc1706/ticket/14315Tristan Darricau2016-02-187-31/+443
| |\ \ \ \
| | * | | | [ticket/14315] Properly get sid from cookies and simplify take_screenshotMarc Alexander2016-02-182-37/+16
| | * | | | [ticket/14315] Use proper ID selectors in ui testMarc Alexander2016-02-171-3/+3
| | * | | | [ticket/14315] Add logout to ui tests and use in permissions role testMarc Alexander2016-02-172-0/+11
| | * | | | [ticket/14315] Add functional tests for permission roles and fix non-jsMarc Alexander2016-02-174-4/+97
| | * | | | [ticket/14315] Add tests for setting permission roles using javascriptMarc Alexander2016-02-161-0/+89
| | * | | | [ticket/14315] Add more functionality to ui test casesMarc Alexander2016-02-161-0/+208
| | * | | | [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.2.x'Joas Schilling2016-02-182-1/+32
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-182-1/+32
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'prep-release-3.1.8' into 3.1.xJoas Schilling2016-02-183-4/+35
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Add migration for 3.1.8Joas Schilling2016-02-181-0/+31
| | | * | Update version for final 3.1.8 releaseJoas Schilling2016-02-183-4/+4
| | | * | Merge pull request #4183 from marc1706/ticket/14485Joas Schilling2016-02-181-2/+2
| | | |\ \
| | | | * | [ticket/14485] Update composer.lockMarc Alexander2016-02-181-2/+2
| | | |/ /
* | | | | Merge branch '3.2.x'Marc Alexander2016-02-181-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | 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 branch '3.2.x'Tristan Darricau2016-02-1642-369/+1185
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4171 from CHItA/ticket/14462Tristan Darricau2016-02-1642-369/+1185
| |\ \ \ \