1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 04:36:32 +02:00
Commit Graph

163 Commits

Author SHA1 Message Date
d90e97342a Merge branch '3.3.x' 2023-10-30 21:37:28 +01:00
b0248d2d78 [ticket/17187] Repair mcp link to first unread post
PHPBB3-17187
2023-09-23 15:54:21 +02:00
72cf2ba2ea Merge branch '3.3.x' 2021-08-23 20:30:14 +02:00
ee1cb783cb [ticket/16207] Add form keys to actions in MCP
PHPBB3-16207
2021-07-17 22:31:04 +02:00
b734fed853 [ticket/16138] Eliminate redundant parameters from board URLs
Revert mcp change to fix some moderator functions
such as selecting topic for move posts

PHPBB3-16138
2021-05-19 22:05:08 +02:00
adacf21edb [ticket/16138] Eliminate redundant parameters from board URLs
Rebase to 3.3.x

PHPBB3-16138
2021-05-19 22:05:06 +02:00
37a3e5b55e Merge branch '3.3.x' 2021-03-14 17:05:20 +01:00
6ebd64521b [ticket/16725] Add MCP core event
PHPBB3-16725
2021-03-13 17:40:10 +05:30
9b9ca25934 [ticket/16237] Fix broken vars and remove conditional overhead
PHPBB3-16237
2020-08-21 15:33:08 -07:00
63c7488f18 [ticket/16237] Add missing template vars
PHPBB3-16237
2020-08-19 10:40:06 -10:00
dc4fe2d4b7 [ticket/16237] squash all commits
PHPBB3-16237
2020-08-19 10:40:06 -10:00
rxu
f8fbe37936 [ticket/14972] replace all occurrences of sizeof() with the count()
PHPBB3-14972
2018-01-01 13:56:04 +01:00
rxu
797234e416 [ticket/14972] replace all occurrences of sizeof() with the count()
PHPBB3-14972
2017-07-17 16:57:00 +07:00
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
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
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
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
065b0a632f [ticket/14325] Preserve event variable BC
PHPBB3-14325
2015-11-30 18:05:46 +01:00
102d737d81 [ticket/14234] Fix event doc blocks
PHPBB3-14234
2015-10-12 22:20:52 +02:00
578ee077c1 [ticket/14234] Fix change version and remove more references
PHPBB3-14234
2015-10-12 19:41:17 +02:00
c3ceafb37d Merge branch '3.1.x'
* 3.1.x:
  [ticket/14106] Fix topics sorting in MCP for topics merging.
2015-08-28 16:40:41 +02:00
rxu
ec032733de [ticket/14106] Fix topics sorting in MCP for topics merging.
The "bug" in the deleted code comment is non-existent now.
The PR is for 3.1 only.

PHPBB3-14106
2015-08-16 19:55:00 +07:00
03c64d3384 Merge branch '3.1.x'
Conflicts:
	phpBB/includes/mcp/mcp_forum.php
2015-08-09 10:15:02 +02:00
7d31232846 [ticket/8708] Apply permission 'f_announce_global'
PHPBB3-8708
2015-07-19 21:26:47 +02:00
2e10961fff [ticket/14014] Add core.mcp_forum_view_before event
This event can be used to get some data in order to execute other actions.

PHPBB3-14014
2015-07-15 15:55:55 +02:00
f6e06da4c6 [ticket/13455] Update calls to request_var()
PHPBB3-13455
2015-02-03 20:50:40 +01:00
7fc586080b [ticket/13468] Update calls to add_log()
PHPBB3-13468
2015-01-27 18:34:33 +01:00
b5544b2f47 [ticket/13450] Type-hint return value of $phpbb_container->get()
PHPBB3-13450
2015-01-12 20:19:07 +01:00
b648d3eb4c [ticket/13328] fix CS
https://tracker.phpbb.com/browse/PHPBB3-13328

PHPBB3-13328
2014-11-11 10:47:39 -06:00
71e0de5588 [ticket/13328] add core.mcp_view_forum_modify_sql
https://tracker.phpbb.com/browse/PHPBB3-13328

PHPBB3-13328
2014-11-10 22:57:54 -06:00
952b4de231 [ticket/12612] Prefix check_ids() with phpbb_
PHPBB3-12612
2014-06-23 23:01:52 +02:00
4ac43856f7 [ticket/12612] Prefix mcp_sorting() with phpbb_
PHPBB3-12612
2014-06-23 23:00:13 +02:00
c315fc6c89 [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
PHPBB3-12612
2014-06-23 22:58:41 +02:00
771cbb2b3a Merge pull request #2434 from Nicofuma/ticket/8610
[ticket/8610] Merging topics does not handle bookmarks correctly

* Nicofuma/ticket/8610:
  [ticket/8610] Use css selector instead of xPath
  [ticket/8610] Add functional test when two topics are merged
  [ticket/8610] Throw an error when the dest topic isn't set
  [ticket/8610] Fix bookmarks when merging all the posts of a topic
  [ticket/8610] Merging topics does not handle bookmarks correctly
2014-06-09 22:57:27 +02:00
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
c517cd6778 [ticket/8610] Throw an error when the dest topic isn't set
PHPBB3-8610
2014-05-27 01:38:43 +02:00
49bc10de4d [ticket/8610] Merging topics does not handle bookmarks correctly
https://tracker.phpbb.com/browse/PHPBB3-8610

PHPBB3-8610
2014-05-10 22:17:01 +02:00
7c2239e75c Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus
* github-nickvergessen/ticket/12273: (55 commits)
  [ticket/12273] Move $extension to constructor so the path is always set
  [ticket/12273] Find events.md relative from the path not the phpbb root
  [ticket/12273] Do not look in extensions docs/ and tests/ directory
  [ticket/12273] Also check file for adm "Location:" events
  [ticket/12273] Do not allow template events in non-html files
  [ticket/12273] Fix return description
  [ticket/12273] Update exporter to allow specifying an extension
  [ticket/12273] Allow to filter events for extensions
  [ticket/12273] Remove old parameter from function call
  [ticket/12273] Fix table header for adm events
  [ticket/12273] Add root path to recursive_event_filter_iterator
  [ticket/12273] Fix missing classes in export_events_for_wiki.php
  [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter
  [ticket/12273] Use RecursiveDirectoryIterator in md_exporter
  [ticket/12273] Fix doc blocks
  [ticket/12273] Do not allow 3.1-A1 for template events
  [ticket/12273] Sort arguments alphabetically before exporting
  [ticket/12273] Do not allow 3.1-A1 version
  [ticket/12273] Update since version to 3.1.0-a* style
  [ticket/12273] Update existing events
  ...
2014-05-02 12:22:05 +02:00