* develop-ascraeus:
[ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
[ticket/13031] Guess with all mimetype guessers and pick best guess
[ticket/13031] Only use mimetype guesser guess if it helps us
If we already have a mimetype and the guesser's guess is the default fallback,
we should keep the already existing mimetype the browser supplied. Otherwise,
platforms that might not support mimetype guessers will cause us to always
have the mimetype set to application/octet-stream on images. This will prevent
users from uploading images.
PHPBB3-13031
* develop-ascraeus:
[ticket/12822] Fix test runs of avatar manager_test
[ticket/12822] Add method for deleting avatars and use confirm_box
[ticket/12822] Remove "None" option from avatar select boxes
Conflicts:
phpBB/styles/subsilver2/template/ucp_groups_manage.html
phpBB/styles/subsilver2/template/ucp_profile_avatar.html
* github-marc1706/ticket/12822:
[ticket/12822] Fix test runs of avatar manager_test
[ticket/12822] Add method for deleting avatars and use confirm_box
[ticket/12822] Remove "None" option from avatar select boxes
* develop-ascraeus:
[ticket/12938] Remove functional tests for 'Download all attachments'.
[ticket/12938] Remove the 'Download all attachments' feature.
[ticket/12938] Remove the 'Download all attachments' feature.
* bantu/ticket/12938:
[ticket/12938] Remove functional tests for 'Download all attachments'.
[ticket/12938] Remove the 'Download all attachments' feature.
The method will take care of the actual deletion process in the avatar manager.
Additionally, we'll be using a confirm box while deleting the avatar to prevent
users from accidentally deleting their avatars.
PHPBB3-12822
[ticket/12847] Allow the extensions to say if they can be enabled
* Nicofuma/ticket/12847:
[ticket/12847] Allow the extensions to say if they can be enabled
* develop-ascraeus:
[ticket/11148] Remove unneeded variable mimetype and use type octet-stream
[ticket/11148] Change expected output with disallowed content in test
[ticket/11148] Always use the output of the mimetype guesser in get_mimetype
[ticket/11148] Get rid of extra line in mimetype guesser setter doc block
[ticket/11148] Add missing parts to docblock of get_mimetype() method
[ticket/11148] Default to application/octet-stream if no mimetype given
[ticket/11148] Use mimetype guesser for uploaded avatars
[ticket/11148] Pass mimetype guesser to upload_attachment() function
[ticket/11148] Add mimetype guesser to filespec and fileupload class
* github-marc1706/ticket/11148:
[ticket/11148] Remove unneeded variable mimetype and use type octet-stream
[ticket/11148] Change expected output with disallowed content in test
[ticket/11148] Always use the output of the mimetype guesser in get_mimetype
[ticket/11148] Get rid of extra line in mimetype guesser setter doc block
[ticket/11148] Add missing parts to docblock of get_mimetype() method
[ticket/11148] Default to application/octet-stream if no mimetype given
[ticket/11148] Use mimetype guesser for uploaded avatars
[ticket/11148] Pass mimetype guesser to upload_attachment() function
[ticket/11148] Add mimetype guesser to filespec and fileupload class
* develop-ascraeus:
[ticket/11480] Header file
[ticket/11480] Fix unit tests
[ticket/11480] Move the test into get_folder()
[ticket/11480] Fix the double spaces in phpbb_functional_test_case
[ticket/11480] Fix typos
[ticket/11480] Add functionnal test
[ticket/11480] PM : "Unknown folder" returned when inbox folder is full
* ticket/11480:
[ticket/11480] Move the test into get_folder()
[ticket/11480] Fix the double spaces in phpbb_functional_test_case
[ticket/11480] Fix typos
[ticket/11480] Add functionnal test
[ticket/11480] PM : "Unknown folder" returned when inbox folder is full
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
* develop-ascraeus:
[ticket/12818] Use assertGreaterThanOrEqual in the tests
[ticket/12818] Don't use the id for i=
[ticket/12818] Add tests
[ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
* develop-ascraeus:
[ticket/12013] Fix functional tests and sniffer issue.
[ticket/12013] Clear the jumpbox.
[ticket/12013] Add moderator tools icon.
[ticket/12013] Remove obsolete jumpbox and quickmod CSS.
[ticket/12013] Prevent the dropdown scrollbar from overlapping the content.
[ticket/12013] Update to use the new .button class.
[ticket/12013] Add missing class to place the buttons on the rightside.
[ticket/12013] Use the correct variable for the forum id.
[ticket/12013] Use DEFINE instead of Twig's set.
[ticket/12013] Use path helper.
[ticket/12013] Use new dropdown for quickmod tools and jumpbox.
* develop-ascraeus:
[ticket/12783] Move phpbb requirement to extra->soft-require
[ticket/12783] Correctly use dataProviders and mark tests as incomplete
[ticket/12783] Move phpbb/phpbb require version to extra
* develop-ascraeus:
[ticket/11528] Change click_submit() to accept id as param
[ticket/11528] Handle case when config file cant be written by installer
[ticket/11528] Change NULL to null
[ticket/11528] Fix spaces and slashes as per guidelines
[ticket/11528] Add asserts in installation steps
[ticket/11528] Use 'use' keyword to import classes to current scope
[ticket/11528] Move parent::tearDown() to end of tearDown()
[ticket/11528] Call parent::tearDown in overrided tearDown method
[ticket/11528] Instantiate $client, $driver from functional test case
[ticket/11528] Refactor install_board() code into a new class
[ticket/11528] Add behat/mink and mink-goutte-driver as dependency
[ticket/11528] Refactor install_board( ) into a new mink class
* dhruvgoel92/ticket/11528:
[ticket/11528] Change click_submit() to accept id as param
[ticket/11528] Handle case when config file cant be written by installer
[ticket/11528] Change NULL to null
[ticket/11528] Fix spaces and slashes as per guidelines
[ticket/11528] Add asserts in installation steps
[ticket/11528] Use 'use' keyword to import classes to current scope
[ticket/11528] Move parent::tearDown() to end of tearDown()
[ticket/11528] Call parent::tearDown in overrided tearDown method
[ticket/11528] Instantiate $client, $driver from functional test case
[ticket/11528] Refactor install_board() code into a new class
[ticket/11528] Add behat/mink and mink-goutte-driver as dependency
* 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
