aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge pull request #3173 from Nicofuma/ticket/13361Nils Adermann2015-01-225-13/+199
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/13361] Rename exception to runtime_exceptionTristan Darricau2015-01-212-4/+4
| * | | [ticket/13361] Fix the JsonResponse in the exception listenerTristan Darricau2015-01-141-1/+1
| * | | [ticket/13361] Add testsTristan Darricau2015-01-112-5/+11
| * | | [ticket/13361] Support ajax request (send a json response)Tristan Darricau2015-01-101-9/+25
| * | | [ticket/13361] Improve the exception listenerTristan Darricau2014-11-235-4/+168
* | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-213-29/+201
|\ \ \ \ | | |/ / | |/| |
| * | | [develop-olympus] Increment version number to 3.0.14-dev.Andreas Fischer2015-01-213-3/+3
| | |/ | |/|
| * | [develop-olympus] Add changelog for 3.0.13 release.Andreas Fischer2015-01-211-28/+162
| * | [develop-olympus] Bump version numbers for 3.0.13-RC1 release.Andreas Fischer2015-01-213-5/+11
| * | [develop-olympus] Bumping version numbers to final for 3.0.13 releases.Andreas Fischer2015-01-2110-12/+12
| * | [ticket/13531] Send 404 Not Found.Andreas Fischer2015-01-211-1/+15
| * | [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).Marc Alexander2015-01-211-0/+34
| * | Merge pull request #3312 from bantu/ticket/13527Andreas Fischer2015-01-201-4/+1
| |\ \
| | * | [ticket/13527] Apply htmlspecialchars() to data from version server.Andreas Fischer2015-01-201-1/+1
| | * | [ticket/13527] Remove two unused variables.Andreas Fischer2015-01-201-3/+0
| * | | Merge pull request #3311 from bantu/ticket/13526Andreas Fischer2015-01-201-1/+5
| |\ \ \
| | * | | [ticket/13526] Correctly validate the ucp_pm_options form key.Joas Schilling2015-01-201-1/+5
| | |/ /
* | | | Merge pull request #3314 from VSEphpbb/ticket/13133Tristan Darricau2015-01-201-4/+4
|\ \ \ \
| * | | | [ticket/13133] Fix variable name in set_custom_style()Matt Friedman2015-01-201-4/+4
* | | | | Merge pull request #3315 from nickvergessen/ticket/13530Tristan Darricau2015-01-201-1/+1
|\ \ \ \ \
| * | | | | [ticket/13530] Fix undefined variablesJoas Schilling2015-01-201-1/+1
* | | | | | Merge pull request #3313 from nickvergessen/ticket/13528Tristan Darricau2015-01-201-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/13528] Return correct translation instead of is_set()Joas Schilling2015-01-201-1/+1
| |/ / / /
* | | | | Merge pull request #3293 from Nicofuma/ticket/13489Joas Schilling2015-01-208-26/+141
|\ \ \ \ \
| * | | | | [ticket/13489] Fix service configurationTristan Darricau2015-01-205-49/+42
| * | | | | [ticket/13489] Update migrationsTristan Darricau2015-01-143-20/+57
| * | | | | [ticket/13489] Disable the event dispatcher in the migratorTristan Darricau2015-01-143-6/+91
* | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-201-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge pull request #3306 from marc1706/ticket/13519Andreas Fischer2015-01-201-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/13519] Correctly validate imagick path as path and not stringMarc Alexander2015-01-191-1/+1
| * | | | Merge pull request #2990 from Senky/ticket/10985Nils Adermann2015-01-191-0/+5
| |\ \ \ \ | | |/ / / | |/| | |