mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 18:41:52 +02:00
Code Issues Releases Wiki Activity
29,988 Commits 18 Branches 192 Tags
85ece822db5c73b17a29764d334b910bbd1dfa24
Commit Graph

791 Commits

Author SHA1 Message Date
MateBartus
77ee0e62ca [ticket/13777] Use module manager in phpBB core files 
PHPBB3-13777
 2015-05-31 13:22:45 +02:00
Nils Adermann
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
Nils Adermann
01073ffcbf Merge pull request #3560 from Nicofuma/ticket/13790 
[ticket/13790] Update phpcs
 2015-05-30 10:53:47 +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
Tristan Darricau
a462f14aa3 [ticket/13790] Update phpcs 
PHPBB3-13790
 2015-05-19 22:19:18 +02:00
Andreas Fischer
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
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
Tristan Darricau
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
MateBartus
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
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
Tristan Darricau
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
Matt Friedman
dbb538afbd [ticket/13725] Coding guidelines: static public 
PHPBB3-13725
 2015-03-27 00:02:20 -07:00
Marc Alexander
9eab4ba740 [ticket/12368] Fix comment in docblock 
PHPBB3-12368
 2015-03-26 11:01:22 +01:00
brunoais
576eaa0cff [feature/sql-bool-builder] Adding the IS operator to predicted operators 
PHPBB3-13652
 2015-03-17 20:31:26 +00:00
brunoais
298d86009e [feature/sql-bool-builder] Added LIKE and NOT_LIKE to the comparations 
PHPBB3-13652
 2015-03-16 11:14:33 +00:00
brunoais
5d70f612be [feature/sql-bool-builder] Explain better the code in the first 
Explain what that if and check is for in the first method that is called.

PHPBB3-13652
 2015-03-16 11:14:32 +00:00
brunoais
51737be616 [feature/sql-bool-builder] Also use parenthesis for the NOT operator 
Be on the safe side, also use parenthesis for the NOT operator

PHPBB3-13652
 2015-03-16 11:14:32 +00:00
brunoais
5c1850e10e [feature/sql-bool-builder] AS keyword must be lowercase; 
AS keyword must be lowercase; expected "as" but found "AS"

PHPBB3-13652
 2015-03-16 11:14:31 +00:00
brunoais
46de946904 [feature/sql-bool-builder] Added code to use this feature for the WHERE clause 
PHPBB3-13652
 2015-03-16 11:14:25 +00:00
brunoais
b54adaaabe [feature/sql-bool-builder] Removed non-necessary spaces 
PHPBB3-13652
 2015-03-16 11:13:50 +00:00
brunoais
5c77e43819 [feature/sql-bool-builder] First working version 
PHPBB3-13652
 2015-03-16 11:13:49 +00:00
MateBartus
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
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
Andreas Fischer
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
Jakub Senko
f23d2ec42f [ticket/13570] Remove unnecessary ternary condition from mysqli driver 
PHPBB3-13570
 2015-02-16 20:25:11 +01:00
Joas Schilling
ec1fb0423d [ticket/10748] Split postgres DB tools into it's own class 
PHPBB3-10748
 2015-02-13 22:49:29 +01:00
Joas Schilling
74d1b1812f [ticket/10748] Overwrite the type map correctly 
PHPBB3-10748
 2015-02-07 14:41:40 +01:00
Joas Schilling
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
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