mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-25 16:49:58 +02:00
Code Issues Releases Wiki Activity
11,590 Commits 18 Branches 192 Tags
Commit Graph

394 Commits

Author SHA1 Message Date
Martin Beckmann
5056f16235 [ticket/11292] Fix: Newlines removed in display of PM reports 
Report text is run through make_clickable and bbcode_nl2br for PMs
just as it is for posts.

PHPBB3-11292
 2012-12-24 04:16:08 +01:00
Nathan Guse
649e009f7b [ticket/8610] Update comment 
PHPBB3-8610
 2012-12-15 16:23:48 -06:00
Nathan Guse
2469225a72 Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610 
# 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
 2012-12-13 20:46:25 -06:00
Nathan Guse
a50907250e [ticket/8610] Use phpbb_update_rows_avoiding_duplicates 
PHPBB3-8610
 2012-12-13 20:42:10 -06:00
Nathan Guse
5c614ff624 [ticket/8610] Revert some funky merging I did from rebase 
PHPBB3-8610
 2012-12-13 20:32:43 -06:00
Nathan Guse
71bcc58fee [ticket/8610] Add some comments 
PHPBB3-8610
 2012-12-13 20:23:04 -06:00
Nathaniel Guse
5a88bd1bf1 [ticket/8610] Update Bookmarks and Subscriptions when splitting topics 
Update bookmarks and subscriptions to add bookmarks/subscriptions to the
new topic when using the split_topic function

PHPBB3-8610
 2012-12-13 20:23:03 -06:00
Nathaniel Guse
05d7decdd3 [ticket/8610] Update Bookmarks when merging posts into another topic 
Update bookmarks to the new topic when merging posts into another topic
using the merge_posts function.

PHPBB3-8610
 2012-12-13 20:19:27 -06:00
Nathaniel Guse
8dd2a151cc [ticket/8610] Update Bookmarks when forking topics 
Update bookmarks to the new topic when forking topics using
the mcp_fork_topic function.

PHPBB3-8610
 2012-12-13 20:19:26 -06:00
Nathaniel Guse
abcc59fca6 [ticket/8610] Update Bookmarks when merging topics 
Update bookmarks to the new topic when merging multiple topics using
the merge_topics function.

PHPBB3-8610
 2012-12-13 20:19:26 -06:00
Oleg Pudeyev
e2c67a8e42 [ticket/11162] Rename tricky updates to database helper. 
PHPBB3-11162
 2012-12-12 21:46:38 -05:00
Oleg Pudeyev
1a411c5658 [ticket/11162] Use correct functions. 
PHPBB3-11162
 2012-12-05 00:11:14 -05:00
Oleg Pudeyev
abca64b1df [ticket/11162] Add includes. 
PHPBB3-11162
 2012-12-04 23:37:14 -05:00
Oleg Pudeyev
05053dacd3 [ticket/11162] Fix inaccurately copy pasted comment. 
PHPBB3-11162
 2012-12-01 23:09:32 -05:00
Oleg Pudeyev
69225bd0a6 [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp. 
PHPBB3-11162
 2012-12-01 23:09:31 -05:00
Dhruv Goel
249d8ede12 [ticket/10797] user rank is displayed in mcp_warn.php 
When warning a user in MCP, the user's rank title and image are displayed.
language key user rank also added.

PHPBB3-10797
 2012-04-16 01:24:10 +05:30
Joas Schilling
8e1e48a7b6 [ticket/8636] Add resync option to topic_view moderation page 
PHPBB3-8636
 2012-02-23 10:55:57 +01:00
Oleg Pudeyev
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
Nils Adermann
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
Igor Wiedler
52bd8c307f [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read 
PHPBB3-10365
 2011-11-13 15:37:26 +01:00
Igor Wiedler
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
Igor Wiedler
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
Callum Macrae
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
Igor Wiedler
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
Joas Schilling
ab8ecf5b92 [ticket/9956] Display error message if no disapprove reason given 
PHPBB3-9956
 2011-10-14 04:18:44 +02:00
Joas Schilling
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
Joas Schilling
a72fe8acaf [ticket/10109] Fix "Undefined Index" errors when copying a topic. 
PHPBB3-10109
 2011-04-07 14:53:47 +02:00
Joas Schilling
a25238e0c1 [ticket/9874] view_log() performs unneeded count query over all log entries. 
PHPBB3-9874
 2011-02-25 00:04:48 +01:00
Igor Wiedler
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
Andreas Fischer
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
Chris Smith
b73d45ffc8 [ticket/7972] Copying topics in the MCP now indexes the new topic. 
PHPBB3-7972
 2010-08-20 13:59:21 -04:00
Chris Smith
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
Josh Woody
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
Andreas Fischer
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
Joas Schilling
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
Ruslan Uzdenov
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
Cullen Walsh
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
Josh Woody
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
Joas Schilling
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
Joas Schilling
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
Meik Sievertsen
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
Meik Sievertsen
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
Meik Sievertsen
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
Meik Sievertsen
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
Joas Schilling
9c1334cd62 fix r9814 - remove echo "aha"; - Happy birthday naderman 
Authorised by: naderman

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10162 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-09-18 14:56:58 +00:00
Joas Schilling
c768cff554 fix #49625 r10002 - Do not drop forum_id on mcp_front (un)approval 
Authorised by: AcydBurn



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10139 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-09-12 13:17:58 +00:00
Meik Sievertsen
58a3d87744 Fix Bug #50845 (missing info icon in subsilver2) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10114 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-09-07 11:42:30 +00:00
Meik Sievertsen
239438a6c9 Fix r10041 - Bug #50765 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10109 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-09-05 12:06:12 +00:00
Joas Schilling
d7925595dc Fix Bug #50035 - Fix handling of bookmarks and subscriptions on "split 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
 2009-08-31 13:50:40 +00:00
Meik Sievertsen
17f40511bf Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10053 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-25 09:07:26 +00:00