* 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
Add a basic CSS comment parser that allows comments to prevent loading an
@import statement. For simplicity, only whitespace is allowed between /* and
the @import. Also adjust regex to not parse improper quotation marks.
PHPBB3-9646
PHPBB3-8169
The search interval was not consistently applied to "special" searches like
"unread posts" and "view your topics." Now the special searches are always
exempt from the flood interval.
PHPBB3-9662
In the ACM-Modules we need to check whether the function is loaded, before we
use it, as this is not the case from download/file.php in avatar-mode.
PHPBB3-9519
* ticket/bantu/9534:
[ticket/9534] Update function documentation for user_ipwhois().
[ticket/9534] Adding support for IPv6 addresses in user_ipwhois().
* ticket/bantu/9694:
[ticket/9694] Call error_reporting() in download/file.php when in avatar mode.
[ticket/9694] Make sure string offset 0 exists to avoid E_NOTICE message.
* ticket/bantu/9167:
[ticket/9167] Detect and remove any dead left over shadow topics on update.
[ticket/9167] Remove shadow topics from remaining forums when deleting a forum
Conflicts:
phpBB/install/database_update.php
acm_memory.php is untested. install/install_convert.php and
includes/functions_convert.php are going to be tested and committed afterwards.
PHPBB3-9519
* task/cs278/git-tools:
[task/git-tools] Ignore git commit message comments
[task/git-tools] Adjust the hook to enforce that a ticket is always mentioned
[task/git-tools] Vastly expanded commit-msg hook.
[task/git-tools] Beginnings of a syntax checking hook.
[task/git-tools] Append ticket identifier to commit message prior to editing.
[task/git-tools] add install and uninstall scripts for hooks
[task/git-tools] move ticket id appending to commit-msg hook
[task/git-tools] append ticket id to git log message
This updated hook supports validates each line of the commit message
confirms to the phpBB standards [1], there are two git config options
which adjust the behaviour of the hook. They are:
* phpbb.hooks.commit-msg.fatal: Set to false for the hook to allow
commits with malformed structure, useful if you'll be squashing
or editing the commits later. True is the default value.
* phpbb.hooks.commit-msg.debug: Any integer value greater than 0 will
increase the debugging verbosity of the hook, the default value is 0.
[1] http://wiki.phpbb.com/display/DEV/Git
PHPBB3-9768
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
The MCP post details can be difficult to use if the post is particularly long
this change shrinks the post area to a maximum of 300 pixels, like the topic
review, making it easier to access the functions beneath the post content.
PHPBB3-7332
Wildcards without any further result restrictions will cause phpBB to search
for everything, potentially allowing a DoS attack against the DB server by any
user who can use the search system.
PHPBB3-9760
