aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* 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-225-13/+199
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * 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-225-13/+199
| |\ \ | | | | | | | | [ticket/13361] Improve the exception listener
| | * | [ticket/13361] Rename exception to runtime_exceptionTristan Darricau2015-01-212-4/+4
| | | | | | | | | | | | | | | | PHPBB3-13361
| | * | [ticket/13361] Fix the JsonResponse in the exception listenerTristan Darricau2015-01-141-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13361
| | * | [ticket/13361] Add testsTristan Darricau2015-01-112-5/+11
| | | | | | | | | | | | | | | | 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-213-29/+201
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * 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-213-29/+201
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-213-3/+3
| | | | |
| | * | | [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-213-5/+11
| | | | |
| | * | | [develop-olympus] Bumping version numbers to final for 3.0.13 releases.Andreas Fischer2015-01-2110-12/+12
| | | | |
| | * | | [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-211-0/+34
| | | | | | | | | | | | | | | | | | | | PHPBB3-13531
| | * | | 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 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-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-201-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13530] Fix undefined variables
| * | | | | | Merge pull request #3315 from nickvergessen/ticket/13530Tristan Darricau2015-01-201-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13530] Fix undefined variables * nickvergessen/ticket/13530: [ticket/13530] Fix undefined variables
| | * | | | | | [ticket/13530] Fix undefined variablesJoas Schilling2015-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-208-27/+142
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-208-26/+141
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13489] Disable the event dispatcher in the migrator
| | * | | | | | [ticket/13489] Fix service configurationTristan Darricau2015-01-205-49/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13489
| | * | | | | | [ticket/13489] Update migrationsTristan Darricau2015-01-143-20/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13489
| | * | | | | | [ticket/13489] Disable the event dispatcher in the migratorTristan Darricau2015-01-143-6/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13489
* | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-201-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13519] Correctly validate imagick path as path and not string
| * | | | | | | 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 #2990 from Senky/ticket/10985Nils Adermann2015-01-191-0/+5
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | [ticket/10985] Error bbcode.html not found when updating with custom style inheriting from prosilver
| | | * | | | [ticket/10985] Add fix to properly inherit style during update processJakub Senko2014-09-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10985
| | * | | | | [ticket/11613] Allow cookies to work on netbios domainsJakub Senko2014-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11613
* | | | | | | 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.
| | * | | | | | [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 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.
| | * | | | | | | [ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.Cesar G2014-12-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13420
* | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-202-1/+73
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 05:40:06 +0000