aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \
| | | * | | [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 branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-200-0/+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 branch 'develop-ascraeus' into developAndreas Fischer2015-01-201-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 branch 'develop-ascraeus' into developJoas Schilling2015-01-201-19/+19
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3138 from prototech/ticket/12642Joas Schilling2015-01-201-19/+19
| |\ \ \ \
| | * | | | [ticket/12642] Ensure CPF type specific options are set when editing booleans.Cesar G2014-11-111-19/+19
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-201-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3226 from prototech/ticket/13420Joas Schilling2015-01-201-2/+2
| |\ \ \ \ \
| | * | | | | [ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.Cesar G2014-12-091-2/+2
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-200-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2015-01-200-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge pull request #3310 from bantu/ticket/13523Joas Schilling2015-01-202-2/+24
| | |\ \ \ \ \