aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [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
| | * | | | [prep-release-3.1.7] Increase version to 3.1.7Joas Schilling2015-12-191-1/+1
| | | | | |
* | | | | | Merge pull request #4058 from marc1706/ticket/13454Tristan Darricau2016-01-0974-362/+195
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13454] Remove unused variables, globals, and parameters * marc1706/ticket/13454: [ticket/13454] Add excessively removed code back [ticket/13454] Remove more unused variables [ticket/13454] Remove double semi-colons [ticket/13454] Remove unused variables [ticket/13454] Fix code sniffer complaints [ticket/13454] Fix a few issues introduced by overdeleting stuff [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables
| * | | | | [ticket/13454] Add excessively removed code backMarc Alexander2016-01-064-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13454
| * | | | | [ticket/13454] Remove more unused variablesMarc Alexander2016-01-0611-18/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be the last part. Off to checking if the changes were correct. PHPBB3-13454
| * | | | | [ticket/13454] Remove double semi-colonsMarc Alexander2016-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13454
| * | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0627-117/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part 5 and there is more to come. PHPBB3-13454
| * | | | | [ticket/13454] Fix code sniffer complaintsMarc Alexander2016-01-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13454
| * | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0626-65/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part 4 PHPBB3-13454
| * | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-065-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part 3 should fix tests up a little bit again. PHPBB3-13454
| * | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0627-69/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part 2 of the pr. PHPBB3-13454
| * | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0654-104/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first part of the changes. More to come. PHPBB3-13454
* | | | | | Merge branch '3.1.x'Marc Alexander2016-01-081-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | [ticket/14397] Fix @since tag in event 'core.ucp_prefs_view_after'Oliver Schramm2016-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14397
* | | | | | Merge branch '3.1.x'Marc Alexander2016-01-082-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * | | | | Merge pull request #4112 from marc1706/ticket/13180Marc Alexander2016-01-082-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13180] Increase dateformat field size
| | * | | | | [ticket/13180] Increase dateformat field sizeSaeed Hubaishan2016-01-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13180] Increase dateformat field size change field size to 64 in these files add new migration file to update the database schema PHPBB3-13180
* | | | | | | Merge branch '3.1.x'Oliver Schramm2016-01-081-0/+43
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Merge pull request #3924 from Senky/ticket/14190Oliver Schramm2016-01-081-0/+43
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | [ticket/14190] Add core.ucp_prefs_view_after event
| | * | | | [ticket/14190] Add core.ucp_prefs_view_after eventJakub Senko2015-10-121-0/+43
| | | |_|/ | | |/| | | | | | | | | | | | PHPBB3-14190
* | | | | Merge branch '3.1.x'Marc Alexander2016-01-061-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/includes/mcp/mcp_main.php
| * | | | Merge pull request #4109 from marc1706/ticket/14343Marc Alexander2016-01-061-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14343] Added missing $phpbb_dispatcher
| | * | | | [ticket/14343] Added missing $phpbb_dispatcherkasimi2016-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14343
* | | | | | Merge branch '3.1.x'Marc Alexander2016-01-062-4/+2
|\ \ \ \ \ \ | |/ / / / /