mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 06:36:39 +02:00
Code Issues Releases Wiki Activity
27,409 Commits 18 Branches 192 Tags
9d4f52a5ebf72ec08374e16f56e79437814a72d6
Commit Graph

838 Commits

Author SHA1 Message Date
Marc Alexander
77f447c07c Merge branch '3.1.x' 2015-11-12 08:50:22 +01:00
Marc Alexander
8398e0700a Merge pull request #3910 from kinerity/ticket/14170 
[ticket/14170] Fix mcp_change_poster_after event
 2015-11-12 08:50:18 +01:00
Andreas Fischer
996886de17 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13831] Store provided reason when deleting from Mod. Queue module.
 2015-11-02 21:48:32 +01:00
Andreas Fischer
afbeda7cfd Merge pull request #3983 from prototech/ticket/13831 
[ticket/13831] Store provided reason when deleting from Mod. Queue module.

* prototech/ticket/13831:
  [ticket/13831] Store provided reason when deleting from Mod. Queue module.
 2015-11-02 21:48:32 +01:00
Tristan Darricau
326ba5325b Merge branch '3.1.x' 
* 3.1.x:
  [ticket/9252] Do not try to disapprove a post that was just approved
 2015-10-19 14:37:06 +02:00
Tristan Darricau
dfd5ec6835 Merge pull request #3666 from marc1706/ticket/9252 
[ticket/9252] Do not try to disapprove a post that was just approved

* marc1706/ticket/9252:
  [ticket/9252] Do not try to disapprove a post that was just approved
 2015-10-19 14:36:51 +02:00
Cesar G
f657680311 [ticket/13831] Store provided reason when deleting from Mod. Queue module. 
PHPBB3-13831
 2015-10-14 19:41:44 -07:00
Kailey Truscott
08739751b2 [ticket/14170] Revert mcp_change_poster_after @since change 
Revert the @since change back to 3.1.6-RC1.
Add @changed line 3.1.7-RC1 and description.

PHPBB3-14170
 2015-10-13 21:26:24 -04:00
Marc Alexander
102d737d81 [ticket/14234] Fix event doc blocks 
PHPBB3-14234
 2015-10-12 22:20:52 +02:00
Marc Alexander
578ee077c1 [ticket/14234] Fix change version and remove more references 
PHPBB3-14234
 2015-10-12 19:41:17 +02:00
Marc Alexander
8c3fdfe4e1 Merge branch '3.1.x' 2015-10-11 10:48:53 +02:00
Marc Alexander
f6c8338358 Merge pull request #3864 from Zoddo/ticket/8920 
[ticket/8920] Add a MCP PM reports view permission
 2015-10-11 10:47:44 +02:00
Marc Alexander
b2e7de0379 Merge branch '3.1.x' 2015-10-09 16:45:07 +02:00
Marc Alexander
8683824ed3 Merge pull request #3934 from Zoddo/ticket/14181 
[ticket/14181] Fix empty denial reason if the reason isn't translated
 2015-10-09 16:43:53 +02:00
Marc Alexander
f3ea34b311 Merge branch '3.1.x' 2015-10-07 16:50:43 +02:00
Marc Alexander
e5b2dc922f Merge pull request #3615 from rxu/ticket/13846 
[ticket/13846] Fix softdelete feature workflow in viewtopic
 2015-10-07 16:50:35 +02:00
HB
66397ae0e4 [ticket/14181] Fix empty denial reason if the reason isn't translated 
PHPBB3-14181
 2015-09-27 17:23:49 +02:00
Kailey Truscott
07b55530ec [ticket/14170] Fix mcp_change_poster_after event 
Move the mcp_change_poster_after event to before renewing $post_info. I
changed the "since" version as this would be fixed in 3.1.7-RC1.

PHPBB3-14170
 2015-09-16 22:49:06 -04:00
Marc Alexander
eab8a12fb8 Merge branch '3.1.x' 2015-09-16 22:48:10 +02:00
Marc Alexander
d92a46ef02 Merge pull request #3833 from rxu/ticket/14102 
[ticket/14102] Add core event to the mcp_topic.php
 2015-09-16 22:47:11 +02:00
Zoddo
51600b8f18 [ticket/9485] Add post_id to relevant $phpbb_log->add() 
PHPBB3-9485
 2015-08-30 22:43:07 +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
Tristan Darricau
c3ceafb37d Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14106] Fix topics sorting in MCP for topics merging.
 2015-08-28 16:40:41 +02:00
rxu
ec032733de [ticket/14106] Fix topics sorting in MCP for topics merging. 
The "bug" in the deleted code comment is non-existent now.
The PR is for 3.1 only.

PHPBB3-14106
 2015-08-16 19:55:00 +07:00
rxu
6b0f235cc9 [ticket/14102] Add core event to the mcp_topic.php 
PHPBB3-14102
 2015-08-15 18:38:25 +07:00
Marc Alexander
03c64d3384 Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/mcp/mcp_forum.php
 2015-08-09 10:15:02 +02:00
Marc Alexander
5f4943c183 Merge pull request #3760 from Zoddo/ticket/14014 
[ticket/14014] Add core.mcp_forum_view_before event
 2015-08-09 10:13:24 +02:00
rxu
0d6c323611 [ticket/13846] Fix MCP to disallow softdeleted posts deletion if not permitted. 
PHPBB3-13846
 2015-07-30 19:35:01 +07:00
Oliver Schramm
7d31232846 [ticket/8708] Apply permission 'f_announce_global' 
PHPBB3-8708
 2015-07-19 21:26:47 +02:00
Marc Alexander
39f3313534 Merge branch '3.1.x' 2015-07-17 16:15:25 +02:00
Zoddo
2e10961fff [ticket/14014] Add core.mcp_forum_view_before event 
This event can be used to get some data in order to execute other actions.

PHPBB3-14014
 2015-07-15 15:55:55 +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
Kailey Truscott
cc23ac887c [ticket/13974] Change userdata type from string to array 
Change the docblock for userdata from string to array.

PHPBB3-13974
 2015-06-28 14:31:02 -04:00
Kailey Truscott
607f2e791f [ticket/13974] Add core.mcp_change_poster_after event 
Create a new event to perform additional tasks after chainging a post's
poster.

PHPBB3-13974
 2015-06-28 01:14:08 -04:00
Joas Schilling
03b1b63520 Merge branch '3.1.x' 2015-06-27 11:06:30 +02:00
Joas Schilling
2237030398 Merge pull request #3725 from RMcGirr83/ticket/13962 
[ticket/13962] MCP Queue dropdown for forum selection
 2015-06-27 11:01:47 +02:00
Marc Alexander
9e117a9eeb Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/mcp/mcp_post.php
 2015-06-26 10:25:10 +02:00
Crizzo
ef6af2682b [ticket/13966] Adds the missing phpbb_dispatcher to includes/mcp/mcp_post 
PHPBB3-13966
 2015-06-25 22:22:56 +02:00
RMcGirr83
2ec5c5de17 [ticket/13962] MCP Queue dropdown for forum selection 
PHPBB3-13962
 2015-06-23 13:26:47 -04:00
Marc Alexander
b2ada8ba09 Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/mcp/mcp_main.php
 2015-06-09 15:24:08 +02:00
Marc Alexander
072f4c9260 Merge pull request #3479 from brunoais/ticket/13685 
[ticket/13685] Allow modifying the query for mysql native fulltext search
 2015-06-09 14:27:13 +02:00
brunoais
1e45a05000 [ticket/13685] Add phpbb_dispatcher to fulltext search constructors 
PHPBB3-13685
 2015-06-07 18:40:44 +01:00
Joas Schilling
c28a213b1b Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_post.html
 2015-06-04 17:46:36 +02:00
Joas Schilling
bb7f843344 Merge pull request #3558 from javiexin/ticket/13786 
[ticket/13786] Add events to add MCP post options
 2015-06-04 17:45:21 +02:00
Marc Alexander
e04f9a2425 [ticket/9252] Do not try to disapprove a post that was just approved 
Without this change, posts that are approved by someone right before
another moderator is trying to disapprove a post are actually deleted
instead of disapproved.

PHPBB3-9252
 2015-05-30 12:27:00 +02:00
Joas Schilling
f6d7ea425f Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13672] Removed bogus sting concatenation
  [ticket/13672] BUMP version to 3.1.5-dev
  [ticket/13672] Allow changing the data from the user-submitted report
 2015-05-28 12:59:04 +02:00
Joas Schilling
75dd91412b Merge pull request #3469 from brunoais/ticket/13672 
[ticket/13672] Allow changing the data from the user-submitted report

* brunoais/ticket/13672:
  [ticket/13672] Removed bogus sting concatenation
  [ticket/13672] BUMP version to 3.1.5-dev
  [ticket/13672] Allow changing the data from the user-submitted report
 2015-05-28 12:58:58 +02:00
Joas Schilling
7278356936 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13668] Removed bogus sting concatenation
  [ticket/13668] BUMP version to 3.1.5-dev
  [ticket/13668] Allow changing the query to obtain the user-submitted report.
  [ticket/13668] Convert the mcp report_details query to a built query

Conflicts:
	phpBB/includes/mcp/mcp_reports.php
 2015-05-28 12:56:26 +02:00
Joas Schilling
cf93c6503a Merge pull request #3468 from brunoais/ticket/13668 
[ticket/13668] Allow changing the query to obtain the user-submitted report

* brunoais/ticket/13668:
  [ticket/13668] Removed bogus sting concatenation
  [ticket/13668] BUMP version to 3.1.5-dev
  [ticket/13668] Allow changing the query to obtain the user-submitted report.
  [ticket/13668] Convert the mcp report_details query to a built query
 2015-05-28 12:55:31 +02:00