| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '3.1.x' | Marc Alexander | 2016-01-16 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge pull request #4122 from lavigor/ticket/12441 | Marc Alexander | 2016-01-16 | 1 | -2/+2 |
| | |\ | | | | | | | | | | [ticket/12441] Correct database size detection in MariaDB 10 | ||||
| | | * | [ticket/12441] Correct database size detection in MariaDB 10 | lavigor | 2016-01-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | PHPBB3-12441 | ||||
| * | | | Merge branch '3.1.x' | Marc Alexander | 2016-01-16 | 4 | -10/+10 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #4125 from lavigor/ticket/14412 | Marc Alexander | 2016-01-16 | 4 | -10/+10 |
| | |\ \ | | | | | | | | | | | | | [ticket/14412] Comment fixes for PHPDoc in the events | ||||
| | | * | | [ticket/14412] Comment fixes for PHPDoc in the events | lavigor | 2016-01-15 | 4 | -10/+10 |
| | |/ / | | | | | | | | | | PHPBB3-14412 | ||||
| * | | | Merge pull request #4077 from Nicofuma/ticket/14306 | Marc Alexander | 2016-01-15 | 4 | -56/+98 |
| |\ \ \ | | | | | | | | | | | | | [ticket/14306] Automatically enable a safe mode when container building fails | ||||
| | * | | | [ticket/14306] Improves Error display | Tristan Darricau | 2016-01-09 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-14306 | ||||
| | * | | | [ticket/14306] CS and correctly handle exception loop | Tristan Darricau | 2016-01-09 | 2 | -8/+14 |
| | | | | | | | | | | | | | | | | | PHPBB3-14306 | ||||
| | * | | | [ticket/14306] Update the error message | Tristan Darricau | 2016-01-09 | 3 | -3/+6 |
| | | | | | | | | | | | | | | | | | PHPBB3-14306 | ||||
| | * | | | [ticket/14306] Doesn't try to build a "safe" container in the dev env | Tristan Darricau | 2016-01-09 | 1 | -9/+21 |
| | | | | | | | | | | | | | | | | | PHPBB3-14306 | ||||
| | * | | | [ticket/14306] Automatically enable a safe mode when container building fails | Tristan Darricau | 2016-01-09 | 3 | -56/+77 |
| | | | | | | | | | | | | | | | | | PHPBB3-14306 | ||||
| * | | | | Merge branch '3.1.x' | Marc Alexander | 2016-01-15 | 3 | -2/+13 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: phpBB/phpbb/log/log.php | ||||
| | * | | | Merge pull request #4117 from Elsensee/ticket/14403 | Marc Alexander | 2016-01-15 | 3 | -2/+13 |
| | |\ \ \ | | |_|/ | |/| | | | | | | [ticket/14403] Don't expect user_id and user_ip in phpbb\log | ||||
| | | * | | [ticket/14403] Set a default user id and ip in CLI | Oliver Schramm | 2016-01-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-14403 | ||||
| | | * | | [ticket/14403] Don't expect user_id and user_ip in phpbb\log | Oliver Schramm | 2016-01-10 | 2 | -2/+11 |
| | | | | | | | | | | | | | | | | | PHPBB3-14403 | ||||
| * | | | | Merge pull request #4123 from lavigor/ticket/13442 | Marc Alexander | 2016-01-15 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/13442] UTF-8 symbols for database host | ||||
| | * | | | | [ticket/13442] UTF-8 symbols for database host | lavigor | 2016-01-14 | 1 | -2/+2 |
| |/ / / / | | | | | | | | | | | | | PHPBB3-13442 | ||||
| * | | | | Merge pull request #4059 from JoshyPHP/ticket/14323 | Marc Alexander | 2016-01-13 | 9 | -16/+236 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/14323] Added support for truncating long URLs | ||||
| | * | | | | [ticket/14323] Added should_shorten() | JoshyPHP | 2015-12-28 | 2 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly tests a tag's markup to determine whether a link should be shortened PHPBB3-14323 | ||||
| | * | | | | [ticket/14323] Added tests | JoshyPHP | 2015-12-27 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14323 | ||||
| | * | | | | [ticket/14323] Renamed AUTOLINK_TEXT to LINK_TEXT | JoshyPHP | 2015-12-27 | 5 | -37/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expanded link text shortening to [url] BBCodes with no parameters PHPBB3-14323 | ||||
| | * | | | | [ticket/14323] Added comment [ci skip] | JoshyPHP | 2015-12-26 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14323 | ||||
| | * | | | | [ticket/14323] Fixed test data | JoshyPHP | 2015-12-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14323 | ||||
| | * | | | | [ticket/14323] Moved autolink-related functions to a separate helper | JoshyPHP | 2015-12-26 | 6 | -64/+147 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14323 | ||||
| | * | | | | [ticket/14323] Set up global objects required during testing | JoshyPHP | 2015-12-26 | 3 | -17/+33 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14323 | ||||
| | * | | | | [ticket/14323] Stylistic change [ci skip] | JoshyPHP | 2015-12-26 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14323 | ||||
| | * | | | | [ticket/14323] Added support for truncating local URLs | JoshyPHP | 2015-12-26 | 6 | -16/+37 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14323 | ||||
| | * | | | | [ticket/14323] Added support for truncating long URLs | JoshyPHP | 2015-12-26 | 3 | -2/+76 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14323 | ||||
| * | | | | | Merge branch '3.1.x' | Marc Alexander | 2016-01-13 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge pull request #4119 from Zoddo/ticket/14407 | Marc Alexander | 2016-01-13 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14407] Fix removing users from Newly Registered Users group | ||||
| | | * | | | | [ticket/14407] Fix removing users from Newly Registered Users group | Zoddo | 2016-01-13 | 1 | -1/+1 |
| | |/ / / / | | | | | | | | | | | | | | | | PHPBB3-14407 | ||||
| * | | | | | Merge pull request #4118 from JoshyPHP/ticket/14405 | Marc Alexander | 2016-01-12 | 3 | -1/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14405] Force a lookahead check on [URL] BBCodes | ||||
| | * | | | | | [ticket/14405] Force a lookahead check on [URL] BBCodes | JoshyPHP | 2016-01-12 | 3 | -1/+3 |
| |/ / / / / | | | | | | | | | | | | | | | | PHPBB3-14405 | ||||
| * | | | | | Merge branch '3.1.x' | Marc Alexander | 2016-01-12 | 3 | -5/+12 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge pull request #3929 from kilianr/ticket/12618 | Marc Alexander | 2016-01-12 | 3 | -5/+12 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/12618] Allow extension author to use SSL for version-check. | ||||
| | | * | | | | [ticket/12618] Change ssl:// to tls:// | Kilian | 2016-01-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12618 | ||||
| | | * | | | | [ticket/12618] Minor fix: Don't cast bool to int anymore | Kilian | 2015-09-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12618 | ||||
| | | * | | | | [ticket/12618] Allow extension author to use SSL for version-check | Kilian | 2015-09-25 | 3 | -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 Schilling | 2016-01-09 | 5 | -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.x | Joas Schilling | 2016-01-09 | 5 | -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-pl1 | Joas Schilling | 2016-01-09 | 1 | -0/+12 |
| | | | | | | | |||||
| | | * | | | | [prep-release-3.1.7] Add migration for 3.1.7-pl1 | Joas Schilling | 2016-01-09 | 1 | -0/+31 |
| | | | | | | | |||||
| | | * | | | | [prep-release-3.1.7] Update version to 3.1.7-pl1 | Joas Schilling | 2016-01-09 | 3 | -4/+4 |
| | | | | | | | |||||
| | | * | | | | Merge pull request #24 from phpbb/ticket/security-188 | Joas Schilling | 2016-01-09 | 2 | -2/+6 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/security-188] Check form key in acp_bbcodes | ||||
| | | | * | | | | [ticket/security-188] Remove unused form key from acp_extensions | Marc Alexander | 2015-12-23 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-188 | ||||
| | | | * | | | | [ticket/security-188] Check form key in acp_bbcodes | Marc Alexander | 2015-12-23 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-188 | ||||
| | | * | | | | | [ticket/14343] Added missing $phpbb_dispatcher | kasimi | 2016-01-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14343 | ||||
| * | | | | | | | Merge pull request #4058 from marc1706/ticket/13454 | Tristan Darricau | 2016-01-09 | 106 | -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 back | Marc Alexander | 2016-01-06 | 5 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13454 | ||||
