aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/migration
Commit message (Collapse)AuthorAgeFilesLines
* 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'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 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
* | [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
| | * [ticket/13544] Fixing wrong SQL query for permission_unset for rolesbrunoais2015-01-261-1/+2
| | | | | | | | | | | | PHPBB3-13544
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-301-0/+35
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | [prep-release-3.1.3] Add migration for 3.1.3-RC1Joas Schilling2015-01-261-0/+35
| |/
* | [ticket/13468] Update calls to `add_log()`Gaëtan Muller2015-01-271-1/+3
| | | | | | | | PHPBB3-13468
* | 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-1/+1
|\ \ | |/ | | | | | | * develop-ascraeus: [ticket/13530] Fix undefined variables
| * [ticket/13530] Fix undefined variablesJoas Schilling2015-01-201-1/+1
| | | | | | | | PHPBB3-13530
* | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-204-21/+50
|\ \ | |/ | | | | | | | | | | 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-204-20/+49
| |\ | | | | | | | | | [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
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-201-0/+70
|\ \ \ | |/ /
| * | [ticket/13492] Add the migration to update custom bbcodes with IDN regexpsrxu2015-01-201-0/+70
| |/ | | | | | | | | | | Also fix the $utf8 checking regexp removing the curly braces. PHPBB3-13492
* | [ticket/13450] Type-hint return value of $phpbb_container->get()Gaëtan Muller2015-01-122-0/+3
| | | | | | | | PHPBB3-13450
* | Merge branch 'develop-ascraeus' into developMarc Alexander2015-01-101-2/+2
|\ \ | |/
| * [ticket/13486] Fix typo in method nameJoas Schilling2015-01-101-2/+2
| | | | | | | | PHPBB3-13486
* | Merge branch 'develop-ascraeus' into developMarc Alexander2015-01-102-12/+70
|\ \ | |/
| * Merge pull request #3195 from nickvergessen/ticket/13238-ascMarc Alexander2015-01-102-12/+70
| |\ | | | | | | | | | [ticket/13238] Do not drop indexes that do not exist from fulltext search
| | * [ticket/13238] Do not drop indexes that do not exist from fulltext searchJoas Schilling2014-11-282-12/+70
| | | | | | | | | | | | PHPBB3-13238
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2015-01-101-0/+47
|\ \ \ | |/ /
| * | Merge pull request #3166 from nickvergessen/Senky-ticket/12866Marc Alexander2015-01-101-0/+47
| |\ \ | | | | | | | | | | | | [ticket/12866] Wrong profile field validation options
| | * | [ticket/12866] Update existing profile fields with the new validationJoas Schilling2014-11-281-0/+47
| | |/ | | | | | | | | | PHPBB3-12866
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-091-0/+31
|\ \ \ | |/ /
| * | Merge pull request #3227 from prototech/ticket/13366Joas Schilling2015-01-091-0/+31
| |\ \ | | | | | | | | | | | | [ticket/13366] Ensure plupload_last_gc config entry is dynamic.