aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14315] Add functional tests for permission roles and fix non-jsMarc Alexander2016-02-172-2/+9
| | | | | | Without JS the settings were not applied due to duplicate input names. 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 pull request #4171 from CHItA/ticket/14462Tristan Darricau2016-02-1638-352/+1116
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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 CS and typoMate Bartus2016-02-121-1/+1
| | | | | | | | PHPBB3-14462
| * [ticket/14462] Refactor tasks to be more modularMate Bartus2016-02-1212-168/+860
| | | | | | | | PHPBB3-14462
| * [ticket/14462] Further speed improvementsMate Bartus2016-02-1225-178/+237
| | | | | | | | | | | | | | | | - 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
* | | | [ticket/14478] Move facebook/webdriver dependency to main composer fileMarc Alexander2016-02-142-2/+46
|/ / / | | | | | | | | | | | | | | | | | | Also updated to latest version and now using proper version in composer.json. PHPBB3-14478
* | | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-137-15/+91
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/includes/constants.php phpBB/includes/functions_user.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | [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 list
| | * | | [ticket/14409] Update session page info before displaying online listOliver Schramm2016-02-134-4/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-14409
| * | | | Merge pull request #4177 from marc1706/ticket/14475Joas Schilling2016-02-131-10/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14475] Do not log removal of users from newly registered group
| | * | | | [ticket/14475] Do not log removal of users from newly registered groupMarc Alexander2016-02-131-10/+13
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-14475
| * | | | [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
| |/ / /
* | | | Merge pull request #4160 from Nicofuma/ticket/14440Marc Alexander2016-02-111-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14440] Correctly remove the web root path in update_web_root_path
| * | | | [ticket/14440] Add commentsTristan Darricau2016-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14440
| * | | | [ticket/14440] Correctly remove the web root path in update_web_root_pathTristan Darricau2016-02-041-1/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-14440
* | | | | Merge pull request #4159 from marc1706/ticket/14448Tristan Darricau2016-02-118-394/+276
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14448] Use guzzle for remote files uploading * marc1706/ticket/14448: [ticket/14448] Correctly pass verify setting if available [ticket/14448] Let user decide if remote upload certs should be checked [ticket/14448] Add new vendor files and dirs to clean task [ticket/14448] Do not try to test remote upload timeout [ticket/14448] Remove no longer needed guzzle 3.9.3 [ticket/14448] Use GuzzleHttp and try to verify certs [ticket/14448] Update composer.json and lock file for guzzlehttp [ticket/14431] Remote avatar uploading [ticket/14431] Remote avatar uploading
| * | | | | [ticket/14448] Correctly pass verify setting if availableMarc Alexander2016-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14448
| * | | | | [ticket/14448] Let user decide if remote upload certs should be checkedMarc Alexander2016-02-046-20/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed some minor issues like coding style. PHPBB3-14448
| * | | | | [ticket/14448] Remove no longer needed guzzle 3.9.3Marc Alexander2016-02-031-95/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14448
| * | | | | [ticket/14448] Use GuzzleHttp and try to verify certsMarc Alexander2016-02-031-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14448
| * | | | | [ticket/14448] Update composer.json and lock file for guzzlehttpMarc Alexander2016-02-032-206/+206
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14448
| * | | | | [ticket/14431] Remote avatar uploadingScott Dutton2016-02-031-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed content length bug Ran composer update PHPBB3-14431
| * | | | | [ticket/14431] Remote avatar uploadingScott Dutton2016-02-032-103/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace the 3.1 way with guzzle Adds guzzle as a dependency Removed a test as it wont wont with guzzle (as far as I know) PHPBB3-14431
* | | | | | Merge pull request #4172 from Crizz0/ticket/14307Marc Alexander2016-02-101-4/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | [ticket/14307] Fixes wording in install.php file/dir exist/writeable
| * | | | | [ticket/14307] Fixes wording in install.php file/dir exist/writeableCrizzo2016-02-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14307
* | | | | | Merge branch '3.1.x'Marc Alexander2016-02-091-2/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | [ticket/14467] Fix height calculation in autoResizecyberalien2016-02-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14467
* | | | | | Merge pull request #4169 from CHItA/ticket/14460Tristan Darricau2016-02-075-18/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14460] Use the selected language with AJAX requests as well * CHItA/ticket/14460: [ticket/14460] Use the selected language with AJAX requests as well
| * | | | | | [ticket/14460] Use the selected language with AJAX requests as wellMate Bartus2016-02-065-18/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14460
* | | | | | | Merge pull request #4161 from CHItA/ticket/14312Tristan Darricau2016-02-074-15/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14312] Enable running database update only * CHItA/ticket/14312: [ticket/14312] Allow updating without having the update directory [ticket/14312] Push migration error messages to the user
| * | | | | | | [ticket/14312] Allow updating without having the update directoryMate Bartus2016-02-043-15/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14312
| * | | | | | | [ticket/14312] Push migration error messages to the userMate Bartus2016-02-041-0/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-14312