Joas Schilling
8f5d761112
[prep-release-3.1.5] Add migration for 3.1.5
2015-06-14 16:14:07 +02:00
Joas Schilling
a3883a6f23
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
2015-06-11 21:00:04 +02:00
Joas Schilling
23a45fcace
[prep-release-3.1.5] Add migration for 3.1.5-RC1
2015-06-09 20:32:15 +02:00
Joas Schilling
00c15c76c3
Merge branch '3.1.x'
2015-06-09 20:23:29 +02:00
Joas Schilling
832c9f64e0
Merge pull request #3551 from rxu/ticket/13779
...
[ticket/13779] Set new auth options to the role only if matching the role type
2015-06-09 20:23:08 +02:00
MateBartus
4044b5df89
[ticket/13777] Reorder get_module_infos() method's arguments
...
PHPBB3-13777
2015-05-31 16:03:11 +02:00
MateBartus
77ee0e62ca
[ticket/13777] Use module manager in phpBB core files
...
PHPBB3-13777
2015-05-31 13:22:45 +02:00
Marc Alexander
6337407192
Merge branch '3.1.x'
...
Conflicts:
phpBB/phpbb/db/migration/data/v310/style_update_p1.php
2015-05-22 11:51:25 +02:00
Matt Friedman
67502c0d22
[ticket/13861] Fix undefined variables in style update migration
...
PHPBB3-13861
2015-05-21 15:23:17 -07:00
Joas Schilling
36abb61d39
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
2015-05-03 18:44:34 +02:00
Joas Schilling
429b99922e
[prep-release-3.1.4] Add migration
2015-05-03 17:12:12 +02:00
Andreas Fischer
9074738a10
Merge branch '3.1.x'
...
* 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.
2015-05-03 16:45:10 +02:00
Andreas Fischer
dde72c58b0
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
...
* 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
2015-05-03 16:39:51 +02:00
Joas Schilling
d67fdfa02b
Merge branch '3.1.x'
2015-04-29 17:16:21 +02:00
Joas Schilling
1ad09d9c8b
[prep-release-3.1.4] Increase version number to 3.1.4-RC2
2015-04-29 09:59:40 +02:00
Andreas Fischer
0f707ddb99
Merge branch '3.1.x'
...
* 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.
2015-04-28 21:43:46 +02:00
Andreas Fischer
969718fc91
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
...
* 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
2015-04-28 21:40:23 +02:00
rxu
2308472eb0
[ticket/13779] Set new auth options to the role only if matching the role type
...
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
2015-04-26 11:57:02 +07:00
Joas Schilling
bf107ba1af
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
2015-04-10 10:06:07 +02:00
Joas Schilling
bc04581b80
[prep-release-3.1.4] Add migration for 3.1.4-RC1
2015-04-09 20:28:28 +02:00
Joas Schilling
2962d5d7fd
Merge branch '3.1.x'
2015-04-06 11:36:04 +02:00
Marc Alexander
9eab4ba740
[ticket/12368] Fix comment in docblock
...
PHPBB3-12368
2015-03-26 11:01:22 +01:00
Marc Alexander
b650f45d55
[ticket/12368] Correctly check if avatars migration is installed
...
Try to set the avatar type to string value to check if new avatar
types are supported.
PHPBB3-12368
2015-02-24 11:43:33 +01:00
Gaëtan Muller
79d4ff5538
[ticket/13494] Update calls to set_config()
...
PHPBB3-13494
2015-02-02 19:28:23 +01:00
Joas Schilling
6e2838a4ca
Merge branch 'develop-ascraeus' into develop
...
Conflicts:
build/build.xml
2015-02-01 20:24:32 +01:00
Joas Schilling
7f99e1c857
[prep-release-3.1.3] Add migration for 3.1.3
2015-02-01 19:18:30 +01:00
Joas Schilling
bacb38b161
Merge branch 'develop-ascraeus' into develop
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2015-01-31 12:12:56 +01:00
Joas Schilling
9232367b35
[prep-release-3.1.3] Add migration for 3.1.3-RC2
2015-01-31 01:06:23 +01:00
Joas Schilling
14ab007128
Merge branch 'develop-ascraeus' into develop
2015-01-31 00:43:30 +01:00
Joas Schilling
9628e8df3b
[ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1
...
PHPBB3-13557
2015-01-30 22:57:15 +01:00
Joas Schilling
1b185413bf
Merge branch 'develop-ascraeus' into develop
2015-01-30 17:48:54 +01:00
Joas Schilling
e5f2eee167
Merge pull request #3341 from brunoais/ticket/13544
...
[ticket/13544] Fixing wrong SQL query for permission_unset() for roles
2015-01-30 17:45:21 +01:00
Andreas Fischer
b78ae290e8
Merge branch 'develop-ascraeus' into develop
...
* 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
2015-01-30 13:14:33 +01:00
Gaëtan Muller
7fc586080b
[ticket/13468] Update calls to add_log()
...
PHPBB3-13468
2015-01-27 18:34:33 +01:00
brunoais
4b16add055
[ticket/13544] Use integer case because $role_id is an int
...
PHPBB3-13544
2015-01-26 22:00:20 +00:00
brunoais
73d1bf9fea
[ticket/13544] Fixing wrong SQL query for permission_unset for roles
...
PHPBB3-13544
2015-01-26 19:21:22 +00:00
Joas Schilling
32b25d7b11
[prep-release-3.1.3] Add migration for 3.1.3-RC1
2015-01-26 19:43:36 +01:00
Andreas Fischer
768d0a0641
Merge branch 'develop-ascraeus' into develop
...
* 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.
2015-01-21 16:07:22 +01:00
Andreas Fischer
7ed065a630
Merge branch 'develop-olympus' into develop-ascraeus
...
* 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
2015-01-21 16:07:12 +01:00
Tristan Darricau
fd25d00fac
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13530] Fix undefined variables
2015-01-20 23:44:17 +01:00
Joas Schilling
ed6b8f84ad
[ticket/13530] Fix undefined variables
...
PHPBB3-13530
2015-01-20 23:36:45 +01:00
Joas Schilling
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
Joas Schilling
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
Joas Schilling
2dcce57806
Merge branch 'develop-ascraeus' into develop
2015-01-20 17:31:24 +01:00
Tristan Darricau
dab0728357
[ticket/13489] Fix service configuration
...
PHPBB3-13489
2015-01-20 14:19:55 +01:00
rxu
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
Tristan Darricau
ce47170c29
[ticket/13489] Update migrations
...
PHPBB3-13489
2015-01-14 12:16:24 +01:00
Gaëtan Muller
b5544b2f47
[ticket/13450] Type-hint return value of $phpbb_container->get()
...
PHPBB3-13450
2015-01-12 20:19:07 +01:00
Marc Alexander
b4a2beff24
Merge branch 'develop-ascraeus' into develop
2015-01-10 16:25:44 +01:00
Joas Schilling
f756632185
[ticket/13486] Fix typo in method name
...
PHPBB3-13486
2015-01-10 15:14:58 +01:00
