| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Report text is run through make_clickable and bbcode_nl2br for PMs
just as it is for posts.
PHPBB3-11292
|
|
|
|
| |
PHPBB3-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
|
| |
| |
| |
| | |
PHPBB3-11162
|
| |
| |
| |
| | |
PHPBB3-11162
|
| |
| |
| |
| | |
PHPBB3-11162
|
| |
| |
| |
| | |
PHPBB3-11162
|
| |
| |
| |
| | |
PHPBB3-11162
|
| |
| |
| |
| | |
PHPBB3-8610
|
| |
| |
| |
| | |
PHPBB3-8610
|
| |
| |
| |
| | |
PHPBB3-8610
|
| |
| |
| |
| |
| |
| |
| | |
Update bookmarks and subscriptions to add bookmarks/subscriptions to the
new topic when using the split_topic function
PHPBB3-8610
|
| |
| |
| |
| |
| |
| |
| | |
Update bookmarks to the new topic when merging posts into another topic
using the merge_posts function.
PHPBB3-8610
|
| |
| |
| |
| |
| |
| |
| | |
Update bookmarks to the new topic when forking topics using
the mcp_fork_topic function.
PHPBB3-8610
|
|/
|
|
|
|
|
| |
Update bookmarks to the new topic when merging multiple topics using
the merge_topics function.
PHPBB3-8610
|
|
|
|
|
|
|
| |
When warning a user in MCP, the user's rank title and image are displayed.
language key user rank also added.
PHPBB3-10797
|
|
|
|
| |
PHPBB3-8636
|
|\
| |
| |
| |
| | |
* callumacrae/ticket/10402:
[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
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
develop-olympus
* github-nickvergessen/ticket/9956:
[ticket/9956] Display error message if no disapprove reason given
|
| | |
| | |
| | |
| | | |
PHPBB3-9956
|
| | |
| | |
| | |
| | | |
PHPBB3-10365
|
| | |
| | |
| | |
| | |
| | |
| | | |
This was exposed to anyone with m_ perms in mcp_post_details.
PHPBB3-10365
|
| |/
|/|
| |
| |
| |
| |
| | |
The m_report permission is not not being checked when displaying the link to
mcp_reports.
PHPBB3-10365
|
|/
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
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
|
|
|
|
| |
PHPBB3-10109
|
|
|
|
| |
PHPBB3-9874
|
|\
| |
| |
| |
| | |
* ticket/bantu/9503:
[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
|
|\ \
| | |
| | |
| | |
| | |
| | | |
* 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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|/ /
| |
| |
| | |
PHPBB3-7972
|
|/
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
Authorised by: bantu
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10428 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
| |
- 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
|
|
|
|
|
|
|
|
|
|
| |
config values.
Authorised by: ToonArmy
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10407 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
|
| |
Authorised by: bantu
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10391 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10252 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
| |
handling this later.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10201 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10196 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
| |
selection (Bug #51675)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10180 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
| |
Authorised by: naderman
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10162 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
|
| |
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10139 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10114 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10109 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
removed on user deletion. (Bug #49855)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10053 89ea8834-ac86-4346-8a33-228a782c2dd0
|