1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 06:36:39 +02:00
Commit Graph

546 Commits

Author SHA1 Message Date
92b23df864 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
2015-08-10 13:20:04 +02:00
32f5dc3d8b [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
Changed the sql_fetchfield() call to comply to the function definition.

PHPBB3-14069
2015-08-05 19:07:02 +02:00
cbe74844b0 Merge pull request #3698 from s9e/ticket/13935
[ticket/13935] Allow more admin-configurable schemes in post links

* s9e/ticket/13935:
  [ticket/13935] Removed cache invalidation from acp_board
  [ticket/13935] Removed UI
  [ticket/13935] Allow more admin-configurable schemes in post links
2015-08-05 12:59:55 +02:00
df56b2ed36 [ticket/8708] Add f_announce_global permission
PHPBB3-8708
2015-07-19 21:26:47 +02:00
da7fc9e5da [ticket/13935] Allow more admin-configurable schemes in post links
PHPBB3-13935
2015-07-15 22:05:06 +02:00
be0d4e20d4 [ticket/11444] Moving the in-board notifications to a method class
Currently the in-board method for the notifications is hardcoded and
cannot be disabled. This method should be in his own class extending
`phpbb\notification\method\method_interface`.

It also add the possibility, for each method, to be enabled by default (ie:
no entry in the DB => notification enabled).

https://tracker.phpbb.com/browse/PHPBB3-11444
https://tracker.phpbb.com/browse/PHPBB3-11967

PHPBB3-11444
2015-07-13 22:41:13 +02:00
2a662c5e07 Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/phpbb/user.php
2015-06-14 17:40:18 +02:00
8f5d761112 [prep-release-3.1.5] Add migration for 3.1.5 2015-06-14 16:14:07 +02:00
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
1f4976f590 Merge pull request #3696 from marc1706/ticket/13930-master
[ticket/13930] Check for correct spacing between keyword & parenthesis

* marc1706/ticket/13930-master:
  [ticket/13930] Add missing space to mssql_extractor
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset
  [ticket/13930] Remove not needed return statements
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Check for correct spacing between keyword & parenthesis
2015-06-09 21:27:23 +02:00
23a45fcace [prep-release-3.1.5] Add migration for 3.1.5-RC1 2015-06-09 20:32:15 +02:00
00c15c76c3 Merge branch '3.1.x' 2015-06-09 20:23:29 +02:00
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
1fae4152ef [ticket/13930] Add missing space to mssql_extractor
PHPBB3-13930
2015-06-08 15:55:03 +02:00
4044b5df89 [ticket/13777] Reorder get_module_infos() method's arguments
PHPBB3-13777
2015-05-31 16:03:11 +02:00
77ee0e62ca [ticket/13777] Use module manager in phpBB core files
PHPBB3-13777
2015-05-31 13:22:45 +02:00
f958d05aed Merge branch '3.1.x'
* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
2015-05-30 10:58:40 +02:00
01073ffcbf Merge pull request #3560 from Nicofuma/ticket/13790
[ticket/13790] Update phpcs
2015-05-30 10:53:47 +02:00
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
67502c0d22 [ticket/13861] Fix undefined variables in style update migration
PHPBB3-13861
2015-05-21 15:23:17 -07:00
a462f14aa3 [ticket/13790] Update phpcs
PHPBB3-13790
2015-05-19 22:19:18 +02:00
636524fa56 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13819] Add missing sql_freeresult() to files in includes/

Conflicts:
	phpBB/includes/acp/acp_database.php
2015-05-06 01:06:21 +02:00
36abb61d39 Merge branch '3.1.x'
Conflicts:
	build/build.xml
2015-05-03 18:44:34 +02:00
429b99922e [prep-release-3.1.4] Add migration 2015-05-03 17:12:12 +02:00
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
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
d67fdfa02b Merge branch '3.1.x' 2015-04-29 17:16:21 +02:00
1ad09d9c8b [prep-release-3.1.4] Increase version number to 3.1.4-RC2 2015-04-29 09:59:40 +02:00
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
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
f077b72d0d Merge pull request #3487 from MateBartus/ticket/13697
[ticket/13697] Moving filesystem related functions to filesystem service
2015-04-16 20:44:02 +02:00
4bdef6fd21 [ticket/13697] Moving filesystem related functions to filesystem service
* Moving filesystem service to \phpbb\filesystem namespace
 * Wraping Symfony's Filesystem component
 * Moving filesystem related functions from includes/functions.php
   into \phpbb\filesystem\filesystem
   Functions moved (and deprecated):
     - phpbb_chmod
     - phpbb_is_writable
     - phpbb_is_absolute
     - phpbb_own_realpath
     - phpbb_realpath
 * Adding interface for filesystem service

PHPBB3-13697
2015-04-16 13:24:10 +02:00
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
bc04581b80 [prep-release-3.1.4] Add migration for 3.1.4-RC1 2015-04-09 20:28:28 +02:00
2962d5d7fd Merge branch '3.1.x' 2015-04-06 11:36:04 +02:00
30cf75a011 Merge pull request #3430 from MateBartus/ticket/12466
[ticket/12466] Move classes from acp_database.php to their own files
2015-04-05 20:13:38 +02:00
dbb538afbd [ticket/13725] Coding guidelines: static public
PHPBB3-13725
2015-03-27 00:02:20 -07:00
9eab4ba740 [ticket/12368] Fix comment in docblock
PHPBB3-12368
2015-03-26 11:01:22 +01:00
193c5b86b4 [ticket/12466] Move classes from acp_database.php to their own files
* Moving classes from acp_database.php to phpbb/db/extractor namespace,
   also into separate files
 * Adding DocBlocks and property visibility to classes
 * Removing globals from code
 * Passing former globals to base_extractor's constructor
 * Adding DB extractor as a service, also implementing the extractor interface
   as well as the extractor factory.

PHPBB3-12466
2015-02-27 16:18:50 +01:00
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
978b96cbf5 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13570] Remove unnecessary ternary condition from mysqli driver
2015-02-17 22:24:15 +01:00
f23d2ec42f [ticket/13570] Remove unnecessary ternary condition from mysqli driver
PHPBB3-13570
2015-02-16 20:25:11 +01:00
ec1fb0423d [ticket/10748] Split postgres DB tools into it's own class
PHPBB3-10748
2015-02-13 22:49:29 +01:00
74d1b1812f [ticket/10748] Overwrite the type map correctly
PHPBB3-10748
2015-02-07 14:41:40 +01:00
4ea90ca44d [ticket/10748] Split MS SQL from the db tools file into it's own
PHPBB3-10748
2015-02-07 14:36:26 +01:00
79d4ff5538 [ticket/13494] Update calls to set_config()
PHPBB3-13494
2015-02-02 19:28:23 +01:00
6e2838a4ca Merge branch 'develop-ascraeus' into develop
Conflicts:
	build/build.xml
2015-02-01 20:24:32 +01:00
7f99e1c857 [prep-release-3.1.3] Add migration for 3.1.3 2015-02-01 19:18:30 +01:00
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