aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-05-081-4/+21
|\
| * Merge pull request #3459 from brunoais/ticket/13664Marc Alexander2015-05-081-4/+21
| |\
| | * [ticket/13664] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | * [ticket/13664] Added alias to table to make modding easier.brunoais2015-03-011-3/+3
| | * [ticket/13664] Add event to allow changing number of unapproved posts listedbrunoais2015-03-011-0/+12
| | * [ticket/13664] From string query in mcp_front unapproved posts to built querybrunoais2015-03-011-4/+9
* | | Merge branch '3.1.x'Marc Alexander2015-05-081-0/+12
|\ \ \ | |/ /
| * | Merge pull request #3455 from brunoais/ticket/13660Marc Alexander2015-05-081-0/+12
| |\ \
| | * | [ticket/13660] BUMP version to 3.1.5-RC1brunoais2015-05-061-1/+1
| | * | [ticket/13660] Fix @since version.brunoais2015-03-101-1/+1
| | * | [ticket/13660] Allow changing the query for total reports in mcp_frontbrunoais2015-02-281-0/+12
| | |/
* | | Merge branch '3.1.x'Nicofuma2015-05-061-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3583 from nickvergessen/ticket/13807Nicofuma2015-05-061-1/+1
| |\ \
| | * | [ticket/13807] Fix "changed version" to match our version numberingJoas Schilling2015-05-021-1/+1
* | | | Merge branch '3.1.x'Andreas Fischer2015-05-061-0/+1
|\ \ \ \ | |/ / /
| * | | [ticket/13819] Add missing sql_freeresult() to files in includes/Marc Alexander2015-05-052-0/+2
| |/ /
* | | [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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |