aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* 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 branch '3.1.x' into 3.2.xTristan Darricau2016-02-181-0/+10
|\ \ | |/ | | | | | | * 3.1.x: [ticket/13681] Invalidate and reset opcache where necessary
| * [ticket/13681] Invalidate and reset opcache where necessaryMarc Alexander2016-02-181-0/+10
| | | | | | | | PHPBB3-13681
* | Merge pull request #4165 from Nicofuma/ticket/14457Marc Alexander2016-02-181-17/+2
|\ \ | | | | | | | | | [ticket/14457] Uses a random placeholder to inject css and js
| * | [ticket/14457] Replaces unique_id implementation by random_bytes()Tristan Darricau2016-02-181-17/+2
| | | | | | | | | | | | PHPBB3-14457
* | | [ticket/14315] Add back roles select for disable javascriptMarc Alexander2016-02-161-0/+24
| | | | | | | | | | | | | | | | | | | | | The javascript will hide the old select and show the version using the span and showing the tooltips. 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-161-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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-161-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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-161-0/+1
|/ / | | | | | | PHPBB3-14315
* | Merge branch '3.1.x' into 3.2.xJoas Schilling2016-02-133-14/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | 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-131-1/+1
| |
| * Merge pull request #4176 from Elsensee/ticket/14409Joas Schilling2016-02-132-4/+4
| |\ | | | | | | | | | [ticket/14409] Update session page info before displaying online list
| | * [ticket/14409] Update session page info before displaying online listOliver Schramm2016-02-132-4/+4
| | | | | | | | | | | | 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] Update version to 3.1.8-RC1Joas Schilling2016-02-131-1/+1
| |/
| * Merge pull request #4141 from exussum12/ticket/14431-3.1Marc Alexander2016-02-031-2/+11
| |\ | | | | | | | | | [ticket/14431] Remote avatar uploading
| | * [ticket/14430] Remote avatar uploadingScott Dutton2016-02-031-17/+1
| | | | | | | | | | | | | | | | | | Remove support for redirects PHPBB3-14431
| | * [ticket/14431] Remote avatar uploadingScott Dutton2016-01-251-3/+28
| | | | | | | | | | | | | | | | | | | | | Allow HTTPS images to be remotely uploaded. Also includes support for redirects (currently up to 5) PHPBB3-14431
* | | Merge pull request #4159 from marc1706/ticket/14448Tristan Darricau2016-02-111-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Let user decide if remote upload certs should be checkedMarc Alexander2016-02-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Also fixed some minor issues like coding style. PHPBB3-14448
* | | | [release-3.2.0-b1] Update version to 3.2.0-b2-devTristan Darricau2016-02-051-1/+1
| | | |
* | | | [prep-release-3.2.0-b1] Update version to 3.2.0-b1Tristan Darricau2016-02-031-1/+1
|/ / /
* | | [ticket/14444] Fix fatal error in functions_messenger.phpTristan Darricau2016-02-021-1/+1
| | | | | | | | | | | | PHPBB3-14444
* | | Merge branch '3.1.x'Marc Alexander2016-01-311-2/+6
|\ \ \ | |/ /
| * | [ticket/14439] Do not call avatar manager if avatars are disabledrxu2016-01-311-2/+6
| | | | | | | | | | | | PHPBB3-14439
* | | [ticket/14253] Show group requests pending aproval at the ACP groups summarycunha172016-01-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currenty, you need to open each existing group in ACP to know if there are pending group requests or not. Doing so is really boring and annoying... :/ This patch displays the number of pending group requests at the ACP groups summary page. PHPBB3-14253
* | | [ticket/14253] Show group requests pending aproval at the ACP groups summarycunha172016-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currenty, you need to open each existing group in ACP to know if there are pending group requests or not. Doing so is really boring and annoying... :/ This patch displays the number of pending group requests at the ACP groups summary page. PHPBB3-14253
* | | Merge branch '3.1.x'Marc Alexander2016-01-211-1/+1
|\ \ \ | |/ /
| * | [ticket/14423] Display database size for Aria storage enginelavigor2016-01-201-1/+1
| | | | | | | | | | | | PHPBB3-14423
* | | Merge branch '3.1.x'Marc Alexander2016-01-161-2/+2
|\ \ \ | |/ /
| * | Merge pull request #4122 from lavigor/ticket/12441Marc Alexander2016-01-161-2/+2
| |\ \ | | | | | | | | | | | | [ticket/12441] Correct database size detection in MariaDB 10
| | * | [ticket/12441] Correct database size detection in MariaDB 10lavigor2016-01-141-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12441
* | | | Merge branch '3.1.x'Marc Alexander2016-01-164-10/+10
|\ \ \ \ | |/ / /
| * | | [ticket/14412] Comment fixes for PHPDoc in the eventslavigor2016-01-154-10/+10
| |/ / | | | | | | | | | PHPBB3-14412
* | | Merge pull request #4077 from Nicofuma/ticket/14306Marc Alexander2016-01-151-1/+3
|\ \ \ | | | | | | | | | | | | [ticket/14306] Automatically enable a safe mode when container building fails
| * | | [ticket/14306] Automatically enable a safe mode when container building failsTristan Darricau2016-01-091-1/+3
| | | | | | | | | | | | | | | | PHPBB3-14306
* | | | Merge branch '3.1.x'Marc Alexander2016-01-121-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #3929 from kilianr/ticket/12618Marc Alexander2016-01-121-1/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/12618] Allow extension author to use SSL for version-check.
| | * | | [ticket/12618] Minor fix: Don't cast bool to int anymoreKilian2015-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12618
| | * | | [ticket/12618] Allow extension author to use SSL for version-checkKilian2015-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For version-check a new parameter 'ssl' is introduced. If set to true, it will use 443 as port for the file_downloader. In file_downloader, the host parameter of fsockopen is appended with 'ssl://' in case the port is 443 in order to use SSL. PHPBB3-12618
* | | | | Merge branch '3.1.x'Joas Schilling2016-01-092-2/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/includes/acp/acp_bbcodes.php
| * | | | Merge branch 'prep-release-3.1.7' into 3.1.xJoas Schilling2016-01-092-2/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * | | | [prep-release-3.1.7] Update version to 3.1.7-pl1Joas Schilling2016-01-091-1/+1
| | | | | |
| | * | | | Merge pull request #24 from phpbb/ticket/security-188Joas Schilling2016-01-092-2/+6
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/security-188] Check form key in acp_bbcodes
| | | * | | | [ticket/security-188] Remove unused form key from acp_extensionsMarc Alexander2015-12-231-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-188
| | | * | | | [ticket/security-188] Check form key in acp_bbcodesMarc Alexander2015-12-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-188
| | * | | | | [ticket/14343] Added missing $phpbb_dispatcherkasimi2016-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14343