aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3338 from dhruvgoel92/ticket/12933Andreas Fischer2015-01-293-1/+61
|\
| * [ticket/12933] Add test cases for * wildcard searchesDhruv2015-01-282-0/+60
| * 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
|\ \ \ | |/ / |/| |
| * | Merge pull request #3343 from marc1706/ticket/13414Andreas Fischer2015-01-281-5/+7
| |\ \ | | |/ | |/|
| | * [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-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
| |/ /
* | | 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-202-2/+2
|\ \ \ \
| * | | | [ticket/13530] Fix undefined variablesJoas Schilling2015-01-202-2/+2
* | | | | 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-2012-32/+155
|\ \ \ \
| * | | | [ticket/13489] Fix service configurationTristan Darricau2015-01-206-50/+45
| * | | | [ticket/13489] Update migrationsTristan Darricau2015-01-143-20/+57
| * | | | [ticket/13489] Fix testsTristan Darricau2015-01-143-5/+11
| * | | | [ticket/13489] Disable the event dispatcher in the migratorTristan Darricau2015-01-143-6/+91