aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-7/+21
|\
| * Merge pull request #4472 from dsinn/ticket/14804Marc Alexander2016-11-121-7/+21
| |\ | | | | | | | | | [ticket/14804] Add core event to MCP after merging topics
| | * [ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804Daniel Sinn2016-10-031-0/+8
| | |\ | | | | | | | | | | | | PHPBB3-14804
| | * | [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1Daniel Sinn2016-09-301-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14804
| | * | [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @sinceDaniel Sinn2016-09-301-3/+3
| | | | | | | | | | | | | | | | PHPBB3-14804
| | * | [ticket/14804] Add core event to MCP after merging topicsDaniel Sinn2016-09-301-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed $topic_data and defined $to_topic_data in order to avoid ambiguity and to stop overwriting a variable. PHPBB3-14804
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-11-061-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/14795] Use maximum topic views instead of adding up views in merge
| * | | [ticket/14795] Use maximum topic views instead of adding up views in mergeMarc Alexander2016-10-161-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | Merging topics should not result in topic views being added up but rather in the highest topic view showing up for the merged topic. PHPBB3-14795
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-011-0/+8
|\ \ \ | |/ /
| * | [ticket/14795] Merge topic views when merging topicsJakub Senko2016-09-251-0/+8
| |/ | | | | | | PHPBB3-14795
* | [ticket/10961] Send HTTP 403 when applicableJakub Senko2016-09-013-0/+7
| | | | | | | | PHPBB3-10961
* | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-08-311-1/+1
|\ \ | |/ | | | | | | * 3.1.x: [ticket/14673] Changes wrong language variable in mcp_forum
| * [ticket/14673] Changes wrong language variable in mcp_forumCrizzo2016-08-221-1/+1
| | | | | | | | PHPBB3-14673
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-211-8/+10
|\ \ | |/
| * [ticket/12925] Pluralize permanent delete checkbox labelJakub Senko2016-08-151-8/+10
| | | | | | | | PHPBB3-12925
* | [ticket/14709] add post_id to mod logWesley Fok2016-07-131-0/+1
| | | | | | | | | | | | | | Add the missing post_id value to the moderator log entry created upon deleting one or more posts in the MCP topic view. PHPBB3-14709
* | [ticket/14680] Fix wrong function name being checked in mcp_queue.Mark Shaw2016-06-171-1/+1
| | | | | | | | PHPBB3-14680
* | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-261-4/+20
|\ \ | |/ | | | | | | | | | | * 3.1.x: [ticket/14134] Fix Okay in a comment. [ticket/14134] Fix code comments. [ticket/14134] Send warning notification PM in user's language.
| * Merge pull request #3874 from lavigor/ticket/14134Tristan Darricau2016-03-261-4/+20
| |\ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14134] Send warning notification PM in user's language. * lavigor/ticket/14134: [ticket/14134] Fix Okay in a comment. [ticket/14134] Fix code comments. [ticket/14134] Send warning notification PM in user's language.
| | * [ticket/14134] Fix Okay in a comment.lavigor2016-03-251-1/+0
| | | | | | | | | | | | PHPBB3-14134
| | * [ticket/14134] Fix code comments.lavigor2016-02-271-3/+2
| | | | | | | | | | | | PHPBB3-14134
| | * [ticket/14134] Send warning notification PM in user's language.lavigor2015-09-021-4/+22
| | | | | | | | | | | | PHPBB3-14134
* | | Merge branch '3.1.x'Marc Alexander2016-01-162-8/+8
|\ \ \ | |/ /
| * | [ticket/14412] Comment fixes for PHPDoc in the eventslavigor2016-01-152-8/+8
| | | | | | | | | | | | PHPBB3-14412
* | | [ticket/13454] Remove more unused variablesMarc Alexander2016-01-061-2/+0
| | | | | | | | | | | | | | | | | | This should be the last part. Off to checking if the changes were correct. PHPBB3-13454
* | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-065-11/+8
| | | | | | | | | | | | | | | | | | This is part 5 and there is more to come. PHPBB3-13454
* | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-065-7/+7
| | | | | | | | | | | | | | | | | | Part 4 PHPBB3-13454
* | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-062-2/+1
| | | | | | | | | | | | | | | | | | Part 3 should fix tests up a little bit again. PHPBB3-13454
* | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-066-24/+10
| | | | | | | | | | | | | | | | | | This is part 2 of the pr. PHPBB3-13454
* | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-069-19/+13
| | | | | | | | | | | | | | | | | | This is the first part of the changes. More to come. PHPBB3-13454
* | | Merge branch '3.1.x'Marc Alexander2016-01-061-1/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/includes/mcp/mcp_main.php
| * | [ticket/14343] Added missing $phpbb_dispatcherkasimi2016-01-061-1/+1
| | | | | | | | | | | | PHPBB3-14343
* | | Merge branch '3.1.x'Tristan Darricau2015-12-071-0/+16
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/14343] Add event when locking/unlocking posts/topics
| * | [ticket/14343] Add event when locking/unlocking posts/topicskasimi2015-12-061-0/+16
| | | | | | | | | | | | PHPBB3-14343
* | | [ticket/14325] Preserve event variable BCMate Bartus2015-11-301-49/+48
| | | | | | | | | | | | PHPBB3-14325
* | | Merge branch '3.1.x'Marc Alexander2015-11-121-10/+11
|\ \ \ | |/ /
| * | Merge pull request #3910 from kinerity/ticket/14170Marc Alexander2015-11-121-10/+11
| |\ \ | | | | | | | | | | | | [ticket/14170] Fix mcp_change_poster_after event
| | * | [ticket/14170] Revert mcp_change_poster_after @since changeKailey Truscott2015-10-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the @since change back to 3.1.6-RC1. Add @changed line 3.1.7-RC1 and description. PHPBB3-14170
| | * | [ticket/14170] Fix mcp_change_poster_after eventKailey Truscott2015-09-161-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | 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