b566686b51
Merge branch 'develop-ascraeus' into develop
...
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
2015-01-20 23:32:36 +01:00
a5fae1b1f0
Merge pull request #3293 from Nicofuma/ticket/13489
...
[ticket/13489] Disable the event dispatcher in the migrator
2015-01-20 23:27:54 +01:00
2dcce57806
Merge branch 'develop-ascraeus' into develop
2015-01-20 17:31:24 +01:00
dab0728357
[ticket/13489] Fix service configuration
...
PHPBB3-13489
2015-01-20 14:19:55 +01:00
8002af7526
[ticket/13492] Add the migration to update custom bbcodes with IDN regexps
...
Also fix the $utf8 checking regexp removing the curly braces.
PHPBB3-13492
2015-01-20 08:47:56 +07:00
ce47170c29
[ticket/13489] Update migrations
...
PHPBB3-13489
2015-01-14 12:16:24 +01:00
c99ed64473
[ticket/13489] Disable the event dispatcher in the migrator
...
PHPBB3-13489
2015-01-14 11:09:44 +01:00
b5544b2f47
[ticket/13450] Type-hint return value of $phpbb_container->get()
...
PHPBB3-13450
2015-01-12 20:19:07 +01:00
b4a2beff24
Merge branch 'develop-ascraeus' into develop
2015-01-10 16:25:44 +01:00
11b6bc5722
[ticket/13487] Add factory for db tool class
...
This allows us to split up the large file one by one easily.
PHPBB3-13487
2015-01-10 16:25:24 +01:00
f756632185
[ticket/13486] Fix typo in method name
...
PHPBB3-13486
2015-01-10 15:14:58 +01:00
45ccd2d44a
Merge branch 'develop-ascraeus' into develop
2015-01-10 13:18:21 +01:00
c28ef9afdd
Merge pull request #3195 from nickvergessen/ticket/13238-asc
...
[ticket/13238] Do not drop indexes that do not exist from fulltext search
2015-01-10 13:17:59 +01:00
3cfbe7bb4f
Merge branch 'develop-ascraeus' into develop
2015-01-10 12:37:11 +01:00
67c987f0d0
Merge pull request #3166 from nickvergessen/Senky-ticket/12866
...
[ticket/12866] Wrong profile field validation options
2015-01-10 12:36:49 +01:00
a5007b7abd
Merge branch 'develop-ascraeus' into develop
2015-01-09 18:12:02 +01:00
3350df131f
Merge pull request #3227 from prototech/ticket/13366
...
[ticket/13366] Ensure plupload_last_gc config entry is dynamic.
2015-01-09 18:11:41 +01:00
b9c10e34bb
Merge branch 'develop-ascraeus' into develop
2015-01-09 17:36:25 +01:00
9d9c57f334
[ticket/13432] Make sure to add language file when including acp_modules
...
PHPBB3-13432
2015-01-09 13:47:36 +01:00
dbbcf3f372
Merge branch 'develop-ascraeus' into develop
2014-12-27 14:17:03 +01:00
b0f1a0f4bb
Merge pull request #3229 from n-aleha/ticket/13098
...
[ticket/13098] Repair Yahoo contact field
2014-12-27 14:16:55 +01:00
60b45bb0bd
Merge branch 'develop-ascraeus' into develop
2014-12-27 13:51:30 +01:00
3ba62628dc
Merge pull request #3205 from rxu/ticket/13406
...
[ticket/13406] Add a space between the index name and columns list
2014-12-27 13:51:24 +01:00
6463354a39
[ticket/13098] Repair Yahoo contact field
...
Update the Yahoo link of the yahoo profile field.
PHPBB3-13098
2014-12-12 13:54:35 +02:00
54b5ee5806
[ticket/13366] Ensure plupload_last_gc config entry is dynamic.
...
PHPBB3-13366
2014-12-09 18:50:29 -08:00
d22fa412c4
Merge pull request #3220 from nickvergessen/ticket/13421
...
Ticket/13421 Introduce an interface for db\tools.php
2014-12-10 00:03:24 +01:00
ec90f2b380
[ticket/13421] Move tools to subdirectory
...
PHPBB3-13421
2014-12-06 17:10:07 +01:00
d78bb2865b
[ticket/13421] Always require the interface when possible
...
PHPBB3-13421
2014-12-06 16:17:04 +01:00
536bdf036b
[ticket/13421] Inherit docs
...
PHPBB3-13421
2014-12-06 16:16:51 +01:00
10594779b9
[ticket/13421] Add an interface for \phpbb\db\tools
...
PHPBB3-13421
2014-12-06 16:16:44 +01:00
319efb026d
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
2014-11-30 19:07:19 +01:00
2f92bc38e6
[ticket/13406] Add a space between the index name and columns list
...
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
2014-11-30 16:52:36 +07:00
499c1467df
[ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
...
PHPBB3-13405
2014-11-30 11:27:47 +07:00
aab98b8626
[ticket/13238] Do not drop indexes that do not exist from fulltext search
...
PHPBB3-13238
2014-11-28 20:13:49 +01:00
1145af71bf
[ticket/12866] Update existing profile fields with the new validation
...
PHPBB3-12866
2014-11-28 20:00:49 +01:00
94d90c084b
Merge branch 'develop-ascraeus' into develop
2014-11-25 23:15:30 +01:00
eb83bd5797
[ticket/13381] Fix header intendation of v312.php
...
PHPBB3-13381
2014-11-25 22:42:52 +01:00
1a0cba1099
Merge branch 'develop-ascraeus' into develop
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
2014-11-25 16:47:22 +01:00
0fbe8e8e69
[prep-release-3.1.2] Add migration to update version to 3.1.2
2014-11-24 21:32:17 +01:00
dcd0f200d6
[prep-release-3.1.2] Add migration for 3.1.2-RC1
2014-11-22 19:27:34 +01:00
3b1c611566
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
2014-11-18 16:29:08 +01:00
acfe6dd37d
Merge pull request #3149 from prototech/ticket/13342
...
[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.
2014-11-18 16:28:59 +01:00
4bfd5e0d9a
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13315] Check for the includes/captcha/plugins/ directory instead.
[ticket/13315] Fix loss of CAPTCHA plugin config value.
2014-11-18 15:11:14 +01:00
7c68964153
[ticket/13315] Check for the includes/captcha/plugins/ directory instead.
...
PHPBB3-13315
2014-11-18 00:37:07 -08:00
7b33018ade
[ticket/13315] Fix loss of CAPTCHA plugin config value.
...
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
2014-11-16 17:01:38 -08:00
fb34cbf7cd
[ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
...
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
2014-11-16 17:01:03 -08:00
a2300eb3aa
[feature/patchwork-utf8] Remove utf8_str_replace
2014-11-08 11:41:55 +01:00
1601b61ef9
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.
2014-11-07 15:21:01 +01:00
778e0e06f3
Merge pull request #3118 from prototech/ticket/13270
...
[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.
2014-11-07 15:19:35 +01:00
b5ddd87c42
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13303] Speed up migration dependency calculation.
2014-11-07 11:40:40 +01:00
