aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.2.x'Marc Alexander2016-02-270-0/+0
|\
| * Merge branch '3.1.x' into 3.2.xMarc Alexander2016-02-270-0/+0
| |\ | | | | | | | | | | | | Conflicts: build/build.xml
| | * Merge pull request #4195 from marc1706/ticket/14500Marc Alexander2016-02-271-1/+1
| | |\ | | | | | | | | | | | | [ticket/14500] Specify prevversion instead of duplicate newversion
| | | * [ticket/14500] Specify prevversion instead of duplicate newversionMarc Alexander2016-02-271-1/+1
| | |/ | | | | | | | | | PHPBB3-14500
* | | Merge branch '3.2.x'Marc Alexander2016-02-261-1/+37
|\ \ \ | |/ /
| * | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-02-261-1/+37
| |\ \ | | |/
| | * [ticket/14189] Add core.gen_sort_selects_after eventJakub Senko2016-02-261-1/+37
| | | | | | | | | | | | PHPBB3-14189
* | | Merge pull request #4191 from Nicofuma/ticket/14495Máté Bartus2016-02-2511-16/+16
|\ \ \ | | | | | | | | [ticket/14495] Updates the version to 3.3.0-a1-dev
| * | | [ticket/14495] Updates the version to 3.3.0-a1-devTristan Darricau2016-02-2411-16/+16
|/ / / | | | | | | | | | PHPBB3-14495
* | | Merge branch '3.2.x'Tristan Darricau2016-02-221-0/+7
|\ \ \ | |/ / | | | | | | | | | * 3.2.x: [ticket/13842] Prevent internal server errors without rewrite module on IIS
| * | Merge pull request #4188 from marc1706/ticket/13842Tristan Darricau2016-02-221-0/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13842] Prevent internal server errors without rewrite module on IIS * marc1706/ticket/13842: [ticket/13842] Prevent internal server errors without rewrite module on IIS
| | * | [ticket/13842] Prevent internal server errors without rewrite module on IISMarc Alexander2016-02-191-0/+7
| | |/ | | | | | | | | | PHPBB3-13842
* | | Merge branch '3.2.x'Tristan Darricau2016-02-221-0/+2
|\ \ \ | |/ / | | | | | | | | | * 3.2.x: [ticket/14488] Delete cookies to get correct session ID during login
| * | Merge pull request #4186 from marc1706/ticket/14488Tristan Darricau2016-02-221-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14488] Delete cookies to get correct session ID during login * marc1706/ticket/14488: [ticket/14488] Delete cookies to get correct session ID during login
| | * | [ticket/14488] Delete cookies to get correct session ID during loginMarc Alexander2016-02-181-0/+2
| | | | | | | | | | | | | | | | PHPBB3-14488
* | | | 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
| | * | [ticket/14489] Fix bug where extension custom compiler pass cannot be found.Mark Shaw2016-02-181-1/+1
| |/ / | | | | | | | | | | | | | | | This is returning an extra / on my machine which throws off the next code block, and then the class can't be found. PHPBB3-14489
* | | Merge branch '3.2.x'Tristan Darricau2016-02-183-0/+20
|\ \ \ | |/ / | | | | | | | | | * 3.2.x: [ticket/13681] Invalidate and reset opcache where necessary
| * | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-02-183-0/+20
| |\ \ | | |/ | | | | | | | | | * 3.1.x: [ticket/13681] Invalidate and reset opcache where necessary
| | * Merge pull request #4185 from marc1706/ticket/13681Tristan Darricau2016-02-183-0/+20
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13681] Invalidate and reset opcache where necessary * marc1706/ticket/13681: [ticket/13681] Invalidate and reset opcache where necessary
| | | * [ticket/13681] Invalidate and reset opcache where necessaryMarc Alexander2016-02-183-0/+20
| | | | | | | | | | | | | | | | PHPBB3-13681
* | | | 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] Uses a random placeholder to inject css and js
| | * | | [ticket/14457] Replaces unique_id implementation by random_bytes()Tristan Darricau2016-02-184-19/+60
| | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| | * | | [ticket/14457] Set the config values related to the RNG in the installer configTristan Darricau2016-02-181-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| | * | | [ticket/14457] Handle the case where there isn't any 'definition' bagTristan Darricau2016-02-181-2/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| | * | | [ticket/14457] Don't set CSS to JS and JS to CSSTristan Darricau2016-02-182-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| | * | | [ticket/14457] CSTristan Darricau2016-02-181-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| | * | | [ticket/14457] Fix twig/twig::assign_displayTristan Darricau2016-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| | * | | [ticket/14457] Uses a random placeholder to inject css and jsTristan Darricau2016-02-182-26/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-14457
* | | | | Merge branch '3.2.x'Tristan Darricau2016-02-187-31/+443
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14315] Properly get sid from cookies and simplify take_screenshot [ticket/14315] Use proper ID selectors in ui test [ticket/14315] Add logout to ui tests and use in permissions role test [ticket/14315] Add functional tests for permission roles and fix non-js [ticket/14315] Add tests for setting permission roles using javascript [ticket/14315] Add more functionality to ui test cases [ticket/14315] Add back roles select for disable javascript [ticket/14315] Tweak location of drop-down [ticket/14315] Apply roles options format for multiple forums too [ticket/14315] Build role options for each permission group [ticket/14315] Correctly set default values and reset values [ticket/14315] Only add role options specified for each group
| * | | | Merge pull request #4166 from marc1706/ticket/14315Tristan Darricau2016-02-187-31/+443
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14315] Correctly set permission roles for multiple groups * marc1706/ticket/14315: [ticket/14315] Properly get sid from cookies and simplify take_screenshot [ticket/14315] Use proper ID selectors in ui test [ticket/14315] Add logout to ui tests and use in permissions role test [ticket/14315] Add functional tests for permission roles and fix non-js [ticket/14315] Add tests for setting permission roles using javascript [ticket/14315] Add more functionality to ui test cases [ticket/14315] Add back roles select for disable javascript [ticket/14315] Tweak location of drop-down [ticket/14315] Apply roles options format for multiple forums too [ticket/14315] Build role options for each permission group [ticket/14315] Correctly set default values and reset values [ticket/14315] Only add role options specified for each group
| | * | | | [ticket/14315] Properly get sid from cookies and simplify take_screenshotMarc Alexander2016-02-182-37/+16
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14315
| | * | | | [ticket/14315] Use proper ID selectors in ui testMarc Alexander2016-02-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14315
| | * | | | [ticket/14315] Add logout to ui tests and use in permissions role testMarc Alexander2016-02-172-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14315
| | * | | | [ticket/14315] Add functional tests for permission roles and fix non-jsMarc Alexander2016-02-174-4/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without JS the settings were not applied due to duplicate input names. PHPBB3-14315
| | * | | | [ticket/14315] Add tests for setting permission roles using javascriptMarc Alexander2016-02-161-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14315
| | * | | | [ticket/14315] Add more functionality to ui test casesMarc Alexander2016-02-161-0/+208
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14315
| | * | | | [ticket/14315] Add back roles select for disable javascriptMarc Alexander2016-02-164-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The javascript will hide the old select and show the version using the span and showing the tooltips. PHPBB3-14315
| | * | | | [ticket/14315] Tweak location of drop-downMarc Alexander2016-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14315
| | * | | | [ticket/14315] Apply roles options format for multiple forums tooMarc Alexander2016-02-161-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14315
| | * | | | [ticket/14315] Build role options for each permission groupMarc Alexander2016-02-162-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously all role options were put into one array. This required filtering the options. Instead, these are now passed to the template via template loops. PHPBB3-14315
| | * | | | [ticket/14315] Correctly set default values and reset valuesMarc Alexander2016-02-163-22/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The permissions tooltip javascript failed at correctly passing the default values to the page. The same applied to the display_mask() method in includes/acp/auth.php. PHPBB3-14315
| | * | | | [ticket/14315] Only add role options specified for each groupMarc Alexander2016-02-162-0/+3
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-14315
* | | | | 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
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/composer.lock
| | * | | Merge branch 'prep-release-3.1.8' into 3.1.xJoas Schilling2016-02-183-4/+35
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | | * | Add migration for 3.1.8Joas Schilling2016-02-181-0/+31
| | | | |
| | | * | Update version for final 3.1.8 releaseJoas Schilling2016-02-183-4/+4
| | | | |
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 09:03:18 +0000