aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 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 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.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
| | | |
| | * | Merge pull request #4183 from marc1706/ticket/14485Joas Schilling2016-02-181-2/+2
| | |\ \ | | | | | | | | | | | | | | | [ticket/14485] Update composer.lock
| | | * | [ticket/14485] Update composer.lockMarc Alexander2016-02-181-2/+2
| | |/ / | | | | | | | | | | | | PHPBB3-14485
* | | | Merge pull request #4127 from RMcGirr83/ticket_14416Marc Alexander2016-02-181-0/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | [ticket/14416] footer nav links have incorrect tooltip styling applied
| * | | [ticket/14416] Revert changes and use twig spacelessRichard McGirr2016-02-031-2/+14
| | | | | | | | | | | | | | | | PHPBB3-14416
| * | | [ticket/14416] footer nav links have incorrect tooltip styling appliedRichard McGirr2016-01-171-10/+2
| | | | | | | | | | | | | | | | PHPBB3-14416
* | | | Merge pull request #4171 from CHItA/ticket/14462Tristan Darricau2016-02-1642-369/+1185
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14462] Try to prevent timeouts in the installer * CHItA/ticket/14462: [ticket/14462] Not show timeout messages in convertors [ticket/14462] Make timeout error translateable [ticket/14462] Update ordering in install db config [ticket/14462] Fix comments [ticket/14462] Fix tests [ticket/14462] Fix CS and typo [ticket/14462] Set instance of db driver for database access using global [ticket/14462] Fix installation in tests [ticket/14462] Refactor tasks to be more modular [ticket/14462] Further speed improvements
| * | | | [ticket/14462] Not show timeout messages in convertorsMate Bartus2016-02-141-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-14462
| * | | | [ticket/14462] Make timeout error translateableOliver Schramm2016-02-143-3/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-14462
| * | | | [ticket/14462] Update ordering in install db configMate Bartus2016-02-131-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-14462
| * | | | [ticket/14462] Fix commentsMate Bartus2016-02-127-11/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-14462
| * | | | [ticket/14462] Fix testsMate Bartus2016-02-122-6/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-14462
| * | | | [ticket/14462] Fix CS and typoMate Bartus2016-02-122-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14462
| * | | | [ticket/14462] Set instance of db driver for database access using globalMarc Alexander2016-02-121-1/+30
| | | | | | | | | | | | | | | | | | | | PHPBB3-14462
| * | | | [ticket/14462] Fix installation in testsMate Bartus2016-02-123-13/+27
| | | | | | | | | | | | | | | | | | | | PHPBB3-14462
| * | | | [ticket/14462] Refactor tasks to be more modularMate Bartus2016-02-1212-168/+860
| | | | | | | | | | | | | | | | | | | | PHPBB3-14462
| * | | | [ticket/14462] Further speed improvementsMate Bartus2016-02-1226-181/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Cache the secondary container - Only initialize tasks/modules that are being used - Add timeout error message in the AJAX UI PHPBB3-14462
* | | | | Merge pull request #4157 from VSEphpbb/ticket/14447Tristan Darricau2016-02-1550-144/+144
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14447] Remove trailing white spaces in Prosilver * VSEphpbb/ticket/14447: [ticket/14447] Remove trailing white spaces in Prosilver
| * | | | | [ticket/14447] Remove trailing white spaces in ProsilverMatt Friedman2016-02-0250-144/+144
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14447
* | | | | | Merge pull request #4179 from marc1706/ticket/14477Tristan Darricau2016-02-151-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14477] Update text-formatter dependency * marc1706/ticket/14477: [ticket/14477] Update text-formatter dependency
| * | | | | | [ticket/14477] Update text-formatter dependencyMarc Alexander2016-02-141-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14477
* | | | | | | Merge pull request #4180 from marc1706/ticket/14478Tristan Darricau2016-02-157-93/+54
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14478] Move facebook/webdriver dependency to main composer file * marc1706/ticket/14478: [ticket/14478] Remove no longer required shell script [ticket/14478] Move facebook/webdriver dependency to main composer file
| * | | | | | [ticket/14478] Remove no longer required shell scriptMarc Alexander2016-02-142-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14478
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 21:36:00 +0000