aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2016-01-164-10/+10
|\
| * Merge pull request #4125 from lavigor/ticket/14412Marc Alexander2016-01-164-10/+10
| |\
| | * [ticket/14412] Comment fixes for PHPDoc in the eventslavigor2016-01-154-10/+10
| |/
* | Merge pull request #4077 from Nicofuma/ticket/14306Marc Alexander2016-01-154-56/+98
|\ \
| * | [ticket/14306] Improves Error displayTristan Darricau2016-01-092-2/+2
| * | [ticket/14306] CS and correctly handle exception loopTristan Darricau2016-01-092-8/+14
| * | [ticket/14306] Update the error messageTristan Darricau2016-01-093-3/+6
| * | [ticket/14306] Doesn't try to build a "safe" container in the dev envTristan Darricau2016-01-091-9/+21
| * | [ticket/14306] Automatically enable a safe mode when container building failsTristan Darricau2016-01-093-56/+77
* | | Merge branch '3.1.x'Marc Alexander2016-01-153-2/+13
|\ \ \ | | |/ | |/|
| * | Merge pull request #4117 from Elsensee/ticket/14403Marc Alexander2016-01-153-2/+13
| |\ \
| | * | [ticket/14403] Set a default user id and ip in CLIOliver Schramm2016-01-141-0/+2
| | * | [ticket/14403] Don't expect user_id and user_ip in phpbb\logOliver Schramm2016-01-102-2/+11
* | | | Merge pull request #4123 from lavigor/ticket/13442Marc Alexander2016-01-151-2/+2
|\ \ \ \
| * | | | [ticket/13442] UTF-8 symbols for database hostlavigor2016-01-141-2/+2
|/ / / /
* | | | Merge pull request #4059 from JoshyPHP/ticket/14323Marc Alexander2016-01-139-16/+236
|\ \ \ \
| * | | | [ticket/14323] Added should_shorten()JoshyPHP2015-12-282-1/+20
| * | | | [ticket/14323] Added testsJoshyPHP2015-12-271-0/+8
| * | | | [ticket/14323] Renamed AUTOLINK_TEXT to LINK_TEXTJoshyPHP2015-12-275-37/+31
| * | | | [ticket/14323] Added comment [ci skip]JoshyPHP2015-12-261-0/+3
| * | | | [ticket/14323] Fixed test dataJoshyPHP2015-12-261-1/+1
| * | | | [ticket/14323] Moved autolink-related functions to a separate helperJoshyPHP2015-12-266-64/+147
| * | | | [ticket/14323] Set up global objects required during testingJoshyPHP2015-12-263-17/+33
| * | | | [ticket/14323] Stylistic change [ci skip]JoshyPHP2015-12-261-5/+7
| * | | | [ticket/14323] Added support for truncating local URLsJoshyPHP2015-12-266-16/+37
| * | | | [ticket/14323] Added support for truncating long URLsJoshyPHP2015-12-263-2/+76
* | | | | 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 groupZoddo2016-01-131-1/+1
| |/ / / /
* | | | | Merge pull request #4118 from JoshyPHP/ticket/14405Marc Alexander2016-01-123-1/+3
|\ \ \ \ \
| * | | | | [ticket/14405] Force a lookahead check on [URL] BBCodesJoshyPHP2016-01-123-1/+3
|/ / / / /
* | | | | 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] Change ssl:// to tls://Kilian2016-01-101-1/+1
| | * | | | [ticket/12618] Minor fix: Don't cast bool to int anymoreKilian2015-09-291-1/+1
| | * | | | [ticket/12618] Allow extension author to use SSL for version-checkKilian2015-09-253-5/+12
* | | | | | Merge branch '3.1.x'Joas Schilling2016-01-095-3/+50
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'prep-release-3.1.7' into 3.1.xJoas Schilling2016-01-095-4/+51
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | [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] Remove unused form key from acp_extensionsMarc Alexander2015-12-231-2/+0
| | | * | | | [ticket/security-188] Check form key in acp_bbcodesMarc Alexander2015-12-231-0/+6
| | * | | | | [ticket/14343] Added missing $phpbb_dispatcherkasimi2016-01-091-1/+1
* | | | | | | Merge pull request #4058 from marc1706/ticket/13454Tristan Darricau2016-01-09106-454/+240
|\ \ \ \ \ \ \
| * | | | | | | [ticket/13454] Add excessively removed code backMarc Alexander2016-01-065-3/+10
| * | | | | | | [ticket/13454] Remove more unused variablesMarc Alexander2016-01-0616-27/+17
| * | | | | | | [ticket/13454] Remove double semi-colonsMarc Alexander2016-01-061-1/+1
| * | | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-0632-134/+64