aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13522] Use acp_get_question_input() for retrieving input dataMarc Alexander2015-02-211-12/+9
| | | | PHPBB3-13522
* [ticket/13522] Trim array elements before processing furtherMarc Alexander2015-02-211-3/+2
| | | | PHPBB3-13522
* [ticket/13522] Remove unused variables and unexpected returnsMarc Alexander2015-01-241-10/+9
| | | | PHPBB3-13522
* [ticket/13522] Remove empty answers from possible answers in Q&AMarc Alexander2015-01-241-2/+11
| | | | PHPBB3-13522
* 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
| * | [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
|\ \ \ | |/ / | | | | | | | | | | | | * 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 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 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()
| * | | | [ticket/13528] Return correct translation instead of is_set()Joas Schilling2015-01-201-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-13528
* | | | 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
| * | | | [ticket/13489] Disable the event dispatcher in the migratorTristan Darricau2015-01-143-6/+91
| | | | | | | | | | | | | | | | | | | | PHPBB3-13489
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-200-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13527] Apply htmlspecialchars() to data from version server. [ticket/13527] Remove two unused variables. Conflicts: phpBB/includes/acp/acp_update.php
| * | | | Merge pull request #3312 from bantu/ticket/13527Andreas Fischer2015-01-201-4/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13527] Escape information received from version server * bantu/ticket/13527: [ticket/13527] Apply htmlspecialchars() to data from version server. [ticket/13527] Remove two unused variables.
| | * | | | [ticket/13527] Apply htmlspecialchars() to data from version server.Andreas Fischer2015-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13527
| | * | | | [ticket/13527] Remove two unused variables.Andreas Fischer2015-01-201-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13527
* | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-200-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13526] Correctly validate the ucp_pm_options form key.
| * | | | | Merge pull request #3311 from bantu/ticket/13526Andreas Fischer2015-01-201-1/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13526] Correctly validate the ucp_pm_options form key. * bantu/ticket/13526: [ticket/13526] Correctly validate the ucp_pm_options form key.
| | * | | | | [ticket/13526] Correctly validate the ucp_pm_options form key.Joas Schilling2015-01-201-1/+5
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-13526
* | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-201-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13519] Correctly validate imagick path as path and not string Conflicts: phpBB/includes/acp/acp_attachments.php
| * | | | Merge pull request #3306 from marc1706/ticket/13519Andreas Fischer2015-01-201-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | [ticket/13519] Correctly validate imagick path as path and not string * marc1706/ticket/13519: [ticket/13519] Correctly validate imagick path as path and not string
| | * | | [ticket/13519] Correctly validate imagick path as path and not stringMarc Alexander2015-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13519
* | | | | 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.
| * | | | | [ticket/12642] Ensure CPF type specific options are set when editing booleans.Cesar G2014-11-111-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prepare_hidden_fields is expected to return null if the option is not sent in the request. The boolean method returns false instead, which results in the options being set as false in hidden fields when accessing the first edit step. When checking the "Default value" option, there is also a failure to check whether the "Field type" option is set to checkbox, thus resulting in this option getting lost as well. PHPBB3-12642
* | | | | | 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.