aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developMarc Alexander2015-01-242-1/+8
|\
| * Merge pull request #3336 from nickvergessen/ticket/13543Marc Alexander2015-01-242-1/+8
| |\ | | | | | | | | | Ticket/13543
| | * [ticket/13543] Fix broken slow testJoas Schilling2015-01-241-0/+4
| | | | | | | | | | | | PHPBB3-13543
| | * [ticket/13543] Add slow tests to travis matrixJoas Schilling2015-01-241-1/+4
| |/ | | | | | | PHPBB3-13543
* | Merge pull request #3179 from Nicofuma/ticket/13372Marc Alexander2015-01-241-28/+17
|\ \ | | | | | | | | | [ticket/13372] Fix Url Generator/Matcher generation
| * | [ticket/13372] Fix require_once CSTristan Darricau2014-11-251-2/+2
| | | | | | | | | | | | PHPBB3-13372
| * | [ticket/13372] Fix Url Generator/Matcher generationTristan Darricau2014-11-251-28/+17
| | | | | | | | | | | | PHPBB3-13372
* | | 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] Use 0 as default for integer type columns in postgresql
| | * | [ticket/13282] Add unit test for adding integer column with default nullMarc Alexander2015-01-221-0/+7
| | | | | | | | | | | | | | | | PHPBB3-13282
| | * | [ticket/13282] Add functional tests for adding profilefieldsMarc Alexander2015-01-221-0/+71
| | | | | | | | | | | | | | | | PHPBB3-13282
| | * | [ticket/13282] Use strpos() instead of preg_match()Marc Alexander2015-01-221-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13282
| | * | [ticket/13282] Use 0 as default for integer type columns in postgresqlMarc Alexander2015-01-221-1/+9
| | | | | | | | | | | | | | | | PHPBB3-13282
* | | | Merge pull request #3275 from nickvergessen/ticket/13487Marc Alexander2015-01-222-0/+40
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13487] Add factory for db tool class
| * | | | [ticket/13487] Add factory for db tool classJoas Schilling2015-01-102-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to split up the large file one by one easily. PHPBB3-13487
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2015-01-226-13/+299
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13361] Rename exception to runtime_exception [ticket/13361] Fix the JsonResponse in the exception listener [ticket/13361] Add tests [ticket/13361] Support ajax request (send a json response) [ticket/13361] Improve the exception listener
| * | | | Merge pull request #3173 from Nicofuma/ticket/13361Nils Adermann2015-01-226-13/+299
| |\ \ \ \ | | |_|/ / | |/| | | [ticket/13361] Improve the exception listener
| | * | | [ticket/13361] Rename exception to runtime_exceptionTristan Darricau2015-01-213-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-13361
| | * | | [ticket/13361] Fix the JsonResponse in the exception listenerTristan Darricau2015-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13361
| | * | | [ticket/13361] Add testsTristan Darricau2015-01-113-5/+111
| | | | | | | | | | | | | | | | | | | | PHPBB3-13361
| | * | | [ticket/13361] Support ajax request (send a json response)Tristan Darricau2015-01-101-9/+25
| | | | | | | | | | | | | | | | | | | | PHPBB3-13361
| | * | | [ticket/13361] Improve the exception listenerTristan Darricau2014-11-235-4/+168
| | | | | | | | | | | | | | | | | | | | PHPBB3-13361
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-211-7/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13534] Set imagick path to empty string to prevent failing path check
| * | | | 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 ... * marc1706/ticket/13534: [ticket/13534] Set imagick path to empty string to prevent failing path check
| | * | | | [ticket/13534] Set imagick path to empty string to prevent failing path checkMarc Alexander2015-01-211-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imagick path defaults to /usr/bin. If it doesn't exist for some reason, for example on travis, the form won't be submitted and the settings won't be changed. PHPBB3-13534
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-214-30/+202
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [develop-olympus] Increment version number to 3.0.14-dev. [develop-olympus] Add changelog for 3.0.13 release. [develop-olympus] Bump version numbers for 3.0.13-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.13 releases.
| * | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-214-30/+202
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Increment version number to 3.0.14-dev. [develop-olympus] Add changelog for 3.0.13 release. [develop-olympus] Bump version numbers for 3.0.13-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.13 releases. Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg
| | * | | | [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
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13531] Send 404 Not Found. [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
| * | | | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2015-01-210-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13531] Send 404 Not Found. [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
| | * | | | Merge pull request #3316 from bantu/ticket/13531Nils Adermann2015-01-212-0/+103
| | |\ \ \ \ | | | | | | | | | | | | | | [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
| | | * | | | [ticket/13531] Send 404 Not Found.Andreas Fischer2015-01-211-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13531
| | | * | | | [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).Marc Alexander2015-01-212-0/+89
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-13531
* | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2015-01-201-4/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13133] Fix variable name in set_custom_style()
| * | | | | Merge pull request #3314 from VSEphpbb/ticket/13133Tristan Darricau2015-01-201-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13133] Fix variable name in set_custom_style() * VSEphpbb/ticket/13133: [ticket/13133] Fix variable name in set_custom_style()
| | * | | | | [ticket/13133] Fix variable name in set_custom_style()Matt Friedman2015-01-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13133
* | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2015-01-202-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13530] Fix undefined variables
| * | | | | | Merge pull request #3315 from nickvergessen/ticket/13530Tristan Darricau2015-01-202-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13530] Fix undefined variables * nickvergessen/ticket/13530: [ticket/13530] Fix undefined variables
| | * | | | | | [ticket/13530] Fix undefined variablesJoas Schilling2015-01-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13530
| * | | | | | | Merge pull request #3313 from nickvergessen/ticket/13528Tristan Darricau2015-01-201-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13528] Return correct translation instead of is_set() * nickvergessen/ticket/13528: [ticket/13528] Return correct translation instead of is_set()
* | | | | | | | Merge pull request #3313 from nickvergessen/ticket/13528Tristan Darricau2015-01-201-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13528] Return correct translation instead of is_set() * nickvergessen/ticket/13528: [ticket/13528] Return correct translation instead of is_set()
| * | | | | | | [ticket/13528] Return correct translation instead of is_set()Joas Schilling2015-01-201-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-13528
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-2012-32/+156
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php phpBB/phpbb/db/migration/profilefield_base_migration.php phpBB/phpbb/db/migrator.php
| * | | | | | Merge pull request #3293 from Nicofuma/ticket/13489Joas Schilling2015-01-2012-32/+155
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13489] Disable the event dispatcher in the migrator
| | * | | | | | [ticket/13489] Fix service configurationTristan Darricau2015-01-206-50/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13489
| | * | | | | | [ticket/13489] Update migrationsTristan Darricau2015-01-143-20/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13489
| | * | | | | | [ticket/13489] Fix testsTristan Darricau2015-01-143-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13489
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 14:02:41 +0000