Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'develop-ascraeus' into develop | Tristan Darricau | 2015-01-20 | 1 | -1/+1 | |
|\ \ \ | |/ / | | | | | | | | | | * develop-ascraeus: [ticket/13530] Fix undefined variables | |||||
| * | | [ticket/13530] Fix undefined variables | Joas Schilling | 2015-01-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | PHPBB3-13530 | |||||
* | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2015-01-20 | 5 | -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/13489 | Joas Schilling | 2015-01-20 | 5 | -26/+95 | |
| |\ \ | | | | | | | | | | | | | [ticket/13489] Disable the event dispatcher in the migrator | |||||
| | * | | [ticket/13489] Fix service configuration | Tristan Darricau | 2015-01-20 | 4 | -49/+41 | |
| | | | | | | | | | | | | | | | | PHPBB3-13489 | |||||
| | * | | [ticket/13489] Update migrations | Tristan Darricau | 2015-01-14 | 3 | -20/+57 | |
| | | | | | | | | | | | | | | | | PHPBB3-13489 | |||||
| | * | | [ticket/13489] Disable the event dispatcher in the migrator | Tristan Darricau | 2015-01-14 | 1 | -6/+46 | |
| | | | | | | | | | | | | | | | | PHPBB3-13489 | |||||
* | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2015-01-20 | 1 | -0/+70 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | [ticket/13492] Add the migration to update custom bbcodes with IDN regexps | rxu | 2015-01-20 | 1 | -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 Muller | 2015-01-12 | 2 | -0/+3 | |
| | | | | | | | | | | | | PHPBB3-13450 | |||||
* | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2015-01-10 | 1 | -2/+2 | |
|\ \ \ | |/ / | | / | |/ |/| | ||||||
| * | [ticket/13486] Fix typo in method name | Joas Schilling | 2015-01-10 | 1 | -2/+2 | |
| | | | | | | | | PHPBB3-13486 | |||||
* | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2015-01-10 | 2 | -12/+70 | |
|\ \ | |/ | ||||||
| * | Merge pull request #3195 from nickvergessen/ticket/13238-asc | Marc Alexander | 2015-01-10 | 2 | -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 search | Joas Schilling | 2014-11-28 | 2 | -12/+70 | |
| | | | | | | | | | | | | PHPBB3-13238 | |||||
* | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2015-01-10 | 1 | -0/+47 | |
|\ \ \ | |/ / | ||||||
| * | | Merge pull request #3166 from nickvergessen/Senky-ticket/12866 | Marc Alexander | 2015-01-10 | 1 | -0/+47 | |
| |\ \ | | | | | | | | | | | | | [ticket/12866] Wrong profile field validation options | |||||
| | * | | [ticket/12866] Update existing profile fields with the new validation | Joas Schilling | 2014-11-28 | 1 | -0/+47 | |
| | |/ | | | | | | | | | | PHPBB3-12866 | |||||
* | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2015-01-09 | 1 | -0/+31 | |
|\ \ \ | |/ / | ||||||
| * | | Merge pull request #3227 from prototech/ticket/13366 | Joas Schilling | 2015-01-09 | 1 | -0/+31 | |
| |\ \ | | | | | | | | | | | | | [ticket/13366] Ensure plupload_last_gc config entry is dynamic. | |||||
| | * | | [ticket/13366] Ensure plupload_last_gc config entry is dynamic. | Cesar G | 2014-12-09 | 1 | -0/+31 | |
| | | | | | | | | | | | | | | | | PHPBB3-13366 | |||||
* | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2015-01-09 | 1 | -0/+1 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | [ticket/13432] Make sure to add language file when including acp_modules | Marc Alexander | 2015-01-09 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-13432 | |||||
* | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-12-27 | 1 | -0/+38 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge pull request #3229 from n-aleha/ticket/13098 | Joas Schilling | 2014-12-27 | 1 | -0/+38 | |
| |\ \ \ | | | | | | | | | | | | | | | | [ticket/13098] Repair Yahoo contact field | |||||
| | * | | | [ticket/13098] Repair Yahoo contact field | n-aleha | 2014-12-12 | 1 | -0/+38 | |
| | |/ / | | | | | | | | | | | | | | | | | | | | | Update the Yahoo link of the yahoo profile field. PHPBB3-13098 | |||||
* | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-12-27 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge pull request #3205 from rxu/ticket/13406 | Joas Schilling | 2014-12-27 | 1 | -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 list | rxu | 2014-11-30 | 1 | -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/13421 | Marc Alexander | 2014-12-10 | 6 | -103/+254 | |
|\ \ \ | | | | | | | | | | | | | Ticket/13421 Introduce an interface for db\tools.php | |||||
| * | | | [ticket/13421] Move tools to subdirectory | Joas Schilling | 2014-12-06 | 6 | -10/+10 | |
| | | | | | | | | | | | | | | | | PHPBB3-13421 | |||||
| * | | | [ticket/13421] Always require the interface when possible | Joas Schilling | 2014-12-06 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | PHPBB3-13421 | |||||
| * | | | [ticket/13421] Inherit docs | Joas Schilling | 2014-12-06 | 1 | -85/+34 | |
| | | | | | | | | | | | | | | | | PHPBB3-13421 | |||||
| * | | | [ticket/13421] Add an interface for \phpbb\db\tools | Joas Schilling | 2014-12-06 | 2 | -11/+213 | |
| | | | | | | | | | | | | | | | | PHPBB3-13421 | |||||
* | | | | Merge branch 'develop-ascraeus' into develop | Tristan Darricau | 2014-11-30 | 1 | -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.php | rxu | 2014-11-30 | 1 | -1/+1 | |
| |/ | | | | | | | PHPBB3-13405 | |||||
* | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-25 | 1 | -10/+10 | |
|\ \ | |/ | ||||||
| * | [ticket/13381] Fix header intendation of v312.php | Joas Schilling | 2014-11-25 | 1 | -10/+10 | |
| | | | | | | | | PHPBB3-13381 | |||||
* | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-25 | 2 | -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.2 | Joas Schilling | 2014-11-24 | 1 | -0/+31 | |
| | | ||||||
| * | [prep-release-3.1.2] Add migration for 3.1.2-RC1 | Joas Schilling | 2014-11-22 | 1 | -0/+32 | |
| | | ||||||
* | | Merge branch 'develop-ascraeus' into develop | Tristan Darricau | 2014-11-18 | 1 | -2/+6 | |
|\ \ | |/ | | | | | | | * develop-ascraeus: [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha. | |||||
| * | Merge pull request #3149 from prototech/ticket/13342 | Tristan Darricau | 2014-11-18 | 1 | -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 G | 2014-11-16 | 1 | -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 develop | Tristan Darricau | 2014-11-18 | 1 | -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 G | 2014-11-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | PHPBB3-13315 | |||||
| * | | [ticket/13315] Fix loss of CAPTCHA plugin config value. | Cesar G | 2014-11-16 | 1 | -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_replace | Nicolas Grekas | 2014-11-08 | 1 | -4/+4 | |
| | | ||||||
* | | Merge branch 'develop-ascraeus' into develop | Tristan Darricau | 2014-11-07 | 1 | -0/+31 | |
|\ \ | |/ | | | | | | | * develop-ascraeus: [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12. | |||||
| * | Merge pull request #3118 from prototech/ticket/13270 | Tristan Darricau | 2014-11-07 | 1 | -0/+31 | |
| |\ | | | | | | | | | | | | | | | | | | | [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12. * prototech/ticket/13270: [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12. |