* develop-ascraeus:
[ticket/12730] Update Google+ button class to use proper identification
[ticket/12730] Update maxlen for type_googleplus to 255
[ticket/12730] Fix type_googleplus_test to use same validation rule as the field
[ticket/12730] Update field_length to be 20 by default for Google+
[ticket/12730] Google+ field_order should be 13
[ticket/12730] Switch service name to googleplus for type_googleplus
[ticket/12730] Restore field_length to 10 for type_googleplus
[ticket/12730] Add functional test for Google+ field
[ticket/12730] Value shouldn't be escaped for schema_data.sql
[ticket/12730] Missing newline at type_googleplus_test.php
[ticket/12730] Set field_active to 1 for Google+ field
[ticket/12730] Add unit test for type_googleplus
[ticket/12730] Add missing brackets to type_googleplus.php
[ticket/12730] Update field_order for Google+ CPF
[ticket/12730] Use string template for Google+ CPF instead of a new one
[ticket/12730] Minor formatting fixes
[ticket/12730] Incorrect indentation for type_googleplus
[ticket/12730] Spaces in block header
[ticket/12730] Add a Google+ field by default
[ticket/12730] Add Google+ profile field type
* develop-ascraeus: (30 commits)
[ticket/12732] Update schema.json for Skype
[ticket/12729] Add functional test for Facebook field
[ticket/12731] Add functional test for youtube field
[ticket/12732] Add functional test for Skype profile field
[ticket/12733] Add functional test for twitter profile field
[ticket/12730] Values needn't be escaped for schema_data.sql
[ticket/12733] Values needn't be escaped for schema_data.sql
[ticket/12732] Values shouldn't be escaped for schema_data.sql
[ticket/12731] Set field_active to 1 for YouTube field
[ticket/12731] Add YouTube custom profile field
[ticket/12733] Set field_active to 1 for Twitter
[ticket/12733] Convert spaces to tabs
[ticket/12733] Fix spacing for block header in profilefield_twitter.php
[ticket/12733] Update schema.json
[ticket/12733] Add Twitter custom profile field
[ticket/12732] Set field_active to 1 for Skype's field
[ticket/12729] Set field_active as 1 for Facebook profile field
[ticket/12729] Add unit test for ALPHA_DOTS validation
[ticket/12729] Move ALPHA_DOTS to above ALPHA_SPACERS
[ticket/12729] Convert spaces to tabs
...
[ticket/12731] Add YouTube custom profile field
* Dragooon/ticket/12731:
[ticket/12731] Add functional test for youtube field
[ticket/12731] Set field_active to 1 for YouTube field
[ticket/12731] Add YouTube custom profile field
Conflicts:
phpBB/install/schemas/schema.json
phpBB/install/schemas/schema_data.sql
phpBB/language/en/memberlist.php
tests/functional/ucp_profile_test.php
[ticket/12732] Add Skype custom profile field
* Dragooon/ticket/12732:
[ticket/12732] Update schema.json for Skype
[ticket/12732] Add functional test for Skype profile field
[ticket/12732] Values shouldn't be escaped for schema_data.sql
[ticket/12732] Set field_active to 1 for Skype's field
[ticket/12732] Add unit tests for ALPHA_PUNCTUATION
[ticket/12732] Missing comma after validation definition
[ticket/12732] Improve ALPHA_PUNCTUATION description
[ticket/12732] Use user info instead of chat as default Skype action
[ticket/12732] Add Skype custom profile field
Conflicts:
phpBB/install/schemas/schema.json
phpBB/install/schemas/schema_data.sql
phpBB/language/en/memberlist.php
tests/functional/ucp_profile_test.php
tests/profilefields/type_string_test.php
[ticket/12733] Add Twitter custom profile field
* Dragooon/ticket/12733:
[ticket/12733] Add functional test for twitter profile field
[ticket/12733] Values needn't be escaped for schema_data.sql
[ticket/12733] Set field_active to 1 for Twitter
[ticket/12733] Convert spaces to tabs
[ticket/12733] Fix spacing for block header in profilefield_twitter.php
[ticket/12733] Update schema.json
[ticket/12733] Add Twitter custom profile field
Conflicts:
phpBB/install/schemas/schema.json
phpBB/install/schemas/schema_data.sql
phpBB/language/en/memberlist.php
tests/functional/ucp_profile_test.php
* develop-ascraeus:
[ticket/11711] Improve coding and comments of character check
[ticket/11711] Reduce size of tests and also test topic titles
[ticket/11711] Improve checks for unsupported characters and check subject
[ticket/11711] Inform user of unsupported characters while posting
[ticket/11711] Inform user of unsupported characters while posting
* marc1706/ticket/11711:
[ticket/11711] Improve coding and comments of character check
[ticket/11711] Reduce size of tests and also test topic titles
[ticket/11711] Improve checks for unsupported characters and check subject
[ticket/11711] Inform user of unsupported characters while posting
* develop-ascraeus: (25 commits)
[ticket/12613] Add distinction between top/bottom action-bar
[ticket/12613] Replaced topic-actions with action-bar
[ticket/12613] Remove responsive linklist from memberlist
[ticket/12613] Remove unnecessary checks and clean up CSS
[ticket/12613] role="navigation" not allowed on <ul>
[ticket/12613] Improved screen reader functionality
[ticket/12613] Removed unnecessary checks
[ticket/12613] Set fixed font-size
[ticket/12613] Slightly better icons
[ticket/12613] Typo and L_COLON
[ticket/12613] Small inconsistency fixes
[ticket/12613] Don't display page-jump if all pages are visible (6)
[ticket/12613] Fixes from comments (single quotes and typos)
[ticket/12613] Minor $bull; and <hr> fix
[ticket/12613] Pagination should never be in responsive linklist
[ticket/12613] Minor CSS fixes
[ticket/12613] Dropdown-visible page-jump icon, fix focus() timing
[ticket/12613] Renamed jump-to to page-jump to prevent confusion
[ticket/12613] Removed form in order to prevent nested forms
[ticket/12613] Fix functional test and post sorting bug
...
* PayBas/ticket/12613: (25 commits)
[ticket/12613] Add distinction between top/bottom action-bar
[ticket/12613] Replaced topic-actions with action-bar
[ticket/12613] Remove responsive linklist from memberlist
[ticket/12613] Remove unnecessary checks and clean up CSS
[ticket/12613] role="navigation" not allowed on <ul>
[ticket/12613] Improved screen reader functionality
[ticket/12613] Removed unnecessary checks
[ticket/12613] Set fixed font-size
[ticket/12613] Slightly better icons
[ticket/12613] Typo and L_COLON
[ticket/12613] Small inconsistency fixes
[ticket/12613] Don't display page-jump if all pages are visible (6)
[ticket/12613] Fixes from comments (single quotes and typos)
[ticket/12613] Minor $bull; and <hr> fix
[ticket/12613] Pagination should never be in responsive linklist
[ticket/12613] Minor CSS fixes
[ticket/12613] Dropdown-visible page-jump icon, fix focus() timing
[ticket/12613] Renamed jump-to to page-jump to prevent confusion
[ticket/12613] Removed form in order to prevent nested forms
[ticket/12613] Fix functional test and post sorting bug
...
* develop-ascraeus:
[ticket/8610] Use css selector instead of xPath
[ticket/8610] Add functional test when two topics are merged
[ticket/8610] Throw an error when the dest topic isn't set
[ticket/8610] Fix bookmarks when merging all the posts of a topic
[ticket/8610] Merging topics does not handle bookmarks correctly
[ticket/8610] Merging topics does not handle bookmarks correctly
* Nicofuma/ticket/8610:
[ticket/8610] Use css selector instead of xPath
[ticket/8610] Add functional test when two topics are merged
[ticket/8610] Throw an error when the dest topic isn't set
[ticket/8610] Fix bookmarks when merging all the posts of a topic
[ticket/8610] Merging topics does not handle bookmarks correctly
* develop-ascraeus:
[ticket/11467] Add user object to extension manager for tests
[ticket/11467] Add language variables to tests
[ticket/11467] Add language variables for extension exception messages
* develop-ascraeus:
[ticket/12270] Fixed topic counting bug and tests
[ticket/12270] Fixed tests not working
[ticket/12270] No quote notif and double poster notification fix
[ticket/12270] Fixed tests
[ticket/12270] Fixed rebase conflicts
[ticket/12270] Correct confirm approval message for topics
[ticket/12270] Correcting to follow phpBB coding standards
[ticket/12270] Better structured code and no debug error message
[ticket/12270] Correct notifications for posts/topics now working
[ticket/12270] Reverted templates
[ticket/12270] Correct post&topic approval msg, no template changes
[ticket/12270] Corrent post and topic approval notification message
[ticket/12270] Current post and topic approval notification message
* marcosbc/ticket/12270:
[ticket/12270] Fixed topic counting bug and tests
[ticket/12270] Fixed tests not working
[ticket/12270] No quote notif and double poster notification fix
[ticket/12270] Fixed tests
[ticket/12270] Fixed rebase conflicts
[ticket/12270] Correct confirm approval message for topics
[ticket/12270] Correcting to follow phpBB coding standards
[ticket/12270] Better structured code and no debug error message
[ticket/12270] Correct notifications for posts/topics now working
[ticket/12270] Reverted templates
[ticket/12270] Correct post&topic approval msg, no template changes
[ticket/12270] Corrent post and topic approval notification message
[ticket/12493] Fix sql query for selection of users that have disabled PM
* n-aleha/ticket/12493:
[ticket/12493] Add functional test
[ticket/12493] Fix sql query for selection of users that have disabled PM
* github-prototech/ticket/11508:
[ticket/11508] Fix build_url test.
[ticket/11508] Add functional test for jumpbox.
[ticket/11508] Use $phpbb_path_helper.
[ticket/11508] Allow equal sign in parameter value.
[ticket/11508] Remove unnecessary implode.
[ticket/11508] Remove unnecessary isset check.
[ticket/11508] Fix build_url test.
[ticket/11508] Curly brace should be on its own line...
[ticket/11508] The question mark is expected even if there are no parameters.
[ticket/11508] Add tests.
[ticket/11508] Do not add the '?' unless there are parameters.
[ticket/11508] Change separator parameter to a simple true|false $is_amp.
[ticket/11508] Move helper functions to path_helper class.
[ticket/11508] Move the stripping param code to separate function as well.
[ticket/11508] Build the jumpbox hidden fields using the _form action_
[ticket/11508] Split parts of build_url() into reusable functions.
Using a static attribute to store the initial state of the feeds instead
of transmit it with the @depends annotation.
This attribute is also added to backupStaticAttributesBlackList
PHPBB3-12413
