* 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
* 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
* 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
The order of the Approve / Disapprove buttons was inconsistent in the
Moderator Control Panel - while on the main page and the moderation
queue itself the Approve button was to the right of the Disapprove
button, in the post details the Approve button was to the left of the
Disapprove button.
This very simple edit simply switches the position of these two buttons
in the post details page in the mcp.
PHPBB3-9995
I did not include the docs/INSTALL.html, because we need to do a bit more on that file before releasing 3.1 (Add section how to update from 3.0 to 3.1, ...)
PHPBB3-10045
* develop-olympus:
[ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
[ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
* 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
* 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
* develop-olympus:
[ticket/9859] Remove the years from the copyright statements in docs files.
[ticket/9859] Remove the year from the copyright meta tag in docs/*.html
[ticket/9859] Remove the meta copyright tag as well.
[ticket/9859] Remove the credit line comment from all html files.
[ticket/9859] Remove years in credit line from some more files.
* 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.
* develop-olympus:
[ticket/9937] Make sure feed icon only shows for FORUM_POST
[ticket/9937] The feed icon displays on External links...which we don't want
[ticket/9925] prosilver logo margin bug in IE 6-7-8
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
* develop-olympus:
[ticket/9888] Update fails when Bing [Bot] was already added to the users table
[develop-olympus] Bumping version number for 3.0.8-RC1.
[ticket/9885] Fix extension group name updater. Loop through all languages.
[ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'.
[ticket/9883] Change an American English spelling to British English.
[task/phing-build] Correct the path for update package patch files.
* develop-olympus:
[ticket/9827] No longer emulate Internet Explorer 7 when using IE9.
[ticket/9850] Display upgrade instructions for feature release in acp
[ticket/9835] subsilver2: Don't show "To prevent automated ..." when logging in
The IE9 beta fixes the IE8 textarea width bug which required IE7 emulation in
phpBB's styles. Emulation should only occur when using IE8 now.
PHPBB3-9827
* develop-olympus:
[ticket/9478] Validate maximum number of allowed recipients per PM value.
[ticket/9686] Fix mssqlnative database data export
[ticket/9595] List min/max characters indexed by search for mysql_fulltext.
[ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN.
[ticket/9853] Change recaptcha theme from default to 'clean'.
* 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'.
* develop-olympus:
[ticket/9509] Remove section 8 from index
[ticket/9509] Close anchor tag in coding guidelines
[ticket/9854] Revise docs/auth_api.html to add more methods
[ticket/9509] The VCS is now git
[ticket/9840] Display view unread posts link for guests.
Conflicts:
phpBB/docs/coding-guidelines.html
Change recaptcha theme to 'clean' to better coordinate with the color schemes
of prosilver and subsilver2. The default red theme doesn't really fit prosilver
and subsilver2.
PHPBB3-9853
