aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
Commit message (Collapse)AuthorAgeFilesLines
...
| * | [ticket/10484] Use variables for sql_build_query() callsJoas Schilling2011-11-211-10/+12
| | | | | | | | | | | | | | | | | | It's easier for mods/extensions to extend the arrays. PHPBB3-10484
* | | Merge remote-tracking branch 'nickvergessen/ticket/10344' into developOleg Pudeyev2011-11-204-12/+18
|\ \ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/10344: [ticket/10344] Add attachment icons to list of reported and queued posts/topics
| * | | [ticket/10344] Add attachment icons to list of reported and queued posts/topicsJoas Schilling2011-08-274-12/+18
| | | | | | | | | | | | | | | | PHPBB3-10344
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-201-0/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * develop-olympus: [ticket/10402] Fixed a formatting issue with report details.
| * | | 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 branch 'develop-olympus' into developNils Adermann2011-11-181-0/+4
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | | | | | * develop-olympus: [ticket/9956] Display error message if no disapprove reason given Conflicts: phpBB/includes/mcp/mcp_queue.php
| * | | 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
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-132-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read [ticket/10365] Require m_report permission to see reports in mcp_post [ticket/10365] Make sure moderators only get mcp_reports link when allowed
| * | | | [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
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-9/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10377] Do not allow all moderators to sticky posts
| * | | [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
* | | [feature/remove-imagesets] Adjustments to php filesVjacheslav Trushkin2011-09-041-1/+0
| | | | | | | | | | | | | | | | | | Removing imagesets. Adjustments to php files PHPBB3-10336
* | | Merge branch 'develop-olympus' into developNils Adermann2011-07-162-3/+3
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/5506] Do not display an empty last page after deleting logs.
| * | [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
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-171-25/+26
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10109] Fix "Undefined Index" errors when copying a topic.
| * | [ticket/10109] Fix "Undefined Index" errors when copying a topic.Joas Schilling2011-04-071-25/+26
| | | | | | | | | | | | PHPBB3-10109
* | | [ticket/9684] Fix Forum/Topic-Tracking for global announcementsJoas Schilling2011-04-071-2/+2
| | | | | | | | | | | | | | | | | | Should be ready for intensive testing now. PHPBB3-9684
* | | [ticket/9684] Remove code in some more files especially includes/Joas Schilling2011-04-075-103/+40
| | | | | | | | | | | | | | | | | | Topic-Tracking is still missing. PHPBB3-9684
* | | [ticket/9684] Remove code for global announcement in root-filesJoas Schilling2011-04-071-156/+13
| |/ |/| | | | | PHPBB3-9684
* | Merge branch 'ticket/hanakin/10001' into developIgor Wiedler2011-02-281-0/+1
|\ \ | | | | | | | | | | | | | | | * ticket/hanakin/10001: [ticket/10001] Created the new styles within colours.css to handle the displaying of the forum & topic images [ticket/10001] Created new Template variable to house class names based on $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images
| * | [ticket/10001] Created new Template variable to house class names based on ↵hanakin2011-01-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images * Created new Template variable to house class names based on $folder_img value in functions_display.php. * Created new Template variable to house class names based on $folder_img value in mcp_forums.php. * Created new Template variable to house class names based on $folder_img value in ucp_main.php. * Created new Template variable to house class names based on $folder_img value in search.php. * Created new Template variable to house class names based on $folder_img value in ucp_pm_viewfolder.php. * Created new Template variable to house class names based on $folder_img value in search.php. * Created new Template variable to house class names based on $folder_img value in viewforum.php. * Modified forumlist_body.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified mcp_forum.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified search_results.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_main_bookmarks.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_main_subscribed.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_main_front.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified ucp_pm_viewfolder.html to utilize class for forum & topic images through out template via the newly created Template variable * Modified viewforum_body.html to utilize class for forum & topic images through out template via the newly created Template variable * Created the new styles within colours.css to handle the displaying of the forum & topic images - NOTES: This changes are the first step in the revamp of prosilver initiative, this provides the ground work to handle the images via sprites to reduce the amount of HTTP requests by the server PHPBB3-10001
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-242-3/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/9874] view_log() performs unneeded count query over all log entries. [ticket/7834] Topic time didn't update when first post was deleted [ticket/9997] Fixed an inconsistency in the Moderator Control Panel [ticket/9872] Removed some useless code that broke delete_posts
| * | [ticket/9874] view_log() performs unneeded count query over all log entries.Joas Schilling2011-02-252-3/+3
| |/ | | | | | | PHPBB3-9874
* | [ticket/8065] Add an option to lock topics while moving them.Joas Schilling2011-01-301-0/+9
| | | | | | | | PHPBB3-8065
* | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-1120-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556
* | [feature/request-class] Convert any direct access to $_* to use $requestIgor Wiedler2010-09-253-6/+12
|/ | | | PHPBB3-9716
* 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