aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13553] Message helper should accept a lang key varMatt Friedman2015-01-311-5/+7
| | | | PHPBB3-13553
* Merge pull request #3355 from nickvergessen/ticket/13557Joas Schilling2015-01-312-0/+74
|\ | | | | | | [ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1
| * [ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1Joas Schilling2015-01-302-0/+74
|/ | | | PHPBB3-13557
* Merge pull request #3354 from nickvergessen/ticket/13556Andreas Fischer2015-01-302-5/+6
|\ | | | | | | | | | | | | [ticket/13556] Fix exception translation with filedownloader * nickvergessen/ticket/13556: [ticket/13556] Fix exception translation with filedownloader
| * [ticket/13556] Fix exception translation with filedownloaderJoas Schilling2015-01-302-5/+6
|/ | | | PHPBB3-13556
* Merge pull request #3341 from brunoais/ticket/13544Joas Schilling2015-01-301-1/+2
|\ | | | | | | [ticket/13544] Fixing wrong SQL query for permission_unset() for roles
| * [ticket/13544] Use integer case because $role_id is an intbrunoais2015-01-261-1/+1
| | | | | | | | PHPBB3-13544
| * [ticket/13544] Fixing wrong SQL query for permission_unset for rolesbrunoais2015-01-261-1/+2
| | | | | | | | PHPBB3-13544
* | Merge branch 'prep-release-3.0.13' into prep-release-3.1.3Andreas Fischer2015-01-303-45/+53
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [prep-release-3.0.13] Correct changelog link to 3.0.13 changes. [prep-release-3.0.13] Also update version in references to files. [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release. [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html. [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release. [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME. [ticket/12933] Handle case when * is last character of word [ticket/13554] Show feature release upgrades in blue rather than red. Conflicts: build/build.xml phpBB/adm/style/acp_update.html phpBB/docs/CHANGELOG.html phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/includes/startup.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql tests/security/trailing_path_test.php
| * | [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.
| | * | [ticket/13554] Show feature release upgrades in blue rather than red.Andreas Fischer2015-01-281-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13554
| * | | 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... * bantu/ticket/13549: [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
| | * | | [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.Marc Alexander2015-01-282-2/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | The ORIG_PATH_INFO on IIS also contains the script name. Only use that for killing the script after removing the script name from ORIG_PATH_INFO. PHPBB3-13549
| * | | Merge pull request #3349 from bantu/ticket/12933Andreas Fischer2015-01-291-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | [ticket/12933] Handle case when * is last character of word * bantu/ticket/12933: [ticket/12933] Handle case when * is last character of word
| | * | [ticket/12933] Handle case when * is last character of wordDhruv2015-01-281-1/+1
| |/ / | | | | | | | | | PHPBB3-12933
* | | 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 message
| * | | [ticket/13553] Add a method to the controller helper to display a messageJoas Schilling2015-01-291-1/+16
|/ / / | | | | | | | | | PHPBB3-13553
* | | [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
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.13] Bump version numbers for 3.0.13 release [prep-release-3.0.13] Highlight security relevant changes Conflicts: build/build.xml phpBB/install/database_update.php
| * \ Merge branch 'prep-release-3.0.13' into develop-olympusNils Adermann2015-01-263-3/+12
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [prep-release-3.0.13] Bump version numbers for 3.0.13 release [prep-release-3.0.13] Highlight security relevant changes Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * [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
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/12089] Add assert message on HTTP status code check
| * | Merge pull request #3339 from nickvergessen/ticket/12089Andreas Fischer2015-01-261-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12089] Add assert message on HTTP status code check * nickvergessen/ticket/12089: [ticket/12089] Add assert message on HTTP status code check
| | * | [ticket/12089] Add assert message on HTTP status code checkJoas Schilling2015-01-251-1/+1
| |/ / | | | | | | | | | PHPBB3-12089
* | | 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 #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 #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 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-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