aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Andreas Fischer2015-11-021-2/+3
|\ | | | | | | | | * 3.1.x: [ticket/13831] Store provided reason when deleting from Mod. Queue module.
| * Merge pull request #3983 from prototech/ticket/13831Andreas Fischer2015-11-021-2/+3
| |\ | | | | | | | | | | | | | | | | | | [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.
| | * [ticket/13831] Store provided reason when deleting from Mod. Queue module.Cesar G2015-10-141-2/+3
| | | | | | | | | | | | PHPBB3-13831
* | | Merge branch '3.1.x'Tristan Darricau2015-10-191-0/+11
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/9252] Do not try to disapprove a post that was just approved
| * | Merge pull request #3666 from marc1706/ticket/9252Tristan Darricau2015-10-191-0/+11
| |\ \ | | |/ | |/| | | | | | | | | | | | | [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
| | * [ticket/9252] Do not try to disapprove a post that was just approvedMarc Alexander2015-05-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | [ticket/14234] Fix event doc blocksMarc Alexander2015-10-121-1/+1
| | | | | | | | | | | | PHPBB3-14234
* | | [ticket/14234] Fix change version and remove more referencesMarc Alexander2015-10-121-1/+5
| | | | | | | | | | | | PHPBB3-14234
* | | Merge branch '3.1.x'Marc Alexander2015-10-112-4/+4
|\ \ \ | |/ /
| * | Merge pull request #3864 from Zoddo/ticket/8920Marc Alexander2015-10-112-4/+4
| |\ \ | | | | | | | | | | | | [ticket/8920] Add a MCP PM reports view permission
| | * | [ticket/8920] Add a MCP PM reports view permissionZoddo2015-08-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch '3.1.x'Marc Alexander2015-10-091-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #3934 from Zoddo/ticket/14181Marc Alexander2015-10-091-1/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14181] Fix empty denial reason if the reason isn't translated
| | * | | [ticket/14181] Fix empty denial reason if the reason isn't translatedHB2015-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14181
* | | | | Merge branch '3.1.x'Marc Alexander2015-10-071-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3615 from rxu/ticket/13846Marc Alexander2015-10-071-0/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/13846] Fix softdelete feature workflow in viewtopic
| | * | | [ticket/13846] Fix MCP to disallow softdeleted posts deletion if not permitted.rxu2015-07-301-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13846
* | | | | Merge branch '3.1.x'Marc Alexander2015-09-161-0/+24
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3833 from rxu/ticket/14102Marc Alexander2015-09-161-0/+24
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | [ticket/14102] Add core event to the mcp_topic.php
| | * | | [ticket/14102] Add core event to the mcp_topic.phprxu2015-08-151-0/+24
| | | | | | | | | | | | | | | | | | | | PHPBB3-14102
* | | | | [ticket/9485] Add post_id to relevant $phpbb_log->add()Zoddo2015-08-305-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-9485
* | | | | [ticket/9485] Add a "View post" link in the moderation logsZoddo2015-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9485
* | | | | Merge branch '3.1.x'Tristan Darricau2015-08-281-9/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14106] Fix topics sorting in MCP for topics merging.
| * | | | [ticket/14106] Fix topics sorting in MCP for topics merging.rxu2015-08-161-9/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The "bug" in the deleted code comment is non-existent now. The PR is for 3.1 only. PHPBB3-14106
* | | | Merge branch '3.1.x'Marc Alexander2015-08-091-0/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/includes/mcp/mcp_forum.php
| * | | Merge pull request #3760 from Zoddo/ticket/14014Marc Alexander2015-08-091-0/+24
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14014] Add core.mcp_forum_view_before event
| | * | | [ticket/14014] Add core.mcp_forum_view_before eventZoddo2015-07-151-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This event can be used to get some data in order to execute other actions. PHPBB3-14014
* | | | | [ticket/8708] Apply permission 'f_announce_global'Oliver Schramm2015-07-192-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-8708
* | | | | Merge branch '3.1.x'Marc Alexander2015-07-171-0/+11
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13974] Change userdata type from string to arrayKailey Truscott2015-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the docblock for userdata from string to array. PHPBB3-13974
| * | | | [ticket/13974] Add core.mcp_change_poster_after eventKailey Truscott2015-06-281-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new event to perform additional tasks after chainging a post's poster. PHPBB3-13974
* | | | | [ticket/11444] Moving the in-board notifications to a method classNicofuma2015-07-133-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch '3.1.x'Joas Schilling2015-06-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3725 from RMcGirr83/ticket/13962Joas Schilling2015-06-271-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/13962] MCP Queue dropdown for forum selection
| | * | | [ticket/13962] MCP Queue dropdown for forum selectionRMcGirr832015-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13962
* | | | | Merge branch '3.1.x'Marc Alexander2015-06-261-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/includes/mcp/mcp_post.php
| * | | | [ticket/13966] Adds the missing phpbb_dispatcher to includes/mcp/mcp_postCrizzo2015-06-251-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-13966
* | | | Merge branch '3.1.x'Marc Alexander2015-06-092-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/includes/mcp/mcp_main.php
| * | | Merge pull request #3479 from brunoais/ticket/13685Marc Alexander2015-06-092-3/+3
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13685] Allow modifying the query for mysql native fulltext search
| | * | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-06-072-3/+3
| | | |/ | | |/| | | | | | | | | PHPBB3-13685
* | | | Merge branch '3.1.x'Joas Schilling2015-06-041-2/+43
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_post.html
| * | | Merge pull request #3558 from javiexin/ticket/13786Joas Schilling2015-06-041-2/+43
| |\ \ \ | | |/ / | |/| | | | | | [ticket/13786] Add events to add MCP post options
| | * | [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three new events are included: 1) Core event to perform new moderator action in includes/mcp/mcp_post.php 2) Core event to add/modify template data in includes/mcp/mcp_post.php 3) Template event to present new options in template/mcp_post.html Fix another typo. PHPBB3-13786
| | * | [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three new events are included: 1) Core event to perform new moderator action in includes/mcp/mcp_post.php 2) Core event to add/modify template data in includes/mcp/mcp_post.php 3) Template event to present new options in template/mcp_post.html Fix typo. PHPBB3-13786
| | * | [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three new events are included: 1) Core event to perform new moderator action in includes/mcp/mcp_post.php 2) Core event to add/modify template data in includes/mcp/mcp_post.php 3) Template event to present new options in template/mcp_post.html PHPBB3-13786
* | | | Merge branch '3.1.x'Joas Schilling2015-05-281-0/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * 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
| * | | Merge pull request #3469 from brunoais/ticket/13672Joas Schilling2015-05-281-0/+20
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
| | * | | [ticket/13672] Removed bogus sting concatenationbrunoais2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13672
| | * | | [ticket/13672] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13672
| | * | | [ticket/13672] Allow changing the data from the user-submitted reportbrunoais2015-03-051-0/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-13672