aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_forum.php
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14972] replace all occurrences of sizeof() with the count()rxu2018-01-011-10/+10
| | | | PHPBB3-14972
* Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-041-1/+1
|\
| * [ticket/14549] Correcting $redirect var to avoid the bughubaishan2016-12-291-1/+1
| | | | | | | | | | | | by this correct $redirect will go to clean mcp page after merge PHPBB3-14549
* | 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
* | 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
* | [ticket/13454] Remove unused variablesMarc Alexander2016-01-061-1/+1
| | | | | | | | | | | | Part 3 should fix tests up a little bit again. PHPBB3-13454
* | [ticket/13454] Remove unused variablesMarc Alexander2016-01-061-4/+2
| | | | | | | | | | | | This is part 2 of the pr. PHPBB3-13454
* | [ticket/14325] Preserve event variable BCMate Bartus2015-11-301-49/+48
| | | | | | | | PHPBB3-14325
* | [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'Tristan Darricau2015-08-281-9/+0
|\ \ | |/ | | | | | | * 3.1.x: [ticket/14106] Fix topics sorting in MCP for topics merging.
| * [ticket/14106] Fix topics sorting in MCP for topics merging.rxu2015-08-161-9/+0
| | | | | | | | | | | | | | The "bug" in the deleted code comment is non-existent now. The PR is for 3.1 only. PHPBB3-14106
* | Merge branch '3.1.x'Marc Alexander2015-08-091-0/+24
|\ \ | |/ | | | | | | Conflicts: phpBB/includes/mcp/mcp_forum.php
| * [ticket/14014] Add core.mcp_forum_view_before eventZoddo2015-07-151-0/+24
| | | | | | | | | | | | This event can be used to get some data in order to execute other actions. PHPBB3-14014
* | [ticket/8708] Apply permission 'f_announce_global'Oliver Schramm2015-07-191-1/+2
| | | | | | | | PHPBB3-8708
* | [ticket/13455] Update calls to `request_var()`Gaëtan Muller2015-02-031-13/+13
| | | | | | | | PHPBB3-13455
* | [ticket/13468] Update calls to `add_log()`Gaëtan Muller2015-01-271-4/+13
| | | | | | | | PHPBB3-13468
* | [ticket/13450] Type-hint return value of $phpbb_container->get()Gaëtan Muller2015-01-121-0/+2
|/ | | | PHPBB3-13450
* [ticket/13328] fix CSomniError2014-11-111-14/+14
| | | | | | https://tracker.phpbb.com/browse/PHPBB3-13328 PHPBB3-13328
* [ticket/13328] add core.mcp_view_forum_modify_sqlomniError2014-11-101-0/+16
| | | | | | https://tracker.phpbb.com/browse/PHPBB3-13328 PHPBB3-13328
* [ticket/12612] Prefix check_ids() with phpbb_Joas Schilling2014-06-231-2/+2
| | | | PHPBB3-12612
* [ticket/12612] Prefix mcp_sorting() with phpbb_Joas Schilling2014-06-231-1/+1
| | | | PHPBB3-12612
* [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused globalJoas Schilling2014-06-231-1/+1
| | | | PHPBB3-12612
* Merge pull request #2434 from Nicofuma/ticket/8610Joas Schilling2014-06-091-3/+17
|\ | | | | | | | | | | | | | | | | | | | | [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
| * [ticket/8610] Throw an error when the dest topic isn't setTristan Darricau2014-05-271-1/+1
| | | | | | | | PHPBB3-8610
| * [ticket/8610] Merging topics does not handle bookmarks correctlyTristan Darricau2014-05-101-3/+17
| | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-8610 PHPBB3-8610
* | [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-271-3/+7
|/ | | | PHPBB3-12594
* Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into ↵Nils Adermann2014-05-021-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * [ticket/12273] Update since version to 3.1.0-a* styleJoas Schilling2014-04-251-1/+1
| | | | | | | | PHPBB3-12273
* | [ticket/12052] Use different visibility when post was editedJoas Schilling2014-04-251-1/+1
|/ | | | | | ... and needs to be reapproved. PHPBB3-12052
* [ticket/12153] Remove redundant calls to pagination.on_page().Cesar G2014-02-031-1/+0
| | | | PHPBB3-12153
* [ticket/11849] Fix more function callsJoas Schilling2013-12-181-2/+4
| | | | PHPBB3-11849
* [ticket/11892] Fix undefined variables: to_forum_id & to_topic_idCesar G2013-10-081-13/+5
| | | | PHPBB3-11892
* [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-161-2/+2
| | | | PHPBB3-11700
* [ticket/11700] Modify all code to use the new interface namesNils Adermann2013-07-141-2/+2
| | | | PHPBB3-11700
* [ticket/9657] Use the service instead of the static classJoas Schilling2013-07-111-4/+6
| | | | PHPBB3-9657
* [ticket/9657] Fix newly added empty lineJoas Schilling2013-03-101-1/+0
| | | | PHPBB3-9657
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-12-201-6/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission-rebase * 'develop' of https://github.com/phpbb/phpbb3: (544 commits) [feature/events] Fix improperly named event in documentation [feature/events] Fix alphabetization of events [feature/events] Put events in alphabetical order [feature/events] Make EVENTS.md lowercase [ticket/11285] Use more granularity in dependency checks in compress test [ticket/10880] The m_approve permisson no longer implies f_noapprove. [ticket/10803] Show failure message until user dismisses it [ticket/10954] Add missing semi-colon [ticket/10954] Make sure to mark subforums unread and add small fixes [feature/events] Use ` to escape HTML tags in markdown [feature/events] Remove HTML tags from markdown so they don't get parsed [ticket/10954] Miscellaneous coding fixes [feature/events] Remove extraneous space [feature/events] Add markdown template event documentation file [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2) [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2) [feature/events] Fix typo in event name [ticket/10763] Use self when calling get_extension() in filespec class [feature/events] Fix more subsilver2 events [feature/events] Fix some subsilver2 events ... Conflicts: phpBB/install/database_update.php phpBB/posting.php
| * Merge PR #1140 branch 'develop-olympus' into developOleg Pudeyev2012-12-161-1/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8610] Update comment [ticket/8610] Do not use requests to submit posts except in posting_test.php [ticket/8610] Move posting helpers to separate file [ticket/8610] Create helper functions to create topic/post in functional tests [ticket/8610] Use phpbb_update_rows_avoiding_duplicates [ticket/8610] Revert some funky merging I did from rebase [ticket/8610] Add some comments [ticket/8610] Update Bookmarks and Subscriptions when splitting topics [ticket/8610] Update Bookmarks when merging posts into another topic [ticket/8610] Update Bookmarks when forking topics [ticket/8610] Update Bookmarks when merging topics
| | * [ticket/8610] Update commentNathan Guse2012-12-151-1/+1
| | | | | | | | | | | | PHPBB3-8610