* develop-ascraeus:
[prep-release-3.1.0-RC3] Update phpBB Version for RC4 development
[prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3
[prep-release-3.1.0-RC3] Prepare Changelog
[prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3
[prep-release-3.1.0-RC3] Update version to 3.1.0-RC3
Conflicts:
phpBB/styles/subsilver2/style.cfg
* 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/12932] Remove set_datetime_class method from user class
[ticket/12932] Fix tests and calls to create_datetime
[ticket/12932] Add method for getting the datetime class and allow overriding
Conflicts:
phpBB/config/services.yml
[ticket/12932] Add method for allowing override of \phpbb\datetime class
* marc1706/ticket/12932:
[ticket/12932] Remove set_datetime_class method from user class
[ticket/12932] Fix tests and calls to create_datetime
[ticket/12932] Add method for getting the datetime class and allow overriding
[ticket/12956] Ensure the contact columns have been added before using t...
* nickvergessen/ticket/12956:
[ticket/12956] Ensure the contact columns have been added before using them
[ticket/12794] Properly validate google+ field against valid character set
* marc1706/ticket/12794:
[ticket/12794] Properly validate google+ field against valid character set
* develop-ascraeus:
[ticket/12671] Possibility to use NOT LIKE expression
[ticket/12671] Possibility to use NOT LIKE expression
[ticket/12671] Possibility to use NOT LIKE expression
[ticket/12671] Possibility to use NOT LIKE expression
[ticket/12671] Possibility to use NOT LIKE expression
Ticket/12671 Possibility to use NOT LIKE expression
* Geolim4/ticket/12671:
[ticket/12671] Possibility to use NOT LIKE expression
[ticket/12671] Possibility to use NOT LIKE expression
[ticket/12671] Possibility to use NOT LIKE expression
[ticket/12671] Possibility to use NOT LIKE expression
[ticket/12671] Possibility to use NOT LIKE expression
* develop-ascraeus:
[ticket/12941] Fix remaining Sami complaints.
[ticket/12941] Check for Sami parse errors on Travis CI.
[ticket/12941] Add sami.conf.php for Travis CI.
[ticket/12941] Check for Sami parse errors on Travis CI.
* bantu/ticket/12941:
[ticket/12941] Fix remaining Sami complaints.
[ticket/12941] Check for Sami parse errors on Travis CI.
[ticket/12941] Add sami.conf.php for Travis CI.
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
[ticket/12742] Add sorting back to bookmark notification list of users
[ticket/12742] Add sort options for notification types requiring sorting
[ticket/12742] Remove unneeded sort of users
[ticket/12742] Replace authenticated with authorised
[ticket/12742] Add check for empty $users and add method to fitting methods
[ticket/12742] Add method for getting authenticated recipients
