aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Joas Schilling2015-06-141-0/+31
|\ | | | | | | | | | | Conflicts: build/build.xml phpBB/phpbb/user.php
| * [prep-release-3.1.5] Add migration for 3.1.5Joas Schilling2015-06-141-0/+31
| |
* | Merge branch '3.1.x'Joas Schilling2015-06-111-0/+31
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * [prep-release-3.1.5] Add migration for 3.1.5-RC1Joas Schilling2015-06-091-0/+31
| |
* | Merge pull request #3696 from marc1706/ticket/13930-masterAndreas Fischer2015-06-091-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930-master: [ticket/13930] Add missing space to mssql_extractor [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis
| * | [ticket/13930] Add missing space to mssql_extractorMarc Alexander2015-06-081-1/+1
| | | | | | | | | | | | PHPBB3-13930
* | | Merge branch '3.1.x'Joas Schilling2015-06-091-4/+18
|\ \ \ | |/ / |/| / | |/
| * Merge pull request #3551 from rxu/ticket/13779Joas Schilling2015-06-091-4/+18
| |\ | | | | | | | | | [ticket/13779] Set new auth options to the role only if matching the role type
| | * [ticket/13779] Set new auth options to the role only if matching the role typerxu2015-04-261-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrations' permission tool allows setting permissions to the role which doesn't match the role type, e.g. m_ permissions for u_ role types and so on. As one of side effects, this may lead to granting users moderative/admin permissions silently. With this patch the only new permissions matching the role type will be set. PHPBB3-13779
* | | [ticket/13777] Reorder get_module_infos() method's argumentsMateBartus2015-05-311-1/+1
| | | | | | | | | | | | PHPBB3-13777
* | | [ticket/13777] Use module manager in phpBB core filesMateBartus2015-05-313-53/+24
| | | | | | | | | | | | PHPBB3-13777
* | | Merge branch '3.1.x'Nils Adermann2015-05-301-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13790] Update phpcs Conflicts: phpBB/composer.json phpBB/composer.lock
| * | Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-301-1/+1
| |\ \ | | | | | | | | [ticket/13790] Update phpcs
| | * | [ticket/13790] Update phpcsTristan Darricau2015-05-191-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13790
* | | | Merge branch '3.1.x'Marc Alexander2015-05-221-5/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/phpbb/db/migration/data/v310/style_update_p1.php
| * | | [ticket/13861] Fix undefined variables in style update migrationMatt Friedman2015-05-211-3/+3
| | | | | | | | | | | | | | | | PHPBB3-13861
* | | | Merge branch '3.1.x'Andreas Fischer2015-05-061-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13819] Add missing sql_freeresult() to files in includes/ Conflicts: phpBB/includes/acp/acp_database.php
* | | | Merge branch '3.1.x'Joas Schilling2015-05-031-0/+32
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: build/build.xml
| * | | [prep-release-3.1.4] Add migrationJoas Schilling2015-05-031-0/+32
| | | |
* | | | Merge branch '3.1.x'Andreas Fischer2015-05-031-0/+37
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release.
| * | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-031-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html. [prep-release-3.0.14] Bump version numbers for 3.0.14 release. Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
* | | | Merge branch '3.1.x'Joas Schilling2015-04-291-0/+32
|\ \ \ \ | |/ / /
| * | | [prep-release-3.1.4] Increase version number to 3.1.4-RC2Joas Schilling2015-04-291-0/+32
| | | |
* | | | Merge branch '3.1.x'Andreas Fischer2015-04-281-0/+37
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * 3.1.x: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 releases.
| * | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-04-281-0/+37
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.14: [3.0.x] Add changelog for 3.0.14 release. [3.0.x] Bump version numbers for 3.0.14-RC1 release. [3.0.x] Bumping version numbers to final for 3.0.14 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 pull request #3487 from MateBartus/ticket/13697Tristan Darricau2015-04-161-2/+9
|\ \ \ | | | | | | | | | | | | [ticket/13697] Moving filesystem related functions to filesystem service
| * | | [ticket/13697] Moving filesystem related functions to filesystem serviceMateBartus2015-04-161-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moving filesystem service to \phpbb\filesystem namespace * Wraping Symfony's Filesystem component * Moving filesystem related functions from includes/functions.php into \phpbb\filesystem\filesystem Functions moved (and deprecated): - phpbb_chmod - phpbb_is_writable - phpbb_is_absolute - phpbb_own_realpath - phpbb_realpath * Adding interface for filesystem service PHPBB3-13697
* | | | Merge branch '3.1.x'Joas Schilling2015-04-101-0/+31
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | [prep-release-3.1.4] Add migration for 3.1.4-RC1Joas Schilling2015-04-091-0/+31
| | |/ | |/|
* | | Merge branch '3.1.x'Joas Schilling2015-04-061-1/+23
|\ \ \ | |/ /
| * | [ticket/12368] Fix comment in docblockMarc Alexander2015-03-261-1/+1
| | | | | | | | | | | | PHPBB3-12368
| * | [ticket/12368] Correctly check if avatars migration is installedMarc Alexander2015-02-241-1/+23
| | | | | | | | | | | | | | | | | | | | | Try to set the avatar type to string value to check if new avatar types are supported. PHPBB3-12368
* | | Merge pull request #3430 from MateBartus/ticket/12466Tristan Darricau2015-04-0511-0/+2287
|\ \ \ | |_|/ |/| | | | | [ticket/12466] Move classes from acp_database.php to their own files
| * | [ticket/12466] Move classes from acp_database.php to their own filesMateBartus2015-02-2711-0/+2287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moving classes from acp_database.php to phpbb/db/extractor namespace, also into separate files * Adding DocBlocks and property visibility to classes * Removing globals from code * Passing former globals to base_extractor's constructor * Adding DB extractor as a service, also implementing the extractor interface as well as the extractor factory. PHPBB3-12466
* | | [ticket/13725] Coding guidelines: static publicMatt Friedman2015-03-271-1/+1
|/ / | | | | | | PHPBB3-13725
* | Merge branch '3.1.x'Andreas Fischer2015-02-171-2/+1
|\ \ | |/ | | | | | | * 3.1.x: [ticket/13570] Remove unnecessary ternary condition from mysqli driver
| * [ticket/13570] Remove unnecessary ternary condition from mysqli driverJakub Senko2015-02-161-2/+1
| | | | | | | | PHPBB3-13570
* | [ticket/10748] Split postgres DB tools into it's own classJoas Schilling2015-02-134-277/+637
| | | | | | | | PHPBB3-10748
* | [ticket/10748] Overwrite the type map correctlyJoas Schilling2015-02-072-1/+4
| | | | | | | | PHPBB3-10748
* | [ticket/10748] Split MS SQL from the db tools file into it's ownJoas Schilling2015-02-073-574/+859
| | | | | | | | PHPBB3-10748
* | [ticket/13494] Update calls to `set_config()`Gaëtan Muller2015-02-021-1/+3
| | | | | | | | PHPBB3-13494
* | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-011-0/+31
|\ \ | |/ | | | | | | Conflicts: build/build.xml
| * [prep-release-3.1.3] Add migration for 3.1.3Joas Schilling2015-02-011-0/+31
| |
* | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-311-0/+32
|\ \ | |/ | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * [prep-release-3.1.3] Add migration for 3.1.3-RC2Joas Schilling2015-01-311-0/+32
| |
* | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-312-0/+74
|\ \ | |/
| * [ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1Joas Schilling2015-01-302-0/+74
| | | | | | | | PHPBB3-13557
* | 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