aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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-205-27/+96
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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-205-26/+95
| |\ \ | | | | | | | | | | | | [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-141-6/+46
| | | | | | | | | | | | | | | | 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.
| | * | [ticket/13366] Ensure plupload_last_gc config entry is dynamic.Cesar G2014-12-091-0/+31
| | | | | | | | | | | | | | | | PHPBB3-13366
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-091-0/+1
|\ \ \ \ | |/ / /
| * | | [ticket/13432] Make sure to add language file when including acp_modulesMarc Alexander2015-01-091-0/+1
| | | | | | | | | | | | | | | | PHPBB3-13432
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-0/+38
|\ \ \ \ | |/ / /
| * | | Merge pull request #3229 from n-aleha/ticket/13098Joas Schilling2014-12-271-0/+38
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13098] Repair Yahoo contact field
| | * | | [ticket/13098] Repair Yahoo contact fieldn-aleha2014-12-121-0/+38
| | |/ / | | | | | | | | | | | | | | | | | | | | Update the Yahoo link of the yahoo profile field. PHPBB3-13098
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #3205 from rxu/ticket/13406Joas Schilling2014-12-271-1/+1
| |\ \ \ | | |/ / | |/| | | | | | [ticket/13406] Add a space between the index name and columns list
| | * | [ticket/13406] Add a space between the index name and columns listrxu2014-11-301-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | Currently there's no space between the index name and columns list when generating ADD INDEX sql query for MySQL DBMSes. This may cause errors on earlier MySQL versions like 3.23. PHPBB3-13406
* | | Merge pull request #3220 from nickvergessen/ticket/13421Marc Alexander2014-12-106-103/+254
|\ \ \ | | | | | | | | | | | | Ticket/13421 Introduce an interface for db\tools.php
| * | | [ticket/13421] Move tools to subdirectoryJoas Schilling2014-12-066-10/+10
| | | | | | | | | | | | | | | | PHPBB3-13421
| * | | [ticket/13421] Always require the interface when possibleJoas Schilling2014-12-062-5/+5
| | | | | | | | | | | | | | | | PHPBB3-13421
| * | | [ticket/13421] Inherit docsJoas Schilling2014-12-061-85/+34
| | | | | | | | | | | | | | | | PHPBB3-13421
| * | | [ticket/13421] Add an interface for \phpbb\db\toolsJoas Schilling2014-12-062-11/+213
| | | | | | | | | | | | | | | | PHPBB3-13421
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-301-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * develop-ascraeus: [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
| * | [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.phprxu2014-11-301-1/+1
| |/ | | | | | | PHPBB3-13405
* | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-251-10/+10
|\ \ | |/
| * [ticket/13381] Fix header intendation of v312.phpJoas Schilling2014-11-251-10/+10
| | | | | | | | PHPBB3-13381
* | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-252-0/+63
|\ \ | |/ | | | | | | | | | | | | | | 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.2] Add migration to update version to 3.1.2Joas Schilling2014-11-241-0/+31
| |
| * [prep-release-3.1.2] Add migration for 3.1.2-RC1Joas Schilling2014-11-221-0/+32
| |
* | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-181-2/+6
|\ \ | |/ | | | | | | * develop-ascraeus: [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
| * Merge pull request #3149 from prototech/ticket/13342Tristan Darricau2014-11-181-2/+6
| |\ | | | | | | | | | | | | | | | | | | [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha * prototech/ticket/13342: [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
| | * [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.Cesar G2014-11-161-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | The Recaptcha plugin class name does not follow the phpbb_captcha_ prefix convention as all others. Instead it simply uses phpbb_, hence the check for its existence under phpbb/captcha/plugins/ fails. PHPBB3-13342
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-181-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | * develop-ascraeus: [ticket/13315] Check for the includes/captcha/plugins/ directory instead. [ticket/13315] Fix loss of CAPTCHA plugin config value.
| * | [ticket/13315] Check for the includes/captcha/plugins/ directory instead.Cesar G2014-11-181-1/+1
| | | | | | | | | | | | PHPBB3-13315
| * | [ticket/13315] Fix loss of CAPTCHA plugin config value.Cesar G2014-11-161-1/+2
| |/ | | | | | | | | | | | | | | The plugins were moved to phpbb/captcha/plugins/ after this migration was created, thus the check is no longer valid and ends up resetting the value prematurely. PHPBB3-13315
* | [feature/patchwork-utf8] Remove utf8_str_replaceNicolas Grekas2014-11-081-4/+4
| |