* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11408] user_jabber instead of jabber
[ticket/10202] Rename method names _all() to _array().
[ticket/10202] Add migration file for config_db_text.
[ticket/10202] Upgrade TEXT to the bigger MTEXT.
[ticket/10202] Improve method documentation.
[ticket/10202] SQL escape the table name.
[ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
[ticket/10202] Define phpbb_config_db_text as a service.
[ticket/10202] Add tests for phpbb_config_db_text.
[ticket/10202] Adjust method names to guidelines.
[ticket/10202] Add database schema for phpbb_config_db_text.
[ticket/10202] Implementation of config options with arbitrary length values.
[ticket/11166] Add ajaxify support to normal ACP confirm_box()
[ticket/11166] Fix several custom confirm templates in prosilver
[ticket/11166] Add caption to AJAX confirm box default template
[ticket/11166] Fix typo in comment
[ticket/11166] Use provided custom templates on AJAX confirm box
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/10202:
[ticket/10202] Rename method names _all() to _array().
[ticket/10202] Add migration file for config_db_text.
[ticket/10202] Upgrade TEXT to the bigger MTEXT.
[ticket/10202] Improve method documentation.
[ticket/10202] SQL escape the table name.
[ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
[ticket/10202] Define phpbb_config_db_text as a service.
[ticket/10202] Add tests for phpbb_config_db_text.
[ticket/10202] Adjust method names to guidelines.
[ticket/10202] Add database schema for phpbb_config_db_text.
[ticket/10202] Implementation of config options with arbitrary length values.
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11166:
[ticket/11166] Add ajaxify support to normal ACP confirm_box()
[ticket/11166] Fix several custom confirm templates in prosilver
[ticket/11166] Add caption to AJAX confirm box default template
[ticket/11166] Fix typo in comment
[ticket/11166] Use provided custom templates on AJAX confirm box
* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11402] Fix undefined index in post/topic_in_queue
[ticket/11400] If email is disabled, disable it for notifications
* 'develop' of https://github.com/phpbb/phpbb3: (799 commits)
[ticket/11402] Fix undefined index in post/topic_in_queue
[ticket/11400] If email is disabled, disable it for notifications
[ticket/11398] Correctly call permission_set method in permission tool
[ticket/11394] Relax Migration Tools
[ticket/11386] Fix missing ;
[ticket/10714] Get log from container in install, update and download/file
[feature/avatars] Update module_auth of ucp module and fix small issues
[ticket/11396] Rename insert_migration to set_migration_state
[ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
[ticket/11393] Give more information on database updater
[ticket/11386] Send list of migrations instead of using load_migrations
[feature/avatars] Add migrations data file for avatars
[feature/avatars] Reduce module auth of ucp avatar settings
[ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
[ticket/10714] Logs are disabled for this page call only
[ticket/6723] Show info that message has been deleted before delivery
[ticket/11385] Fix issue with migration module tool not getting extension module info
[ticket/11386] Fix failing tests from constructor changes
[ticket/11386] Fix circular reference error & serialize error
[ticket/11386] Remove tests that check if finder cache is working
...
Conflicts:
phpBB/assets/javascript/core.js
* 'develop' of https://github.com/phpbb/phpbb3: (234 commits)
[ticket/11398] Correctly call permission_set method in permission tool
[ticket/11394] Relax Migration Tools
[ticket/11386] Fix missing ;
[ticket/10714] Get log from container in install, update and download/file
[feature/avatars] Update module_auth of ucp module and fix small issues
[ticket/11396] Rename insert_migration to set_migration_state
[ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
[ticket/11393] Give more information on database updater
[ticket/11386] Send list of migrations instead of using load_migrations
[feature/avatars] Add migrations data file for avatars
[feature/avatars] Reduce module auth of ucp avatar settings
[ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
[ticket/10714] Logs are disabled for this page call only
[ticket/10411] Fix call to function on non-object $db->...()
[ticket/10411] Remove ajax delete, so the page is refreshed
[feature/avatars] Auto-clear avatar dimensions when first changing avatars
[ticket/10411] Update schema file with new table and remove the column
[ticket/10411] Add unit tests for move() with values >1
[ticket/10411] Add migrations file for teampage table
[ticket/10411] Revert database_update.php changes from for easier update
...
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/10714: (56 commits)
[ticket/10714] Get log from container in install, update and download/file
[ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
[ticket/10714] Logs are disabled for this page call only
[ticket/10714] Update add_log docs block with @param and @deprecated
[ticket/10714] Remove fallback code from previous commits and move global
[ticket/10714] Fix missing parameter and global phpbb_log in unit tests
[ticket/10714] Add getter for is_in_admin and use it
[ticket/10714] Fix more comments
[ticket/10714] Cast values to integer before using them in the query
[ticket/10714] Fix several doc blocks and comments
[ticket/10714] Fix missing 8th argument in unit tests
[ticket/10714] Use new core.adm_relative_path to create the object.
[ticket/10714] Fix several comments and variable names
[ticket/10714] Fix database driver class name
[ticket/10714] Forgot most important, use container to create $phpbb_log
[ticket/10714] Remove type hinting to allow the usage of mocks in tests
[ticket/10714] Fix dependency injections in unit tests with mocks
[ticket/10714] Use dependencies instead of globals
[ticket/10714] Compare log_type to false, rather then null
[ticket/10714] Add global variables for the unit tests
...
