* develop-olympus:
[ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
[ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
Clicking "Mark forums read" when not browsing on the index page only marks
all subforums (and sub-sub forums etc.) read, topics in the current forum have
to marked seperately by clicking the "Mark topics read" link.
Let's indicate this circumstance by using the word "subforums".
PHPBB3-8802
* ticket/9549:
[ticket/9549] Display users in their primary group instead of their first group
[ticket/9549] Change default value of "sort legend by group name" to false.
[ticket/9549] Fix displaying empty groups
[ticket/9549] Fix language strings.
[ticket/9549] Only add group to legend/teampage when the checkbox is checked.
[ticket/9549] New method move() to move a group more than 1 up/down.
[ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
[ticket/9549] Throw an error when the given field-name is invalid.
[ticket/9549] Make the class non static and extend delete_group function.
[ticket/9549] Add template changes for subsilver2.
[ticket/9549] Enhance teampage and legend functionality
[ticket/9549] Add the module and files for the ACP.
[ticket/9549] Update database with the new config values and columns
[ticket/9549] Enhance teampage functionality with a new class, group_positions.
Conflicts:
phpBB/install/database_update.php
* develop-olympus:
[ticket/9675] Correctly check whether the style/component is still in use.
[ticket/9675] Put the code into methods to avoid code duplication.
[ticket/9675] Adjust the language-string to reflect the changes.
[ticket/9675] Add option to delete template/theme/imageset when deleting style.
* develop-olympus:
[ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
[ticket/9953] Set focus to password on re-authentication
[ticket/9905] Add SQLite to the DSN description
[ticket/9859] Remove years from the credit line.
The installer's DSN field has additional meanings for ODBC, PostgreSQL, and
SQLite, but only the first two are mentioned. SQLite uses it for the file path.
PHPBB3-9905
* develop-olympus:
[ticket/9851] "Search new posts" should require login.
[task/phpdoc] Added a phpdoc task to the build process
[task/phpdoc] Added a configuration file for phpDocumentor.
[feature/acm-wincache] Adding caching module for WinCache's User Cache.
[ticket/9939] Fix JavaScript error in admin recaptcha template
[ticket/9575] Also change 'administrate' to 'administer' in templates
[ticket/8736] guest can have 255 chars long username
[ticket/9928] Do not link "login to your board" to the "send statistics" page.
[ticket/9575] Change 'administrate' to 'administer'
[ticket/9921] Adding sample configuration file for the lighttpd webserver.
[ticket/9932] Add the Bing bot when converting
[ticket/9930] Redirect failes with open_basedir enabled.
[ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
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
* github-bantu/ticket/9879:
[ticket/9879] Fix markup and use Q&A instead of Q & A for consistency.
[ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA.
* github-cs278/ticket/9095:
[ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.
Fixed spelling, punctuation and grammar as well as removed registration
specific language from plugin as it can be/is used for form submissions other
than registration.
PHPBB3-9879
* ticket/bantu/9101:
[ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN.
* ticket/bantu/9595:
[ticket/9595] List min/max characters indexed by search for mysql_fulltext.
* ticket/bantu/9853:
[ticket/9853] Change recaptcha theme from default to 'clean'.
Remove "Additionally, if you have permission you can elect to remove the set
from the filesystem." because that functionality is not implemented.
Also remove unnecessary "When the imageset is deleted it is gone for good."
statement, "It is recommended that you first export your set for possible
future use." should be clear enough.
PHPBB3-9822
Since unread posts search can produce a high server load in certain
circumstances, we implement a switch for ACP "Load settings" to have an option
to disable this type of search.
PHPBB3-9613
