* EXreaction/ticket/11413: (23 commits)
[ticket/11413] Revert some cache service related changes from earlier
[ticket/11413] Use phpbb_user in test
[ticket/11413] $user should have been $this->user
[ticket/11413] Fix unit tests
[ticket/11413] Translate the error
[ticket/11413] Rename file to something more helpful
[ticket/11413] Remove remaining irrelevant code to this PR
[ticket/11413] Remove mock sql_insert_buffer.php (not relevant to PR)
[ticket/11413] Remove conversion of user_notifications
[ticket/11413] Correct copyright year
[ticket/11413] Remove changes for ticket 11420 from this branch
[ticket/11413] Include mock class
[ticket/11413] Don't use the database for the convert test
[ticket/11413] Test get_notification_type_id and _ids functions
[ticket/11413] Use sql_insert_buffer
[ticket/11413] Create test for notification conversion
[ticket/11413] Fix test fixtures and tests
[ticket/11413] Fix some more tests
[ticket/11413] Fix notification tests
[ticket/11413] Prevent recursive function calls
...
# By Matt Friedman
# Via Matt Friedman
* VSEphpbb/ticket/10155:
[ticket/10155] Update copyright in new migration file to 2013
[ticket/10155] Make effectively installed test more specific
[ticket/10155] Use more descriptive title for migration file
[ticket/10155] Use new migration file for jQuery config update
[ticket/10155] Update jQuery to 1.8.3
item_type is not equivalent to notification_type_name, it can be a generic
string (typically used to be able to subscribe to multiple notification
types while only subscribing to one item
PHPBB3-11413
Notifications tables are dropped because phpBB currently does not have
any way to make the necessary changes to the DB schema (and no release
has yet been made with these changes).
This will fix the following bugs:
PHPBB3-11411
PHPBB3-11413
PHPBB3-11414
PHPBB3-11416
PHPBB3-11420
PHPBB3-11413
Currently included jQuery is old by now, v1.6.2. We should update to
1.8.3. This allows us to take advantage of the latest form of jQuery
event delegation ($.on). I don't think it wise to update to jQuery
1.9.x yet, as many 3rd party scripts still need to be updated to cope
with its deprecated features ($.browser). Therefor, 1.8.3 is the latest
and most widely compatible stable version right now.
PHPBB3-10155
# 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
