aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-302-5/+6
|\ | | | | | | | | * develop-ascraeus: [ticket/13556] Fix exception translation with filedownloader
| * [ticket/13556] Fix exception translation with filedownloaderJoas Schilling2015-01-302-5/+6
| | | | | | | | PHPBB3-13556
* | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-301-1/+2
|\ \ | |/
| * 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-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-302-1/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13553] Add a method to the controller helper to display a message [prep-release-3.1.3] Add changelog for 3.1.3-RC1 [prep-release-3.1.3] Prepare Changelog [prep-release-3.1.3] Add migration for 3.1.3-RC1 [prep-release-3.1.3] Update version to 3.1.2-RC1 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * \ \ Merge branch 'prep-release-3.1.3' into develop-ascraeusDhruv2015-01-302-1/+51
| |\ \ \ | | |/ /
| | * | [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 migration for 3.1.3-RC1Joas Schilling2015-01-261-0/+35
| | |/
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-291-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | * develop-ascraeus: [ticket/12933] Add test cases for * wildcard searches [ticket/12933] Handle case when * is last character of word
| * | Merge branch 'ticket/12933-olympus' into ticket/12933Dhruv2015-01-281-1/+1
| |/
* | [ticket/13468] Update calls to `add_log()`Gaëtan Muller2015-01-279-27/+38
| | | | | | | | PHPBB3-13468
* | 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-231-1/+9
|\ \ \ | | |/ | |/|
| * | Merge pull request #3321 from marc1706/ticket/13282Joas Schilling2015-01-231-1/+9
| |\ \ | | | | | | | | | | | | [ticket/13282] Use 0 as default for integer type columns in postgresql
| | * | [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-221-0/+35
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13487] Add factory for db tool class
| * | | | [ticket/13487] Add factory for db tool classJoas Schilling2015-01-101-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-0/+37
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-211-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | 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-207-27/+141
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-207-26/+140
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | [ticket/13489] Disable the event dispatcher in the migrator
| | * | | | [ticket/13489] Fix service configurationTristan Darricau2015-01-204-49/+41
| | | | | | | | | | | | | | | | | | | | | | | | 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 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-0/+70
|\ \ \ \ \ \ \ | |/ / / / / /
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 08:45:42 +0000