aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [ticket/13638] Inject $filesystem in \phpbb\template\assetNicofuma2015-05-052-0/+2
* [ticket/13762] Moving language related functionality into a separate classMateBartus2015-05-025-209/+38
* [ticket/13793] Remove translation on throwing exceptionsMateBartus2015-05-011-5/+9
* Merge branch '3.1.x'Andreas Fischer2015-04-281-2/+2
|\
| * Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-281-2/+2
| |\
| | * [ticket/security-180] Use language variable for redirect error in 3.1+Marc Alexander2015-04-281-1/+1
| | * Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-281-1/+1
| | |\
| | | * [ticket/security-180] Always fail when redirecting to an insecure URLJoas Schilling2015-04-111-1/+1
| | * | [ticket/security-180] Merge if statement with previous one in 3.1.xMarc Alexander2015-04-281-7/+1
| | * | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-281-0/+6
| | |\ \ | | | |/
| | | * [ticket/security-180] Make sure that redirect goes to full URL plus slashMarc Alexander2015-04-111-1/+1
| | | * [ticket/security-180] Check if redirect URL contains board URLMarc Alexander2015-04-101-0/+6
* | | | Merge branch '3.1.x'Andreas Fischer2015-04-271-1/+1
|\ \ \ \ | |/ / /
| * | | [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserverAlexander Köplinger2015-04-261-1/+1
* | | | Merge pull request #3524 from marc1706/ticket/8672Tristan Darricau2015-04-272-16/+17
|\ \ \ \
| * | | | [ticket/8672] User $user->lang() instead of sprintfMarc Alexander2015-04-241-2/+2
| * | | | [ticket/8672] Use fastImageSize in classesMarc Alexander2015-04-242-4/+4
| * | | | [ticket/8672] Add class for retrieving imagesize without downloadMarc Alexander2015-04-242-16/+17
* | | | | Merge pull request #3548 from s9e/ticket/12745Andreas Fischer2015-04-261-9/+0
|\ \ \ \ \
| * | | | | [ticket/12745] Added support for Unicode characters outside BMPJoshyPHP2015-04-251-9/+0
| |/ / / /
* | | | | Merge branch '3.1.x'Marc Alexander2015-04-261-0/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3532 from prototech/ticket/13755Marc Alexander2015-04-261-0/+2
| |\ \ \ \
| | * | | | [ticket/13755] Ignore dots in path when determining file extension.Cesar G2015-04-101-0/+2
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-251-2/+8
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge pull request #3550 from bantu/ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge branch 'ticket/13765' into ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| | |\ \
| | | * | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.Joas Schilling2015-04-252-2/+2
| | | |/
| | | * Merge pull request #3359 from marc1706/ticket/13568Nicofuma2015-03-291-1/+1
| | | |\
| | | * | [ticket/13617] Enforce column size limit for session_forum_idNils Adermann2015-02-251-1/+3
| * | | | [3.1.x] Update development version to 3.1.5-devJoas Schilling2015-04-101-1/+1
| |/ / /
| * | | Update version to 3.1.4-RC1Joas Schilling2015-04-091-1/+1
* | | | Merge pull request #3446 from MateBartus/ticket/13654Tristan Darricau2015-04-163-30/+6
|\ \ \ \
| * | | | [ticket/13654] Moving reporting into controllerMateBartus2015-04-163-30/+6
* | | | | Merge pull request #3487 from MateBartus/ticket/13697Tristan Darricau2015-04-1613-483/+254
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/13697] Moving filesystem related functions to filesystem serviceMateBartus2015-04-1613-483/+254
* | | | | Merge branch '3.1.x'Joas Schilling2015-04-061-0/+25
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3409 from Senky/ticket/11424Joas Schilling2015-04-061-0/+25
| |\ \ \ \
| | * | | | [ticket/11424] Add space between control flow keywords and parenthesisJakub Senko2015-02-191-2/+2
| | * | | | [ticket/11424] Handle race condition properly for Quick-Mod ToolsJakub Senko2015-02-161-0/+25
* | | | | | Merge pull request #3461 from s9e/ticket/11768Tristan Darricau2015-04-057-122/+158
|\ \ \ \ \ \
| * | | | | | [ticket/11768] Updated annotation [ci skip]JoshyPHP2015-04-021-1/+1
| * | | | | | [ticket/11768] Reverted change to bbcode_uidJoshyPHP2015-04-021-1/+1
| * | | | | | [ticket/11768] Invalidate the text_formatter cache whenever a style is installedJoshyPHP2015-04-021-1/+11
| * | | | | | [ticket/11768] Re-added the code that got lost in rebaseJoshyPHP2015-04-022-2/+3
| * | | | | | [ticket/11768] This commit integrates s9e\TextFormatters9e2015-04-026-120/+145
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-04-051-0/+13
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | [ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.phprxu2015-04-051-0/+13
* | | | | | Merge pull request #3430 from MateBartus/ticket/12466Tristan Darricau2015-04-051-1660/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [ticket/12466] Move classes from acp_database.php to their own filesMateBartus2015-02-271-1660/+2
* | | | | | Merge branch '3.1.x'Nicofuma2015-03-292-5/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | |