aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3179 from Nicofuma/ticket/13372Marc Alexander2015-01-241-28/+17
|\
| * [ticket/13372] Fix require_once CSTristan Darricau2014-11-251-2/+2
| * [ticket/13372] Fix Url Generator/Matcher generationTristan Darricau2014-11-251-28/+17
* | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-233-1/+87
|\ \
| * \ 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 #3275 from nickvergessen/ticket/13487Marc Alexander2015-01-222-0/+40
|\ \ \ \
| * | | | [ticket/13487] Add factory for db tool classJoas Schilling2015-01-102-0/+40
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2015-01-226-13/+299
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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 branch 'develop-ascraeus' into developAndreas Fischer2015-01-211-7/+16
|\ \ \ \ \ | |/ / / /
| * | | | 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-ascraeus' into developAndreas Fischer2015-01-214-30/+202
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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-ascraeus' into developNils Adermann2015-01-210-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 branch 'develop-ascraeus' into developTristan Darricau2015-01-201-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 branch 'develop-ascraeus' into developTristan Darricau2015-01-202-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
* | | | | | | | 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 branch 'develop-ascraeus' into developJoas Schilling2015-01-2012-32/+156
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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
* | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-200-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-200-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge pull request #3312 from bantu/ticket/13527Andreas Fischer2015-01-201-4/+1
| | |\ \ \ \ \ \