mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-22 23:40:12 +02:00
Code Issues Releases Wiki Activity
31,692 Commits 18 Branches 192 Tags
Commit Graph

921 Commits

Author SHA1 Message Date
Tristan Darricau
542d75b3a9 Merge pull request #3870 from Zoddo/ticket/9485 
[ticket/9485] Add a "View post" link in the moderation logs

* Zoddo/ticket/9485:
  [ticket/9485] Fix tests
  [ticket/9485] Add post_id to relevant $phpbb_log->add()
  [ticket/9485] Add a "View post" link in the moderation logs
 2015-09-09 11:04:13 +02:00
Tristan Darricau
23205ca0cc Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13423] Set busyTimeout on connect to prevent db locking
 2015-09-09 11:01:03 +02:00
Marc Alexander
ea594d00f7 [ticket/13423] Set busyTimeout on connect to prevent db locking 
PHPBB3-13423
 2015-09-07 12:23:49 +02:00
Joas Schilling
fb3e9d9a77 Merge branch '3.1.x' 
Conflicts:
	build/build.xml
 2015-09-05 15:20:38 +02:00
Joas Schilling
5258fba2e0 [prep-release-3.1.6] Add migration for 3.1.6 2015-09-05 12:45:53 +02:00
Zoddo
306fbf23a8 [ticket/9485] Add a "View post" link in the moderation logs 
PHPBB3-9485
 2015-08-30 19:52:00 +02:00
Zoddo
e9e199bc37 [ticket/8920] Add a MCP PM reports view permission 
Anybody who has the permission to read reports in one forum
can read PM reports.

Solving this problem by adding a new permission to read PM reports.

PHPBB3-8920
 2015-08-30 12:18:37 +02:00
n-aleha
afccb9cb49 [ticket/12505] Fix variable usage in migration file 
PHPBB3-12505
 2015-08-24 00:40:38 +03:00
n-aleha
1f16704d34 [ticket/12505] Add migration 
PHPBB3-12505
 2015-08-24 00:40:38 +03:00
Joas Schilling
05851e2b4b 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-08-23 18:27:30 +02:00
Joas Schilling
623a8f2d0f [prep-release-3.1.6] Add migration for 3.1.6-RC1 2015-08-23 16:54:43 +02:00
Andreas Fischer
0a5f7d2e51 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14116] sql_affectedrows method has no arguments
 2015-08-20 03:52:34 +02:00
Matt Friedman
50a7167c9a [ticket/14116] sql_affectedrows method has no arguments 
PHPBB3-14116
 2015-08-19 16:12:01 -07:00
Andreas Fischer
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
Marco Kubuntu
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
Tristan Darricau
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
Oliver Schramm
df56b2ed36 [ticket/8708] Add f_announce_global permission 
PHPBB3-8708
 2015-07-19 21:26:47 +02:00
JoshyPHP
da7fc9e5da [ticket/13935] Allow more admin-configurable schemes in post links 
PHPBB3-13935
 2015-07-15 22:05:06 +02:00
Nicofuma
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
Joas Schilling
2a662c5e07 Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/phpbb/user.php
 2015-06-14 17:40:18 +02:00
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
Andreas Fischer
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
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
Marc Alexander
1fae4152ef [ticket/13930] Add missing space to mssql_extractor 
PHPBB3-13930
 2015-06-08 15:55:03 +02:00
javiexin
56f47c1344 [ticket/13908] "After" clause in migration not working 
In a migration file, if you try to add a column to a table and specify
the order, by specifying an "after" clause, it is not used at all, even
for databases that support it (like mysql).
This fixes the issue, for mysql databases. Typo fixed.

PHPBB3-13908
 2015-06-02 09:00:05 +02:00
javiexin
86945bdf84 [ticket/13908] "After" clause in migration not working 
In a migration file, if you try to add a column to a table and specify
the order, by specifying an "after" clause, it is not used at all, even
for databases that support it (like mysql).
This fixes the issue, for mysql databases.

PHPBB3-13908
 2015-06-01 19:50:32 +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
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