aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4123 from lavigor/ticket/13442Marc Alexander2016-01-151-2/+2
|\ | | | | | | [ticket/13442] UTF-8 symbols for database host
| * [ticket/13442] UTF-8 symbols for database hostlavigor2016-01-141-2/+2
|/ | | | PHPBB3-13442
* Merge pull request #4059 from JoshyPHP/ticket/14323Marc Alexander2016-01-139-16/+236
|\ | | | | | | [ticket/14323] Added support for truncating long URLs
| * [ticket/14323] Added should_shorten()JoshyPHP2015-12-282-1/+20
| | | | | | | | | | | | Explicitly tests a tag's markup to determine whether a link should be shortened PHPBB3-14323
| * [ticket/14323] Added testsJoshyPHP2015-12-271-0/+8
| | | | | | | | PHPBB3-14323
| * [ticket/14323] Renamed AUTOLINK_TEXT to LINK_TEXTJoshyPHP2015-12-275-37/+31
| | | | | | | | | | | | Expanded link text shortening to [url] BBCodes with no parameters PHPBB3-14323
| * [ticket/14323] Added comment [ci skip]JoshyPHP2015-12-261-0/+3
| | | | | | | | PHPBB3-14323
| * [ticket/14323] Fixed test dataJoshyPHP2015-12-261-1/+1
| | | | | | | | PHPBB3-14323
| * [ticket/14323] Moved autolink-related functions to a separate helperJoshyPHP2015-12-266-64/+147
| | | | | | | | PHPBB3-14323
| * [ticket/14323] Set up global objects required during testingJoshyPHP2015-12-263-17/+33
| | | | | | | | PHPBB3-14323
| * [ticket/14323] Stylistic change [ci skip]JoshyPHP2015-12-261-5/+7
| | | | | | | | PHPBB3-14323
| * [ticket/14323] Added support for truncating local URLsJoshyPHP2015-12-266-16/+37
| | | | | | | | PHPBB3-14323
| * [ticket/14323] Added support for truncating long URLsJoshyPHP2015-12-263-2/+76
| | | | | | | | PHPBB3-14323
* | Merge branch '3.1.x'Marc Alexander2016-01-131-1/+1
|\ \
| * \ Merge pull request #4119 from Zoddo/ticket/14407Marc Alexander2016-01-131-1/+1
| |\ \ | | | | | | | | | | | | [ticket/14407] Fix removing users from Newly Registered Users group
| | * | [ticket/14407] Fix removing users from Newly Registered Users groupZoddo2016-01-131-1/+1
| |/ / | | | | | | | | | PHPBB3-14407
* | | Merge pull request #4118 from JoshyPHP/ticket/14405Marc Alexander2016-01-123-1/+3
|\ \ \ | | | | | | | | | | | | [ticket/14405] Force a lookahead check on [URL] BBCodes
| * | | [ticket/14405] Force a lookahead check on [URL] BBCodesJoshyPHP2016-01-123-1/+3
|/ / / | | | | | | | | | PHPBB3-14405
* | | Merge branch '3.1.x'Marc Alexander2016-01-123-5/+12
|\ \ \ | |/ /
| * | Merge pull request #3929 from kilianr/ticket/12618Marc Alexander2016-01-123-5/+12
| |\ \ | | | | | | | | | | | | [ticket/12618] Allow extension author to use SSL for version-check.
| | * | [ticket/12618] Change ssl:// to tls://Kilian2016-01-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12618
| | * | [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-253-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-095-3/+50
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 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-095-4/+51
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * | | [prep-release-3.1.7] Add changelog for 3.1.7-pl1Joas Schilling2016-01-091-0/+12
| | | | |
| | * | | [prep-release-3.1.7] Add migration for 3.1.7-pl1Joas Schilling2016-01-091-0/+31
| | | | |
| | * | | [prep-release-3.1.7] Update version to 3.1.7-pl1Joas Schilling2016-01-093-4/+4
| | | | |
| | * | | 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
* | | | | | Merge pull request #4058 from marc1706/ticket/13454Tristan Darricau2016-01-09106-454/+240
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-065-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13454
| * | | | | | [ticket/13454] Remove more unused variablesMarc Alexander2016-01-0616-27/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0632-134/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Fix a few issues introduced by overdeleting stuffMarc Alexander2016-01-063-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13454
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0635-78/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0637-88/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part 2 of the pr. PHPBB3-13454
| * | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0672-144/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first part of the changes. More to come. PHPBB3-13454
* | | | | | | Merge branch '3.1.x'Marc Alexander2016-01-090-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4097 from Nicofuma/ticket/14382Marc Alexander2016-01-092-1/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14382] Specify the branch-alias in the composer.json files
* | \ \ \ \ \ \ Merge pull request #4098 from Nicofuma/ticket/14382-masterMarc Alexander2016-01-092-1/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14382] Specify the branch-alias in the composer.json files
| * | | | | | | | [ticket/14382] Specify the branch-alias in the composer.json filesTristan Darricau2016-01-092-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14382
| * | | | | | | | Merge branch 'ticket/14382' into ticket/14382-masterTristan Darricau2016-01-090-0/+0
| |\ \ \ \ \ \ \ \ |/ / / / / / / / / | | | _ / / / / / | | | / / / / / | | | | | | | | * ticket/14382: [ticket/14382] Specify the branch-alias in the composer.json files
| * | | | | | | [ticket/14382] Specify the branch-alias in the composer.json filesTristan Darricau2016-01-092-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14382
* | | | | | | | Merge branch '3.1.x'Oliver Schramm2016-01-081-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |