aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3904 from Zoddo/ticket/14162Marc Alexander2015-10-071-0/+19
|\ | | | | | | [ticket/14162] Add CLI commands to manage migrations
| * [ticket/14162] Add CLI command db:revertZoddo2015-09-201-0/+19
| | | | | | | | | | | | This command allow to revert a migration from the CLI PHPBB3-14162
* | [ticket/14182] Move v310\notifications_board migration to v320\...Tristan Darricau2015-09-211-1/+1
| | | | | | | | PHPBB3-14182
* | [ticket/12769] Properly include FAMichael Miday2015-09-171-0/+29
|/
* Merge pull request #3870 from Zoddo/ticket/9485Tristan Darricau2015-09-091-0/+44
|\ | | | | | | | | | | | | | | | | [ticket/9485] Add a "View post" link in the moderation logs * Zoddo/ticket/9485: [ticket/9485] Fix tests [ticket/9485] Add post_id to relevant $phpbb_log->add() [ticket/9485] Add a "View post" link in the moderation logs
| * [ticket/9485] Add a "View post" link in the moderation logsZoddo2015-08-301-0/+44
| | | | | | | | PHPBB3-9485
* | Merge branch '3.1.x'Tristan Darricau2015-09-091-0/+1
|\ \ | | | | | | | | | | | | * 3.1.x: [ticket/13423] Set busyTimeout on connect to prevent db locking
| * | [ticket/13423] Set busyTimeout on connect to prevent db lockingMarc Alexander2015-09-071-0/+1
| | | | | | | | | | | | PHPBB3-13423
* | | Merge branch '3.1.x'Joas Schilling2015-09-051-0/+31
|\ \ \ | |/ / | | / | |/ |/| Conflicts: build/build.xml
| * [prep-release-3.1.6] Add migration for 3.1.6Joas Schilling2015-09-051-0/+31
| |
* | [ticket/12505] Fix variable usage in migration filen-aleha2015-08-241-1/+1
| | | | | | | | PHPBB3-12505
* | [ticket/12505] Add migrationn-aleha2015-08-241-0/+83
| | | | | | | | PHPBB3-12505
* | Merge branch '3.1.x'Joas Schilling2015-08-231-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.6] Add migration for 3.1.6-RC1Joas Schilling2015-08-231-0/+31
| |
* | Merge branch '3.1.x'Andreas Fischer2015-08-201-1/+1
|\ \ | |/ | | | | | | * 3.1.x: [ticket/14116] sql_affectedrows method has no arguments
| * [ticket/14116] sql_affectedrows method has no argumentsMatt Friedman2015-08-191-1/+1
| | | | | | | | PHPBB3-14116
* | Merge branch '3.1.x'Andreas Fischer2015-08-101-1/+1
|\ \ | |/ | | | | | | * 3.1.x: [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
| * [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migrationMarco Kubuntu2015-08-051-1/+1
| | | | | | | | | | | | Changed the sql_fetchfield() call to comply to the function definition. PHPBB3-14069
* | Merge pull request #3698 from s9e/ticket/13935Tristan Darricau2015-08-051-0/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13935] Allow more admin-configurable schemes in post links * s9e/ticket/13935: [ticket/13935] Removed cache invalidation from acp_board [ticket/13935] Removed UI [ticket/13935] Allow more admin-configurable schemes in post links
| * | [ticket/13935] Allow more admin-configurable schemes in post linksJoshyPHP2015-07-151-0/+24
| | | | | | | | | | | | PHPBB3-13935
* | | [ticket/8708] Add f_announce_global permissionOliver Schramm2015-07-191-0/+41
|/ / | | | | | | PHPBB3-8708
* | [ticket/11444] Moving the in-board notifications to a method classNicofuma2015-07-131-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the in-board method for the notifications is hardcoded and cannot be disabled. This method should be in his own class extending `phpbb\notification\method\method_interface`. It also add the possibility, for each method, to be enabled by default (ie: no entry in the DB => notification enabled). https://tracker.phpbb.com/browse/PHPBB3-11444 https://tracker.phpbb.com/browse/PHPBB3-11967 PHPBB3-11444
* | 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