1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-21 10:40:58 +02:00
Commit Graph

403 Commits

Author SHA1 Message Date
1fa39ea722 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:35 -04:00
8e1e48a7b6 [ticket/8636] Add resync option to topic_view moderation page
PHPBB3-8636
2012-02-23 10:55:57 +01:00
92303d2dac [ticket/10637] Leftovers from implementation of extensions in mcp_post
Replacing code in includes/mcp/mcp_post.php that was missed in ticket 10323

PHPBB3-10637
2012-02-09 22:17:33 +02:00
1d72a47ea6 [ticket/10637] Leftovers from implementation of extensions in mcp_main
Replacing code in includes/mcp/mcp_main.php that was missed in ticket 10323

PHPBB3-10637
2012-02-09 22:13:13 +02:00
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
88ae40a4b1 [ticket/10345] Make use of the plural function in some basic places
PHPBB3-10345
2011-11-25 15:10:44 -05:00
90a7f55831 Merge remote-tracking branch 'nickvergessen/ticket/10484' into develop
* nickvergessen/ticket/10484:
  [ticket/10484] Use variables for sql_build_query() calls

Conflicts:
	phpBB/includes/mcp/mcp_front.php
2011-11-24 21:51:10 -05:00
4c77903129 [ticket/10484] Use variables for sql_build_query() calls
It's easier for mods/extensions to extend the arrays.

PHPBB3-10484
2011-11-21 16:22:07 +01:00
08032068c0 Merge remote-tracking branch 'nickvergessen/ticket/10344' into develop
* nickvergessen/ticket/10344:
  [ticket/10344] Add attachment icons to list of reported and queued posts/topics
2011-11-20 00:46:45 -05:00
936fd38ee6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10402] Fixed a formatting issue with report details.
2011-11-20 00:16:45 -05:00
6155707071 Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympus
* callumacrae/ticket/10402:
  [ticket/10402] Fixed a formatting issue with report details.
2011-11-20 00:15:48 -05:00
0a4efcbe8c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9956] Display error message if no disapprove reason given

Conflicts:
	phpBB/includes/mcp/mcp_queue.php
2011-11-18 19:42:44 +01:00
6894477b60 Merge remote-tracking branch 'github-nickvergessen/ticket/9956' into develop-olympus
* github-nickvergessen/ticket/9956:
  [ticket/9956] Display error message if no disapprove reason given
2011-11-18 19:41:10 +01:00
8f381fc8ae Merge branch 'develop-olympus' into develop
* 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
2011-11-13 15:47:40 +01:00
52bd8c307f [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read
PHPBB3-10365
2011-11-13 15:37:26 +01:00
18ca3a32bc [ticket/10365] Require m_report permission to see reports in mcp_post
This was exposed to anyone with m_ perms in mcp_post_details.

PHPBB3-10365
2011-10-30 19:10:58 +01:00
d6c3e7785d [ticket/10365] Make sure moderators only get mcp_reports link when allowed
The m_report permission is not not being checked when displaying the link to
mcp_reports.

PHPBB3-10365
2011-10-30 19:10:57 +01:00
8795362879 [ticket/10402] Fixed a formatting issue with report details.
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
2011-10-22 23:03:49 +01:00
95fed7806d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10377] Do not allow all moderators to sticky posts
2011-10-14 17:56:46 +02:00
27279afa1e [ticket/10377] Do not allow all moderators to sticky posts
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
2011-10-14 17:37:12 +02:00
ab8ecf5b92 [ticket/9956] Display error message if no disapprove reason given
PHPBB3-9956
2011-10-14 04:18:44 +02:00
830c3f4047 [feature/remove-imagesets] Adjustments to php files
Removing imagesets. Adjustments to php files

PHPBB3-10336
2011-09-04 01:08:00 +03:00
6a2b13632d [ticket/10344] Add attachment icons to list of reported and queued posts/topics
PHPBB3-10344
2011-08-27 00:25:38 +02:00
6f851d89aa Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/5506] Do not display an empty last page after deleting logs.
2011-07-16 21:00:14 -04:00
8ebc8ec182 [ticket/5506] Do not display an empty last page after deleting logs.
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
2011-07-14 04:05:20 +02:00
8c5a9979ad Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10109] Fix "Undefined Index" errors when copying a topic.
2011-04-17 11:09:17 -04:00
a72fe8acaf [ticket/10109] Fix "Undefined Index" errors when copying a topic.
PHPBB3-10109
2011-04-07 14:53:47 +02:00
ab3f45c0e9 Merge branch 'ticket/hanakin/10001' into develop
* 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
2011-02-28 00:07:59 +01:00
ee0db1a1d5 Merge branch 'develop-olympus' into develop
* 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
2011-02-24 20:59:19 -05:00
a25238e0c1 [ticket/9874] view_log() performs unneeded count query over all log entries.
PHPBB3-9874
2011-02-25 00:04:48 +01:00
b526fb9678 [ticket/8065] Add an option to lock topics while moving them.
PHPBB3-8065
2011-01-30 01:23:20 +01:00
abc8384bf2 [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
* 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
2011-01-18 22:39:50 -05:00
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
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
2010-11-11 19:10:55 +01:00
fccd7f0ab5 [feature/request-class] Convert any direct access to $_* to use $request
PHPBB3-9716
2010-09-25 20:32:15 +02:00
e08395745b Merge branch 'ticket/bantu/9503' into develop-olympus
* ticket/bantu/9503:
  [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.
2010-09-12 13:40:02 +02:00
4222510e9c Merge branch 'ticket/cs278/7332' into develop-olympus
* 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
2010-08-21 20:30:33 +02:00
b73d45ffc8 [ticket/7972] Copying topics in the MCP now indexes the new topic.
PHPBB3-7972
2010-08-20 13:59:21 -04:00
b7a1add009 [ticket/7332] Redirect users back to post details when performing actions.
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
2010-08-08 22:54:21 +01:00
8ea0309ed1 [ticket/9679] phpBB offers to notify poster even if notification is disabled
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
2010-07-29 10:01:35 -05:00
2f67eafd34 [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.
Show 'No subject specified' in 'Posts awaiting approval' if post subject is
empty.

PHPBB3-9503
2010-07-23 19:50:17 +02:00
954b3c3484 [ticket/7720] Fix alternative image-description for unread posts.
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
2010-07-14 20:55:07 +02:00
b44288e0cf Fix bug #55045 - Do not duplicate previous/next links in pagination text of 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
2010-01-24 16:00:18 +00:00
f40418296a Bug #56285 - Properly calculate posts in a topic in the MCP
Authorised by: bantu


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10428 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-19 00:14:31 +00:00
ad14664a3a - Bug #56255 - Moving topics to a forum where you are on queue
- 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
2010-01-18 16:41:21 +00:00
9dde6d8583 Fix r10391 - Bug #56025 - Pagination of User Notes in MCP uses two different config values.
Authorised by: ToonArmy



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10407 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-17 16:27:59 +00:00
267692ad5c Bug #56025 - Pagination of User Notes in MCP uses two different config values.
Authorised by: bantu



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10391 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-30 13:12:02 +00:00
b8cac00366 Fix Bug #53545 - javascript error in template
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10252 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-03 14:51:07 +00:00
8bae495874 revert r10079 (bug #50035) to be able to investigate other options of handling this later.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10201 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-03 11:35:39 +00:00
d657c05ed5 Fix Bug #52125, regression from r9678 for Bug #46225
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10196 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-29 14:51:58 +00:00
35eea4539a check for m_split and m_merge permission on target topic and topic icon selection (Bug #51675)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10180 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-23 09:41:54 +00:00