aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/13569] Add missing sql_freeresults and remove unneeded resultsMarc Alexander2015-02-026-2/+7
* Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-02-011-0/+31
|\
| * [prep-release-3.1.3] Add migration for 3.1.3Joas Schilling2015-02-011-0/+31
| * [prep-release-3.1.3] Update version to 3.1.3Joas Schilling2015-02-012-2/+2
* | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-314-2/+49
|\ \ | |/
| * [prep-release-3.1.3] Add changelog for 3.1.3-RC2Joas Schilling2015-01-311-0/+15
| * [prep-release-3.1.3] Add migration for 3.1.3-RC2Joas Schilling2015-01-311-0/+32
| * [prep-release-3.1.3] Update version to 3.1.3-RC2Joas Schilling2015-01-312-2/+2
* | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-311-7/+9
|\ \ | |/
| * [ticket/13553] Use defined title value in page headers tooMatt Friedman2015-01-311-1/+1
| * [ticket/13553] Make title var accept a lang key varMatt Friedman2015-01-311-4/+4
| * [ticket/13553] Message helper should accept a lang key varMatt Friedman2015-01-311-5/+7
* | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-312-0/+74
|\ \ | |/
| * [ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1Joas Schilling2015-01-302-0/+74
* | Merge branch 'prep-release-3.1.3' into develop-ascraeusAndreas Fischer2015-01-302-5/+6
|\ \ | |/
| * [ticket/13556] Fix exception translation with filedownloaderJoas Schilling2015-01-302-5/+6
* | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-301-1/+2
|\ \ | |/
| * Merge pull request #3341 from brunoais/ticket/13544Joas Schilling2015-01-301-1/+2
| |\
| | * [ticket/13544] Use integer case because $role_id is an intbrunoais2015-01-261-1/+1
| | * [ticket/13544] Fixing wrong SQL query for permission_unset for rolesbrunoais2015-01-261-1/+2
* | | Merge branch 'prep-release-3.1.3' into develop-ascraeusAndreas Fischer2015-01-301-43/+51
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.13' into prep-release-3.1.3Andreas Fischer2015-01-302-44/+52
| |\ \
| | * | [prep-release-3.0.13] Correct changelog link to 3.0.13 changes.Andreas Fischer2015-01-301-2/+2
| | * | [prep-release-3.0.13] Also update version in references to files.Andreas Fischer2015-01-291-3/+3
| | * | [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.Andreas Fischer2015-01-291-0/+10
| | * | [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.Andreas Fischer2015-01-291-24/+24
| | * | [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.Andreas Fischer2015-01-293-4/+10
| | * | Merge pull request #3347 from bantu/ticket/13554Dhruv Goel2015-01-291-1/+1
| | |\ \
| | | * | [ticket/13554] Show feature release upgrades in blue rather than red.Andreas Fischer2015-01-281-1/+1
| | * | | Merge pull request #3348 from bantu/ticket/13549Andreas Fischer2015-01-291-1/+1
| | |\ \ \
| | | * | | [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.Marc Alexander2015-01-281-1/+1
| | | |/ /
| | * | | [ticket/12933] Handle case when * is last character of wordDhruv2015-01-281-1/+1
| | |/ /
* | | | Merge branch 'prep-release-3.1.3' into develop-ascraeusDhruv2015-01-308-46/+195
|\ \ \ \ | |/ / /
| * | | [ticket/13553] Add a method to the controller helper to display a messageJoas Schilling2015-01-291-1/+16
| * | | [prep-release-3.1.3] Add changelog for 3.1.3-RC1Joas Schilling2015-01-261-0/+96
| * | | [prep-release-3.1.3] Prepare ChangelogJoas Schilling2015-01-261-38/+41
| * | | [prep-release-3.1.3] Add migration for 3.1.3-RC1Joas Schilling2015-01-261-0/+35
| * | | [prep-release-3.1.3] Update version to 3.1.2-RC1Joas Schilling2015-01-265-7/+7
| | |/ | |/|
* | | Merge pull request #3338 from dhruvgoel92/ticket/12933Andreas Fischer2015-01-291-1/+1
|\ \ \
| * \ \ Merge branch 'ticket/12933-olympus' into ticket/12933Dhruv2015-01-281-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/12933] Handle case when * is last character of wordDhruv2015-01-281-1/+1
* | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-281-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/13414] Set Content-Length header only if status is not 304Marc Alexander2015-01-281-5/+7
| |/ /
* | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2015-01-261-2/+5
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.13' into develop-olympusNils Adermann2015-01-262-2/+11
| |\ \ | | |/
| | * [prep-release-3.0.13] Bump version numbers for 3.0.13 releaseNils Adermann2015-01-263-3/+9
| | * [prep-release-3.0.13] Highlight security relevant changesNils Adermann2015-01-261-2/+5
* | | Merge pull request #3321 from marc1706/ticket/13282Joas Schilling2015-01-231-1/+9
|\ \ \
| * | | [ticket/13282] Use strpos() instead of preg_match()Marc Alexander2015-01-221-1/+1
| * | | [ticket/13282] Use 0 as default for integer type columns in postgresqlMarc Alexander2015-01-221-1/+9