# 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
...
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11386-3:
[ticket/11386] Fix missing ;
[ticket/11386] Send list of migrations instead of using load_migrations
# By Marc Alexander (100) and others
# Via Marc Alexander (8) and Igor Wiedler (3)
* remotes/marc/feature/avatars: (138 commits)
[feature/avatars] Update module_auth of ucp module and fix small issues
[feature/avatars] Add migrations data file for avatars
[feature/avatars] Reduce module auth of ucp avatar settings
[feature/avatars] Auto-clear avatar dimensions when first changing avatars
[feature/avatars] Use "Main" as category for avatars in root of gallery
[feature/avatars] Remove trailing whitespace from avatar code
[feature/avatars] Pass phpbb_user to prepare and process form functions
[feature/avatars] Document the use of the allowed extensions array
[feature/avatars] Use array for allowed extensions and implode if needed
[feature/avatars] Use deprecated for compatibility function
[feature/avatars] Correct license, copyright and package info
[feature/avatars] Move list of supported formats to avatar driver class
[feature/avatars] Add include of functions_display.php in BC function
[feature/avatars] Add note about when compatibility function was added
[feature/avatars] Add compatibility function for get_user_avatar()
[feature/avatars] Move definition of driver_collection to avatars.yml
[feature/avatars] Remove the obsolete request argument for avatar drivers
[feature/avatars] Add missing @var to docblocks in avatar manager
[feature/avatars] Remove not needed inline style
[feature/avatars] Differentiate tests for get drivers functions
...
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/10411-2: (33 commits)
[ticket/10411] Fix call to function on non-object $db->...()
[ticket/10411] Remove ajax delete, so the page is refreshed
[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
[ticket/10411] Add maxlength to category name input field
[ticket/10411] Test for thrown exceptions when group does not exist
[ticket/10411] Catch exceptions from grouppositions
[ticket/10411] Throw exceptions instead of using trigger_error()
[ticket/10411] Add return values to add/delete function
[ticket/10411] Add return value to move functions
[ticket/10411] Fix typehinting and change private to protected
[ticket/10411] Use template loops instead of defining the html in php files
[ticket/10411] Ensure we only get services that do exist
[ticket/10411] Add a comment why we left join the group table
[ticket/10411] Rename template variable CUR_ to CURRENT_
[ticket/10411] Move globals to the top and use array for cache destroy
[ticket/10411] Use new ajax callback name row_up/row_down
[ticket/10411] Fix logic error when editing/creating a group
...
Reduced the check effectively_installed() to just checking for the config
entry "allow_avatar_gravatar". Also added the missing update of the
module_auth of the ucp_profile avatar mode.
PHPBB3-10018
* 'develop' of https://github.com/phpbb/phpbb3: (255 commits)
[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
[ticket/11386] Forgot to get the migration classes
[ticket/11386] Update tests with new constructors for ext.manager/migrator
[ticket/11386] Use finder to find migration files
[ticket/11363] Fix to make get_module_infos get from all extensions
[ticket/11381] Make finder able to search in all available extensions
[ticket/11103] Revert whitespace changes
[ticket/11103] Few more minor language things
[ticket/11103] Don't call generate_board_url many times
[ticket/11103] Case time in queries as an int
[ticket/11103] Fix effectively installed check
[ticket/11103] Remove padding from notifications for now.
[ticket/11363] Fix a couple bugs and throw errors if the file not found
[ticket/11372] Migrator should only check if effectively installed if not
[ticket/11363] Load module info files for extensions too
[ticket/11103] Notifications Migration file
...
Conflicts:
phpBB/config/services.yml
phpBB/config/tables.yml
Remove dependency of extension manager for migrator.
Keeping load_migrations function for others to use if they desire
but requiring the finder be sent to it in order to use it.
PHPBB3-11386
Previously the avatar types that need to be enabled were hardcoded into
the module auth. This is no longer needed in the new avatar system.
PHPBB3-10018
# By Marc Alexander
# Via Marc Alexander (1) and Nathaniel Guse (1)
* remotes/upstream/develop-olympus:
[ticket/6723] Show info that message has been deleted before delivery
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* remotes/upstream/develop-olympus:
[ticket/11368] Fix background color for PM report rows by using accessing var.
If the message has been deleted before the delivery it will still show in
the message history, although with an empty message. This patch will
change that behavior to showing the info that it has been deleted before
it was delivered in red letters. The red letters ensure that users won't
mistake the info for the actual message.
PHPBB3-6723
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11386:
[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
[ticket/11386] Forgot to get the migration classes
[ticket/11386] Update tests with new constructors for ext.manager/migrator
[ticket/11386] Use finder to find migration files
In the remote avatar and gravatar the dimension input boxes will now be
cleared when changing the avatar. This will only happen once per
page-load. Any input after the first change will not trigger this.
PHPBB3-10018
# By Nathaniel Guse
# Via David King (2) and Nathaniel Guse (1)
* 'develop' of github.com:phpbb/phpbb3:
[ticket/11363] Fix a couple bugs and throw errors if the file not found
[ticket/11372] Migrator should only check if effectively installed if not
[ticket/11363] Load module info files for extensions too
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11363:
[ticket/11363] Fix a couple bugs and throw errors if the file not found
[ticket/11363] Load module info files for extensions too
# By Matt Friedman
# Via Matt Friedman
* remotes/VSE/ticket/11103-VSEphpbb:
[ticket/11103] Remove padding from notifications for now.
[ticket/11103] Add newlines to bottom of css file
[ticket/11103] HTML encode double arrow character
[ticket/11103] Update styling of UCP Notifications in subsilver2
[ticket/11103] Update styling of UCP Notifications in prosilver
[ticket/11103] Update styling of subsilver2 notification modal
[ticket/11103] Update styling of prosilver notification modal
[ticket/11103] Remove title attribute from notification link
# By Nathaniel Guse
# Via David King (2) and Nathaniel Guse (1)
* 'develop' of github.com:phpbb/phpbb3:
[ticket/11370] Effectively installed migrations not inserted into table
[ticket/11369] Reverting migration throws error
