Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-01-04 | 1 | -1/+1 |
|\ | |||||
| * | [ticket/14549] Correcting $redirect var to avoid the bug | hubaishan | 2016-12-29 | 1 | -1/+1 |
| | | | | | | | | | | | | by this correct $redirect will go to clean mcp page after merge PHPBB3-14549 | ||||
* | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-12-11 | 1 | -1/+13 |
|\ \ | |/ | |||||
| * | Merge pull request #4514 from senky/ticket/14759 | Marc Alexander | 2016-12-11 | 1 | -1/+13 |
| |\ | | | | | | | | | | [ticket/14759] Add core.mcp_main_modify_shadow_sql event | ||||
| | * | [ticket/14759] Add core.mcp_main_modify_shadow_sql event | Jakub Senko | 2016-11-13 | 1 | -1/+13 |
| | | | | | | | | | | | | PHPBB3-14759 | ||||
* | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-12-10 | 1 | -0/+12 |
|\ \ \ | |/ / | |||||
| * | | [ticket/14760] Add core.mcp_main_modify_fork_sql event | Jakub Senko | 2016-11-13 | 1 | -0/+12 |
| |/ | | | | | | | PHPBB3-14760 | ||||
* | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-11-12 | 1 | -7/+21 |
|\ \ | |/ | |||||
| * | Merge pull request #4472 from dsinn/ticket/14804 | Marc Alexander | 2016-11-12 | 1 | -7/+21 |
| |\ | | | | | | | | | | [ticket/14804] Add core event to MCP after merging topics | ||||
| | * | [ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804 | Daniel Sinn | 2016-10-03 | 1 | -0/+8 |
| | |\ | | | | | | | | | | | | | PHPBB3-14804 | ||||
| | * | | [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1 | Daniel Sinn | 2016-09-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-14804 | ||||
| | * | | [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @since | Daniel Sinn | 2016-09-30 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | PHPBB3-14804 | ||||
| | * | | [ticket/14804] Add core event to MCP after merging topics | Daniel Sinn | 2016-09-30 | 1 | -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.x | Tristan Darricau | 2016-11-06 | 1 | -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 merge | Marc Alexander | 2016-10-16 | 1 | -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.x | Marc Alexander | 2016-10-01 | 1 | -0/+8 |
|\ \ \ | |/ / | |||||
| * | | [ticket/14795] Merge topic views when merging topics | Jakub Senko | 2016-09-25 | 1 | -0/+8 |
| |/ | | | | | | | PHPBB3-14795 | ||||
* | | [ticket/10961] Send HTTP 403 when applicable | Jakub Senko | 2016-09-01 | 3 | -0/+7 |
| | | | | | | | | PHPBB3-10961 | ||||
* | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-08-31 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | * 3.1.x: [ticket/14673] Changes wrong language variable in mcp_forum | ||||
| * | [ticket/14673] Changes wrong language variable in mcp_forum | Crizzo | 2016-08-22 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-14673 | ||||
* | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-08-21 | 1 | -8/+10 |
|\ \ | |/ | |||||
| * | [ticket/12925] Pluralize permanent delete checkbox label | Jakub Senko | 2016-08-15 | 1 | -8/+10 |
| | | | | | | | | PHPBB3-12925 | ||||
* | | [ticket/14709] add post_id to mod log | Wesley Fok | 2016-07-13 | 1 | -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 Shaw | 2016-06-17 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-14680 | ||||
* | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-03-26 | 1 | -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/14134 | Tristan Darricau | 2016-03-26 | 1 | -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. | lavigor | 2016-03-25 | 1 | -1/+0 |
| | | | | | | | | | | | | PHPBB3-14134 | ||||
| | * | [ticket/14134] Fix code comments. | lavigor | 2016-02-27 | 1 | -3/+2 |
| | | | | | | | | | | | | PHPBB3-14134 | ||||
| | * | [ticket/14134] Send warning notification PM in user's language. | lavigor | 2015-09-02 | 1 | -4/+22 |
| | | | | | | | | | | | | PHPBB3-14134 | ||||
* | | | Merge branch '3.1.x' | Marc Alexander | 2016-01-16 | 2 | -8/+8 |
|\ \ \ | |/ / | |||||
| * | | [ticket/14412] Comment fixes for PHPDoc in the events | lavigor | 2016-01-15 | 2 | -8/+8 |
| | | | | | | | | | | | | PHPBB3-14412 | ||||
* | | | [ticket/13454] Remove more unused variables | Marc Alexander | 2016-01-06 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | This should be the last part. Off to checking if the changes were correct. PHPBB3-13454 | ||||
* | | | [ticket/13454] Remove unused variables | Marc Alexander | 2016-01-06 | 5 | -11/+8 |
| | | | | | | | | | | | | | | | | | | This is part 5 and there is more to come. PHPBB3-13454 | ||||
* | | | [ticket/13454] Remove unused variables | Marc Alexander | 2016-01-06 | 5 | -7/+7 |
| | | | | | | | | | | | | | | | | | | Part 4 PHPBB3-13454 | ||||
* | | | [ticket/13454] Remove unused variables | Marc Alexander | 2016-01-06 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | | | Part 3 should fix tests up a little bit again. PHPBB3-13454 | ||||
* | | | [ticket/13454] Remove unused variables | Marc Alexander | 2016-01-06 | 6 | -24/+10 |
| | | | | | | | | | | | | | | | | | | This is part 2 of the pr. PHPBB3-13454 | ||||
* | | | [ticket/13454] Remove unused variables | Marc Alexander | 2016-01-06 | 9 | -19/+13 |
| | | | | | | | | | | | | | | | | | | This is the first part of the changes. More to come. PHPBB3-13454 | ||||
* | | | Merge branch '3.1.x' | Marc Alexander | 2016-01-06 | 1 | -1/+1 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: phpBB/includes/mcp/mcp_main.php | ||||
| * | | [ticket/14343] Added missing $phpbb_dispatcher | kasimi | 2016-01-06 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-14343 | ||||
* | | | Merge branch '3.1.x' | Tristan Darricau | 2015-12-07 | 1 | -0/+16 |
|\ \ \ | |/ / | | | | | | | | | | * 3.1.x: [ticket/14343] Add event when locking/unlocking posts/topics | ||||
| * | | [ticket/14343] Add event when locking/unlocking posts/topics | kasimi | 2015-12-06 | 1 | -0/+16 |
| | | | | | | | | | | | | PHPBB3-14343 | ||||
* | | | [ticket/14325] Preserve event variable BC | Mate Bartus | 2015-11-30 | 1 | -49/+48 |
| | | | | | | | | | | | | PHPBB3-14325 | ||||
* | | | Merge branch '3.1.x' | Marc Alexander | 2015-11-12 | 1 | -10/+11 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #3910 from kinerity/ticket/14170 | Marc Alexander | 2015-11-12 | 1 | -10/+11 |
| |\ \ | | | | | | | | | | | | | [ticket/14170] Fix mcp_change_poster_after event | ||||
| | * | | [ticket/14170] Revert mcp_change_poster_after @since change | Kailey Truscott | 2015-10-13 | 1 | -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 event | Kailey Truscott | 2015-09-16 | 1 | -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 Fischer | 2015-11-02 | 1 | -2/+3 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | * 3.1.x: [ticket/13831] Store provided reason when deleting from Mod. Queue module. | ||||
| * | | | Merge pull request #3983 from prototech/ticket/13831 | Andreas Fischer | 2015-11-02 | 1 | -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 G | 2015-10-14 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13831 | ||||
* | | | | | Merge branch '3.1.x' | Tristan Darricau | 2015-10-19 | 1 | -0/+11 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/9252] Do not try to disapprove a post that was just approved |