cfa2bc534b
Merge branch '3.1.x' into 3.2.x
2017-01-04 21:50:25 +01:00
40bc4ac484
[ticket/14549] Correcting $redirect var to avoid the bug
...
by this correct $redirect will go to clean mcp page after merge
PHPBB3-14549
2016-12-29 13:11:19 +03:00
dbd003a0d1
Merge branch '3.1.x' into 3.2.x
2016-12-11 15:59:08 +01:00
96adf7f0d6
Merge pull request #4514 from senky/ticket/14759
...
[ticket/14759] Add core.mcp_main_modify_shadow_sql event
2016-12-11 15:58:12 +01:00
f7049bd0dc
Merge branch '3.1.x' into 3.2.x
2016-12-10 13:37:56 +01:00
114cfe2c27
[ticket/14760] Add core.mcp_main_modify_fork_sql event
...
PHPBB3-14760
2016-11-13 18:15:07 +01:00
36d4169768
[ticket/14759] Add core.mcp_main_modify_shadow_sql event
...
PHPBB3-14759
2016-11-13 17:48:53 +01:00
78db28286e
Merge branch '3.1.x' into 3.2.x
2016-11-12 13:54:59 +01:00
577d669ba7
Merge pull request #4472 from dsinn/ticket/14804
...
[ticket/14804] Add core event to MCP after merging topics
2016-11-12 13:53:24 +01:00
50f5efba9c
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14795] Use maximum topic views instead of adding up views in merge
2016-11-06 15:47:49 +01:00
fce30d1d91
[ticket/14795] Use maximum topic views instead of adding up views in merge
...
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
2016-10-16 10:55:00 +02:00
59b52d6312
[ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804
...
PHPBB3-14804
2016-10-03 10:24:30 -04:00
328a7afcc3
Merge branch '3.1.x' into 3.2.x
2016-10-01 16:58:07 +01:00
32d569c594
[ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1
...
PHPBB3-14804
2016-09-30 16:34:11 -04:00
c6383d3f89
[ticket/14804] Rename event to mcp_forum_merge_topics_after; update @since
...
PHPBB3-14804
2016-09-30 15:58:10 -04:00
1d25c80a9c
[ticket/14804] Add core event to MCP after merging topics
...
Renamed $topic_data and defined $to_topic_data in order to avoid ambiguity
and to stop overwriting a variable.
PHPBB3-14804
2016-09-30 15:23:17 -04:00
c588332aa5
[ticket/14795] Merge topic views when merging topics
...
PHPBB3-14795
2016-09-25 19:49:01 +02:00
4b6c2c8cde
[ticket/10961] Send HTTP 403 when applicable
...
PHPBB3-10961
2016-09-01 08:48:37 +02:00
05e6ed04ed
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14673] Changes wrong language variable in mcp_forum
2016-08-31 19:08:11 +02:00
429ecb938c
[ticket/14673] Changes wrong language variable in mcp_forum
...
PHPBB3-14673
2016-08-22 21:23:01 +02:00
06bfae8edb
Merge branch '3.1.x' into 3.2.x
2016-08-21 09:51:26 +02:00
c016e09ca4
[ticket/12925] Pluralize permanent delete checkbox label
...
PHPBB3-12925
2016-08-15 18:27:33 +02:00
d53f75f668
[ticket/14709] add post_id to mod log
...
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
2016-07-13 12:00:06 -04:00
4d50a1daa5
[ticket/14680] Fix wrong function name being checked in mcp_queue.
...
PHPBB3-14680
2016-06-17 11:50:32 -04:00
dedfb317f2
Merge branch '3.1.x' into 3.2.x
...
* 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.
2016-03-26 18:59:31 +01:00
640070e133
Merge pull request #3874 from lavigor/ticket/14134
...
[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.
2016-03-26 18:59:31 +01:00
18a4505b23
[ticket/14134] Fix Okay in a comment.
...
PHPBB3-14134
2016-03-25 23:11:43 +03:00
276d48ed4f
[ticket/14134] Fix code comments.
...
PHPBB3-14134
2016-02-27 16:55:05 +03:00
8e5b5a5c07
Merge branch '3.1.x'
2016-01-16 23:10:37 +01:00
fef03a1946
[ticket/14412] Comment fixes for PHPDoc in the events
...
PHPBB3-14412
2016-01-15 14:07:50 +03:00
73900d1857
[ticket/13454] Remove more unused variables
...
This should be the last part. Off to checking if the changes were correct.
PHPBB3-13454
2016-01-06 13:52:11 +01:00
7a6a16e3a5
[ticket/13454] Remove unused variables
...
This is part 5 and there is more to come.
PHPBB3-13454
2016-01-06 13:52:11 +01:00
266576c6a4
[ticket/13454] Remove unused variables
...
Part 4
PHPBB3-13454
2016-01-06 13:52:11 +01:00
6c25ad4822
[ticket/13454] Remove unused variables
...
Part 3 should fix tests up a little bit again.
PHPBB3-13454
2016-01-06 13:52:11 +01:00
f50ba9ab4f
[ticket/13454] Remove unused variables
...
This is part 2 of the pr.
PHPBB3-13454
2016-01-06 13:52:11 +01:00
73e6e5b77f
[ticket/13454] Remove unused variables
...
This is the first part of the changes. More to come.
PHPBB3-13454
2016-01-06 13:51:19 +01:00
d0adbe94d5
Merge branch '3.1.x'
...
Conflicts:
phpBB/includes/mcp/mcp_main.php
2016-01-06 13:31:15 +01:00
a021956644
[ticket/14343] Added missing $phpbb_dispatcher
...
PHPBB3-14343
2016-01-06 11:38:22 +01:00
434a04344e
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/14343] Add event when locking/unlocking posts/topics
2015-12-07 21:06:39 +01:00
94c073672d
[ticket/14343] Add event when locking/unlocking posts/topics
...
PHPBB3-14343
2015-12-06 20:05:27 +01:00
065b0a632f
[ticket/14325] Preserve event variable BC
...
PHPBB3-14325
2015-11-30 18:05:46 +01:00
77f447c07c
Merge branch '3.1.x'
2015-11-12 08:50:22 +01:00
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
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
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
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
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
f657680311
[ticket/13831] Store provided reason when deleting from Mod. Queue module.
...
PHPBB3-13831
2015-10-14 19:41:44 -07:00
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
102d737d81
[ticket/14234] Fix event doc blocks
...
PHPBB3-14234
2015-10-12 22:20:52 +02:00
