1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 17:01:07 +02:00
Commit Graph

909 Commits

Author SHA1 Message Date
b6ac183a32 [ticket/15454] Add post template data to event
PHPBB3-15454
2017-12-28 09:09:21 +01:00
5585cb79b2 [ticket/15454] Add core.mcp_queue_approve_details_template
PHPBB3-15454
2017-11-13 14:24:58 +01:00
b28dc339f0 Merge branch '3.1.x' into 3.2.x 2017-06-25 11:06:47 +02:00
127f5a3ffa [ticket/15250] Add core event to MCP at the end of merge_posts
PHPBB3-15250
2017-06-20 17:56:48 -04:00
34fb146ab5 Merge branch '3.1.x' into 3.2.x 2017-06-05 11:57:18 +02:00
05a8baffdb Merge pull request from rmcgirr83/ticket_15237
[ticket/15237] Fix unguarded includes to functions_user
2017-06-05 11:56:22 +02:00
e10d563fc9 Merge branch '3.1.x' into 3.2.x 2017-06-03 11:43:09 +02:00
b357f78546 Merge pull request from ErnadoO/ticket/15132
[ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' event
2017-06-03 11:43:06 +02:00
4d4dbd52f7 Merge branch '3.1.x' into 3.2.x 2017-06-03 11:37:06 +02:00
58bd7a90a9 Merge pull request from ErnadoO/ticket/15131
[ticket/15131] Add variable to the 'core.mcp_main_modify_fork_sql' event
2017-06-03 11:37:02 +02:00
0914123391 [ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' event
PHPBB3-15132
2017-05-31 21:21:04 +02:00
e754a51acc [ticket/15131] Add variables to the 'core.mcp_main_modify_fork_sql' event
PHPBB3-15131
2017-05-31 21:04:22 +02:00
7a3e55bdb3 [ticket/15237] Fix unguarded includes to functions_user
https://tracker.phpbb.com/browse/PHPBB3-15237

PHPBB3-15237
2017-05-24 12:58:25 -04:00
7254980753 Merge pull request from marc1706/ticket/7336
[ticket/7336] Index first post when splitting topics

* github.com:phpbb/phpbb:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
2017-04-28 11:30:14 +02:00
b1439a4601 Merge branch 'ticket/8116' into ticket/8116-rhea 2017-04-19 23:43:41 +02:00
c61e43cc91 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
2017-04-19 23:01:35 +02:00
a8d28d6bc8 Merge pull request from marc1706/ticket/7336
[ticket/7336] Index first post when splitting topics

* github.com:phpbb/phpbb:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
2017-04-19 23:00:37 +02:00
771be9310d [ticket/8116] Correctly get other users who posted under IP
PHPBB3-8116
2017-04-18 19:33:05 +02:00
e6a0e4caed [ticket/8116] Improve code and add tests for helper functions
PHPBB3-8116
2017-03-29 19:53:58 +02:00
2edf7056f0 [ticket/8116] Add pagination for IP tables on post info
Diff from previous patch by nickvergessen.

PHPBB3-8116
2017-03-28 22:10:03 +02:00
4cf998e9df [ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' event
PHPBB3-15132
2017-03-18 18:27:24 +01:00
716cff0c97 [ticket/15131] Add variables to the 'core.mcp_main_modify_fork_sql' event
PHPBB3-15131
2017-03-18 17:58:06 +01:00
f27cdad73e Merge branch '3.1.x' into 3.2.x 2017-02-11 21:48:20 +01:00
45199adebd Merge pull request from senky/ticket/13429
[ticket/13429] Replace @change with @changed in event docblocks
2017-02-11 15:19:47 +01:00
779758f219 [ticket/13429] Replace @change with @changed
PHPBB3-13429
2017-01-23 13:33:15 +01:00
02a35baf70 [ticket/7336] Index first post when splitting topics
PHPBB3-7336
2017-01-16 22:29:57 +01:00
91637f8070 Merge pull request from marc1706/ticket/14954
[ticket/14954] Properly check if topic has attachments in mcp_queue
2017-01-06 01:14:09 +01:00
cfa2bc534b Merge branch '3.1.x' into 3.2.x 2017-01-04 21:50:25 +01:00
4c550c221b [ticket/14954] Properly check if topic has attachments in mcp_queue
PHPBB3-14954
2017-01-02 23:23:53 +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 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
c2836725f9 [ticket/13429] Replace @changed with @change in event docblocks
PHPBB3-13429
2016-11-20 17:58:59 +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 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