aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'prep-release-3.0.13' into prep-release-3.1.3Andreas Fischer2015-01-303-45/+53
|\
| * [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-294-6/+12
| * 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-292-2/+7
| |\ \
| | * | [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.Marc Alexander2015-01-282-2/+7
| | |/
| * | Merge pull request #3349 from bantu/ticket/12933Andreas Fischer2015-01-291-1/+1
| |\ \ | | |/ | |/|
| | * [ticket/12933] Handle case when * is last character of wordDhruv2015-01-281-1/+1
| |/
* | Merge pull request #3353 from nickvergessen/ticket/13553Dhruv Goel2015-01-301-1/+16
|\ \
| * | [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-266-8/+8
* | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2015-01-262-3/+6
|\ \
| * \ Merge branch 'prep-release-3.0.13' into develop-olympusNils Adermann2015-01-263-3/+12
| |\ \ | | |/
| | * [prep-release-3.0.13] Bump version numbers for 3.0.13 releaseNils Adermann2015-01-264-6/+12
| | * [prep-release-3.0.13] Highlight security relevant changesNils Adermann2015-01-261-2/+5
* | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-261-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3339 from nickvergessen/ticket/12089Andreas Fischer2015-01-261-1/+1
| |\ \
| | * | [ticket/12089] Add assert message on HTTP status code checkJoas Schilling2015-01-251-1/+1
| |/ /
* | | Merge pull request #3336 from nickvergessen/ticket/13543Marc Alexander2015-01-242-1/+8
|\ \ \
| * | | [ticket/13543] Fix broken slow testJoas Schilling2015-01-241-0/+4
| * | | [ticket/13543] Add slow tests to travis matrixJoas Schilling2015-01-241-1/+4
|/ / /
* | | Merge pull request #3321 from marc1706/ticket/13282Joas Schilling2015-01-233-1/+87
|\ \ \
| * | | [ticket/13282] Add unit test for adding integer column with default nullMarc Alexander2015-01-221-0/+7
| * | | [ticket/13282] Add functional tests for adding profilefieldsMarc Alexander2015-01-221-0/+71
| * | | [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-226-13/+299
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/13361] Rename exception to runtime_exceptionTristan Darricau2015-01-213-6/+6
| * | | [ticket/13361] Fix the JsonResponse in the exception listenerTristan Darricau2015-01-141-1/+1
| * | | [ticket/13361] Add testsTristan Darricau2015-01-113-5/+111
| * | | [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 pull request #3320 from marc1706/ticket/13534Andreas Fischer2015-01-211-7/+16
|\ \ \ \
| * | | | [ticket/13534] Set imagick path to empty string to prevent failing path checkMarc Alexander2015-01-211-7/+16
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-214-30/+202
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | [develop-olympus] Increment version number to 3.0.14-dev.Andreas Fischer2015-01-214-6/+6
| | |/ | |/|
| * | [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-214-6/+12
| * | [develop-olympus] Bumping version numbers to final for 3.0.13 releases.Andreas Fischer2015-01-2110-12/+12
* | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2015-01-210-0/+0
|\ \ \ | |/ /
| * | Merge pull request #3316 from bantu/ticket/13531Nils Adermann2015-01-212-0/+103
| |\ \
| | * | [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-212-0/+89
| |/ /