* github-nickvergessen/ticket/12612-ascraeus:
[ticket/12612] Move functions from mcp.php to functions_mcp.php
[ticket/12612] Move function from ucp.php to functions_user.php
[ticket/12612] Move functions from memberlist.php to functions_display.php
[ticket/12612] Move functions from posting.php to functions_posting.php
Add two new events to user_add function
in ./includes/functions_user.php.
core.user_add_before - allow modification of
submitted to function data.
Returns:
@var array $user_row - user_row array - User array
@var array $cp_data - cp_data array - CPF array
core.user_add_after - return user_id, user_row and
cp_data after user registration
Returns:
@var int $user_id - user_id of the new user
@var array $user_row - user_row array - User array
@var array $cp_data - cp_data array - CPF array
Justification:
Allow extensions to parse data before and after
creation of the user.
PHPBB3-12701
* github-marc1706/ticket/12352: (33 commits)
[ticket/12352] Do not check hashes that don't have the necessary length
[ticket/12352] Update file headers to fit new format
[ticket/12352] Use custom provider collection for auth providers
[ticket/12352] Add checks for existing user_pass_convert to migrations
[ticket/12352] Remove usages of user_pass_convert column
[ticket/12352] Update schema json file
[ticket/12352] Remove user_pass_convert column from database
[ticket/12352] Check each newly added passwords driver in manager_test
[ticket/12352] Add get_settings_only method to passwords driver base
[ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords
[ticket/12352] Add tests for wcf1 and wcf2 drivers
[ticket/12352] Add driver for woltlab community framework 1 passwords
[ticket/12352] Add driver for woltlab community framework 2 passwords
[ticket/12352] Add missing $ to md5_mybb and md5_vb driver
[ticket/12352] Fix spacing in passwords tests
[ticket/12352] Add passwords driver for vB passwords
[ticket/12352] Use correct hashing method in md5_mybb driver
[ticket/12352] Add driver for myBB md5 passwords
[ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
[ticket/12352] Add passwords driver for sha1 password hashes
...
* github-exreaction/ticket/8323:
[ticket/8323] Cache auth request
[ticket/8323] Combine into a single query
[ticket/8323] Comments on phpbb_get_banned_user_ids input for test
[ticket/8323] More readability in test case
[ticket/8323] Comments
[ticket/8323] dataProvider for the test; better test data
[ticket/8323] Comments
[ticket/8323] Unit test for phpbb_get_banned_user_ids
[ticket/8323] Comments for inactive reasons in constants.php
[ticket/8323] Only disable administrative deactivated accounts from receiving PMs
[ticket/8323] Allow temporarily banned users to receive PMs, but not a notification
[ticket/8323] Correct PM notification settings (only notify those who can receive them)
[ticket/8323] Cleanup viewtopic code (not sure how this mess happened)
[ticket/8323] Allow sending PMs to temporarily banned users
[ticket/8323] Do not allow sending PMs to Inactive users
[ticket/8323] Hide the Send PM link if users cannot receive the PM
[ticket/8323] Correcting the comment
[ticket/8323] Do not allow sending of Private Messages to users who are banned
[ticket/8323] Remove code used for testing
[ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages
Conflicts:
phpBB/language/en/ucp.php
* github-nickvergessen/ticket/12273: (55 commits)
[ticket/12273] Move $extension to constructor so the path is always set
[ticket/12273] Find events.md relative from the path not the phpbb root
[ticket/12273] Do not look in extensions docs/ and tests/ directory
[ticket/12273] Also check file for adm "Location:" events
[ticket/12273] Do not allow template events in non-html files
[ticket/12273] Fix return description
[ticket/12273] Update exporter to allow specifying an extension
[ticket/12273] Allow to filter events for extensions
[ticket/12273] Remove old parameter from function call
[ticket/12273] Fix table header for adm events
[ticket/12273] Add root path to recursive_event_filter_iterator
[ticket/12273] Fix missing classes in export_events_for_wiki.php
[ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter
[ticket/12273] Use RecursiveDirectoryIterator in md_exporter
[ticket/12273] Fix doc blocks
[ticket/12273] Do not allow 3.1-A1 for template events
[ticket/12273] Sort arguments alphabetically before exporting
[ticket/12273] Do not allow 3.1-A1 version
[ticket/12273] Update since version to 3.1.0-a* style
[ticket/12273] Update existing events
...
* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.
PHPBB3-12458
* Marc/ticket/11842:
[ticket/11842] Add functional test for creating group
[ticket/11842] Use avatar_data for obtaining driver that should be deleted
[ticket/11842] Use type map for updating avatar types in database
[ticket/11842] Add missing prefix for group id in avatar data
[ticket/11842] Use only new avatar type in user_delete function
[ticket/11842] Add migration file for updating avatar type in database
[ticket/11842] Replace outdated occurences of user and group avatar_type
[ticket/11842] Use group_id 0 and correct avatar name after creating group
It seems like the function group_correct_avatar() was forgotten while adding
the new avatar system. We now pass the group_id 0 to the upload avatar and
let the function group_correct_avatar() fix the avatar filename after creating
the group like it was done previously.
PHPBB3-11842
The prune-users feature modified the names of the used variables in this
function. However, the variable names for the two events in this function
were not changed to reflect that. This patch will take care of it.
PHPBB3-11862
* github-phpbb/develop: (586 commits)
[ticket/11735] Display disabled checkbox in subsilver for read notifications
[ticket/11735] Display disabled checkbox when notification is already read
[ticket/11844] update acp/authentication language var
[ticket/11795] Remove PM popup
[ticket/11795] Remove outdated comment from forum_fn.js
[ticket/11795] Move find user JS to forum_fn
[ticket/11795] Replace TWIG with phpBB syntax in ACP
[ticket/11795] Move MSN scripts to forum_fn.js
[ticket/11795] Use phpBB template syntax instead of TWIG
[ticket/11795] Move PM popup JS to forum_fn.js
[ticket/11795] Get rid of pagination JS variables
[ticket/11795] Get rid of onload_functions
[ticket/11795] Use data-reset-on-edit attr to reset elements
[ticket/11795] Redo form elements auto-focus
[ticket/11811] Remove outline on :focus
[ticket/11836] Fix subsilver fatal error
[ticket/11837] Replace escaped single quote with utf-8 single quote
[ticket/11836] Fix fatal error on unsupported provider for auth link
[ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
[ticket/11809] Ensure code.js is first script included after jQuery
...
Conflicts:
phpBB/config/services.yml
phpBB/develop/create_schema_files.php
phpBB/develop/mysql_upgrader.php
phpBB/download/file.php
phpBB/includes/bbcode.php
phpBB/includes/functions_container.php
phpBB/install/database_update.php
phpBB/install/index.php
phpBB/phpbb/controller/helper.php
phpBB/phpbb/controller/resolver.php
phpBB/phpbb/request/request_interface.php
phpBB/phpbb/session.php
phpBB/phpbb/style/extension_path_provider.php
phpBB/phpbb/style/path_provider.php
phpBB/phpbb/style/path_provider_interface.php
phpBB/phpbb/style/resource_locator.php
phpBB/phpbb/style/style.php
phpBB/phpbb/template/locator.php
phpBB/phpbb/template/template.php
phpBB/phpbb/template/twig/node/includeasset.php
phpBB/phpbb/template/twig/node/includecss.php
phpBB/phpbb/template/twig/node/includejs.php
phpBB/phpbb/template/twig/twig.php
tests/controller/helper_url_test.php
tests/di/create_container_test.php
tests/extension/style_path_provider_test.php
tests/notification/notification_test.php
tests/session/continue_test.php
tests/session/creation_test.php
tests/template/template_events_test.php
tests/template/template_test_case.php
tests/template/template_test_case_with_tree.php
tests/test_framework/phpbb_functional_test_case.php
# By Joas Schilling (613) and others
# Via Andreas Fischer (214) and others
* 'develop' of github.com:phpbb/phpbb3: (2494 commits)
[ticket/11825] Move schema_data.php into includes/ instead of phpbb/
[ticket/11215] Remove unnecessary comment
[ticket/11755] MySQL upgrader out of date
[prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
[ticket/11823] Set up nginx server to match PHP files with characters after .php
[ticket/11812] Fix empty define
[ticket/11818] Update Symfony dependencies to 2.3.*
[ticket/11791] Load adm/ events from styles/adm/event/
[ticket/11215] Fix helper_url_test.php tests
[ticket/11215] Add newline back to .htaccess, fix wording
[ticket/11215] Update comment in .htaccess
[ticket/11215] Uncomment rewrite rules in .htaccess
[ticket/11215] Make controller helper url() method use correct format
[ticket/11215] Add commented-out URL rewrite capability to .htaccess
[ticket/11821] Fix comma usage next to "You are receiving this notification".
[ticket/11769] Allow using 0 as poster name
[ticket/11769] Allow '0' as username
[ticket/11215] Use new URL structure for controllers
[ticket/11215] Everything appears to be working...
...
Conflicts:
phpBB/includes/functions_privmsgs.php
