aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11292] Fix: Newlines removed in display of PM reportsMartin Beckmann2012-12-241-0/+1
| | | | | | | Report text is run through make_clickable and bbcode_nl2br for PMs just as it is for posts. PHPBB3-11292
* [ticket/8610] Update commentNathan Guse2012-12-151-1/+1
| | | | PHPBB3-8610
* Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610Nathan Guse2012-12-132-16/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (29) and others # Via Andreas Fischer (3) and others * 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits) [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11265] Add assertions for board installation success. [ticket/11162] Reformat. [ticket/10491] Make recreate_database static. [ticket/11162] Rename tricky updates to database helper. [ticket/10491] Install board once per test run. [ticket/10972] Drop user deletion. [ticket/10972] Tweak user addition. [ticket/10972] Add destroy method to mock cache. [ticket/10972] Add mock null cache. [ticket/10972] Backport get_db from develop. [ticket/10972] Added explicit checks for creating duplicate users. [ticket/10972] Moved tests into appropriate places and added comments [ticket/10972] Added methods for creating and deleting basic users [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. ... Conflicts: phpBB/includes/mcp/mcp_topic.php
| * [ticket/11162] Rename tricky updates to database helper.Oleg Pudeyev2012-12-122-2/+2
| | | | | | | | PHPBB3-11162
| * [ticket/11162] Use correct functions.Oleg Pudeyev2012-12-052-4/+4
| | | | | | | | PHPBB3-11162
| * [ticket/11162] Add includes.Oleg Pudeyev2012-12-042-0/+8
| | | | | | | | PHPBB3-11162
| * [ticket/11162] Fix inaccurately copy pasted comment.Oleg Pudeyev2012-12-011-1/+1
| | | | | | | | PHPBB3-11162
| * [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.Oleg Pudeyev2012-12-012-12/+2
| | | | | | | | PHPBB3-11162
* | [ticket/8610] Use phpbb_update_rows_avoiding_duplicatesNathan Guse2012-12-132-22/+6
| | | | | | | | PHPBB3-8610
* | [ticket/8610] Revert some funky merging I did from rebaseNathan Guse2012-12-133-12/+3
| | | | | | | | PHPBB3-8610
* | [ticket/8610] Add some commentsNathan Guse2012-12-132-0/+4
| | | | | | | | PHPBB3-8610
* | [ticket/8610] Update Bookmarks and Subscriptions when splitting topicsNathaniel Guse2012-12-132-4/+64
| | | | | | | | | | | | | | Update bookmarks and subscriptions to add bookmarks/subscriptions to the new topic when using the split_topic function PHPBB3-8610
* | [ticket/8610] Update Bookmarks when merging posts into another topicNathaniel Guse2012-12-131-1/+9
| | | | | | | | | | | | | | Update bookmarks to the new topic when merging posts into another topic using the merge_posts function. PHPBB3-8610
* | [ticket/8610] Update Bookmarks when forking topicsNathaniel Guse2012-12-131-1/+21
| | | | | | | | | | | | | | Update bookmarks to the new topic when forking topics using the mcp_fork_topic function. PHPBB3-8610
* | [ticket/8610] Update Bookmarks when merging topicsNathaniel Guse2012-12-131-1/+9
|/ | | | | | | Update bookmarks to the new topic when merging multiple topics using the merge_topics function. PHPBB3-8610
* [ticket/10797] user rank is displayed in mcp_warn.phpDhruv Goel2012-04-161-2/+2
| | | | | | | When warning a user in MCP, the user's rank title and image are displayed. language key user rank also added. PHPBB3-10797
* [ticket/8636] Add resync option to topic_view moderation pageJoas Schilling2012-02-231-0/+11
| | | | PHPBB3-8636
* Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympusOleg Pudeyev2011-11-201-0/+1
|\ | | | | | | | | * callumacrae/ticket/10402: [ticket/10402] Fixed a formatting issue with report details.
| * [ticket/10402] Fixed a formatting issue with report details.Callum Macrae2011-10-221-0/+1
| | | | | | | | | | | | | | | | Line returns were being removed and links weren't being made clickable. This commit adds a line (contributed by AmigoJack) to retain the link breaks and make links clickable. PHPBB3-10402
* | Merge remote-tracking branch 'github-nickvergessen/ticket/9956' into ↵Nils Adermann2011-11-181-0/+3
|\ \ | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/9956: [ticket/9956] Display error message if no disapprove reason given
| * | [ticket/9956] Display error message if no disapprove reason givenJoas Schilling2011-10-141-0/+3
| | | | | | | | | | | | PHPBB3-9956
* | | [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to readIgor Wiedler2011-11-131-2/+2
| | | | | | | | | | | | PHPBB3-10365
* | | [ticket/10365] Require m_report permission to see reports in mcp_postIgor Wiedler2011-10-301-1/+1
| | | | | | | | | | | | | | | | | | This was exposed to anyone with m_ perms in mcp_post_details. PHPBB3-10365
* | | [ticket/10365] Make sure moderators only get mcp_reports link when allowedIgor Wiedler2011-10-301-2/+2
| |/ |/| | | | | | | | | | | The m_report permission is not not being checked when displaying the link to mcp_reports. PHPBB3-10365
* | [ticket/10377] Do not allow all moderators to sticky postsIgor Wiedler2011-10-141-9/+8
|/ | | | | | | | In the mcp the change_topic_type does not properly check permissions, allowing moderators to make any post sticky or announced by visiting the correct URL. PHPBB3-10377
* [ticket/5506] Do not display an empty last page after deleting logs.Joas Schilling2011-07-142-3/+3
| | | | | | The fix is copied from view_inactive_users(). Also add keywords and sort parameters to url for deleting logs and inactive users. And finally save some queries if there are no logs/users to display anyway
* [ticket/10109] Fix "Undefined Index" errors when copying a topic.Joas Schilling2011-04-071-25/+26
| | | | PHPBB3-10109
* [ticket/9874] view_log() performs unneeded count query over all log entries.Joas Schilling2011-02-252-3/+3
| | | | PHPBB3-9874
* Merge branch 'ticket/bantu/9503' into develop-olympusIgor Wiedler2010-09-121-1/+1
|\ | | | | | | | | * ticket/bantu/9503: [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.
| * [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.Andreas Fischer2010-07-231-1/+1
| | | | | | | | | | | | | | Show 'No subject specified' in 'Posts awaiting approval' if post subject is empty. PHPBB3-9503
* | Merge branch 'ticket/cs278/7332' into develop-olympusAndreas Fischer2010-08-211-1/+1
|\ \ | | | | | | | | | | | | | | | * ticket/cs278/7332: [ticket/7332] Redirect users back to post details when performing actions. [ticket/7332] Collapse post details content down to a maximum of 300px heigh
| * | [ticket/7332] Redirect users back to post details when performing actions.Chris Smith2010-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | Moderators are redirected to the index page of the MCP after locking a post, a better location would be to direct them back to the post details. PHPBB3-7332
* | | [ticket/7972] Copying topics in the MCP now indexes the new topic.Chris Smith2010-08-201-0/+35
|/ / | | | | | | PHPBB3-7972
* | [ticket/9679] phpBB offers to notify poster even if notification is disabledJosh Woody2010-07-291-8/+11
|/ | | | | | | | The "notify user" check box would not do anything if checked in this case, but it was still presented. The checkbox is now only shown if there are notification options enabled. PHPBB3-9679
* [ticket/7720] Fix alternative image-description for unread posts.Joas Schilling2010-07-144-4/+4
| | | | | | | | Changed the wrong word "new" to "unread" as that is, what we show with the red-icons, not whether the post is new or not. Language variables were kept for backwards compatibility. PHPBB3-7720
* Fix bug #55045 - Do not duplicate previous/next links in pagination text of ↵Ruslan Uzdenov2010-01-242-2/+2
| | | | | | | | moderator logs and user notes in MCP for subsilver2. Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10433 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #56285 - Properly calculate posts in a topic in the MCPCullen Walsh2010-01-191-1/+8
| | | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10428 89ea8834-ac86-4346-8a33-228a782c2dd0
* - Bug #56255 - Moving topics to a forum where you are on queue Josh Woody2010-01-181-1/+1
| | | | | | - Allow some error handling in compress class by returning false if file does not exist. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10427 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix r10391 - Bug #56025 - Pagination of User Notes in MCP uses two different ↵Joas Schilling2010-01-171-1/+1
| | | | | | | | | | config values. Authorised by: ToonArmy git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10407 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #56025 - Pagination of User Notes in MCP uses two different config values.Joas Schilling2009-12-301-1/+1
| | | | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10391 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #53545 - javascript error in templateMeik Sievertsen2009-11-032-4/+6
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10252 89ea8834-ac86-4346-8a33-228a782c2dd0
* revert r10079 (bug #50035) to be able to investigate other options of ↵Meik Sievertsen2009-10-032-90/+0
| | | | | | handling this later. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10201 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #52125, regression from r9678 for Bug #46225Meik Sievertsen2009-09-291-2/+10
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10196 89ea8834-ac86-4346-8a33-228a782c2dd0
* check for m_split and m_merge permission on target topic and topic icon ↵Meik Sievertsen2009-09-231-1/+1
| | | | | | selection (Bug #51675) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10180 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix r9814 - remove echo "aha"; - Happy birthday nadermanJoas Schilling2009-09-181-1/+1
| | | | | | Authorised by: naderman git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10162 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix #49625 r10002 - Do not drop forum_id on mcp_front (un)approvalJoas Schilling2009-09-121-1/+1
| | | | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10139 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #50845 (missing info icon in subsilver2)Meik Sievertsen2009-09-071-2/+3
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10114 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix r10041 - Bug #50765Meik Sievertsen2009-09-051-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10109 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #50035 - Fix handling of bookmarks and subscriptions on "split ↵Joas Schilling2009-08-312-0/+90
| | | | | | | | topcis", "merge topics" and "merge posts" Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10079 89ea8834-ac86-4346-8a33-228a782c2dd0
* Make sure only logs for existing users are displayed and user-specific logs ↵Meik Sievertsen2009-08-251-1/+2
| | | | | | removed on user deletion. (Bug #49855) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10053 89ea8834-ac86-4346-8a33-228a782c2dd0