moodle.git
2 years agoMDL-64018 core_message: added api::get_user_contacts
Mark Nelson [Tue, 20 Nov 2018 04:00:38 +0000 (12:00 +0800)]
MDL-64018 core_message: added api::get_user_contacts

This is to replace api::get_contacts when that gets deprecated.

2 years agoMDL-64018 core_message: deprecated get_contacts web service
Mark Nelson [Tue, 20 Nov 2018 03:32:02 +0000 (11:32 +0800)]
MDL-64018 core_message: deprecated get_contacts web service

2 years agoon-demand release 3.6beta+
David Monllao [Tue, 20 Nov 2018 11:55:28 +0000 (12:55 +0100)]
on-demand release 3.6beta+

2 years agoMerge branch 'MDL-63692-master-fix' of git://github.com/junpataleta/moodle
Jun Pataleta [Tue, 20 Nov 2018 06:48:08 +0000 (14:48 +0800)]
Merge branch 'MDL-63692-master-fix' of git://github.com/junpataleta/moodle

2 years agoMDL-63692 message: Set canonicalize to true for array comparison
Jun Pataleta [Tue, 20 Nov 2018 06:41:40 +0000 (14:41 +0800)]
MDL-63692 message: Set canonicalize to true for array comparison

2 years agoMDL-63692 message: Correct favourite fetch
Andrew Nicols [Tue, 20 Nov 2018 06:34:49 +0000 (14:34 +0800)]
MDL-63692 message: Correct favourite fetch

2 years agoMDL-63692 message: Fix unit test assumption
Andrew Nicols [Tue, 20 Nov 2018 06:28:58 +0000 (14:28 +0800)]
MDL-63692 message: Fix unit test assumption

Contact requests do not cause notifications.

2 years agoMerge branch 'MDL-63921-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Tue, 20 Nov 2018 05:54:14 +0000 (13:54 +0800)]
Merge branch 'MDL-63921-master' of git://github.com/andrewnicols/moodle

2 years agoMerge branch 'MDL-64024-master' of git://github.com/snake/moodle
Andrew Nicols [Tue, 20 Nov 2018 04:26:09 +0000 (12:26 +0800)]
Merge branch 'MDL-64024-master' of git://github.com/snake/moodle

2 years agoMerge branch 'MDL-63663-master' of git://github.com/bmbrands/moodle
Jun Pataleta [Tue, 20 Nov 2018 03:59:29 +0000 (11:59 +0800)]
Merge branch 'MDL-63663-master' of git://github.com/bmbrands/moodle

2 years agoMerge branch 'MDL-63817-master' of git://github.com/peterRd/moodle
Jun Pataleta [Tue, 20 Nov 2018 03:20:23 +0000 (11:20 +0800)]
Merge branch 'MDL-63817-master' of git://github.com/peterRd/moodle

2 years agoMDL-64024 message: Fix lib::get_messages to get only individual messages
Sara Arjona [Thu, 15 Nov 2018 12:33:43 +0000 (13:33 +0100)]
MDL-64024 message: Fix lib::get_messages to get only individual messages

From 3.6 users can have also group conversations, so it's needed to review
the messages_get_messages function to make sure only returns the
individual messages between 2 users.

2 years agoMerge branch 'MDL-64058-master' of https://github.com/snake/moodle
Andrew Nicols [Tue, 20 Nov 2018 02:22:41 +0000 (10:22 +0800)]
Merge branch 'MDL-64058-master' of https://github.com/snake/moodle

2 years agoMDL-63692 message: Resolve bad merge conflict
Andrew Nicols [Tue, 20 Nov 2018 01:02:16 +0000 (09:02 +0800)]
MDL-63692 message: Resolve bad merge conflict

2 years agoMDL-63817 block_timeline: Fixed behat test and clean template
Peter [Tue, 20 Nov 2018 01:00:44 +0000 (09:00 +0800)]
MDL-63817 block_timeline: Fixed behat test and clean template

2 years agoMDL-64058 core_message: fix logic driving conversation section expansion
Jake Dallimore [Mon, 19 Nov 2018 07:32:59 +0000 (15:32 +0800)]
MDL-64058 core_message: fix logic driving conversation section expansion

Unread conversations should be given priority over read. If one or more
sections have unread conversations, prioritise favourites over group and
group over individual. The same applies if all conversations are read.

2 years agoMerge branch 'MDL-63692-master' of git://github.com/sarjona/moodle
Andrew Nicols [Mon, 19 Nov 2018 23:51:40 +0000 (07:51 +0800)]
Merge branch 'MDL-63692-master' of git://github.com/sarjona/moodle

2 years agoMerge branch 'MDL-64049-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 19 Nov 2018 23:26:09 +0000 (00:26 +0100)]
Merge branch 'MDL-64049-master' of git://github.com/andrewnicols/moodle

2 years agoMerge branch 'MDL-63976-master-enfix' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 19 Nov 2018 21:17:44 +0000 (22:17 +0100)]
Merge branch 'MDL-63976-master-enfix' of git://github.com/mudrd8mz/moodle

2 years agoMDL-63692 core_message: Add favourite conversations to Privacy API
Sara Arjona [Mon, 12 Nov 2018 19:15:35 +0000 (20:15 +0100)]
MDL-63692 core_message: Add favourite conversations to Privacy API

2 years agoMDL-63692 core_message: Fix the context for favourite conversations
Sara Arjona [Mon, 19 Nov 2018 18:21:38 +0000 (19:21 +0100)]
MDL-63692 core_message: Fix the context for favourite conversations

The converation favourites were previously set in the system context
which is not right, as they should be stored:
- In the conversation context when defined.
- In the user context, when contextid is null (that means is an
individual conversation).

2 years agoMDL-63692 core_group: Add group conversation messages to Privacy API
Sara Arjona [Mon, 12 Nov 2018 18:24:23 +0000 (19:24 +0100)]
MDL-63692 core_group: Add group conversation messages to Privacy API

2 years agoMDL-63692 core_message: Add conversation support to Privacy API
Sara Arjona [Mon, 12 Nov 2018 18:09:21 +0000 (19:09 +0100)]
MDL-63692 core_message: Add conversation support to Privacy API

2 years agoMerge branch 'MDL-63394-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 19 Nov 2018 18:42:06 +0000 (19:42 +0100)]
Merge branch 'MDL-63394-master' of git://github.com/jleyva/moodle

2 years agoMDL-63976 lang: Update the Behat scenarios with the new strings
David Mudrák [Mon, 19 Nov 2018 10:51:10 +0000 (11:51 +0100)]
MDL-63976 lang: Update the Behat scenarios with the new strings

2 years agoMDL-63976 lang: Merge English strings from the en_fix language pack
Helen Foster [Mon, 19 Nov 2018 10:14:12 +0000 (11:14 +0100)]
MDL-63976 lang: Merge English strings from the en_fix language pack

Significant string changes:

* courseoverviewfiles, courseoverviewfiles_help, courseoverviewfilesext
  in core, configcourseoverviewfilesext, configcourseoverviewfileslimit
  in core_admin, areacourseoverviewfiles in core_repository - renaming
  of 'Course summary files' to 'Course image'

2 years agoMDL-64008 badges: Stop displaying empty fields in badge display.
Adrian Greeve [Thu, 15 Nov 2018 07:08:16 +0000 (15:08 +0800)]
MDL-64008 badges: Stop displaying empty fields in badge display.

2 years agoMDL-64060 message: Replace error code by language str
David Monllao [Mon, 19 Nov 2018 10:18:39 +0000 (11:18 +0100)]
MDL-64060 message: Replace error code by language str

2 years agoMerge branch 'MDL-64060-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 19 Nov 2018 10:16:09 +0000 (11:16 +0100)]
Merge branch 'MDL-64060-master' of git://github.com/jleyva/moodle

2 years agoMerge branch 'MDL-64010-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 19 Nov 2018 10:12:09 +0000 (11:12 +0100)]
Merge branch 'MDL-64010-master' of git://github.com/abgreeve/moodle

2 years agoMDL-63817 block_timeline: Consistent activities limit default
David Monllao [Mon, 19 Nov 2018 09:57:13 +0000 (10:57 +0100)]
MDL-63817 block_timeline: Consistent activities limit default

2 years agoMerge branch 'MDL-63817-master' of git://github.com/peterRd/moodle
David Monllao [Mon, 19 Nov 2018 09:49:15 +0000 (10:49 +0100)]
Merge branch 'MDL-63817-master' of git://github.com/peterRd/moodle

2 years agoMerge branch 'MDL-63973-master' of https://github.com/snake/moodle
Damyon Wiese [Mon, 19 Nov 2018 08:28:13 +0000 (16:28 +0800)]
Merge branch 'MDL-63973-master' of https://github.com/snake/moodle

2 years agoMerge branch 'MDL-63994-master-castoken' of git://github.com/mudrd8mz/moodle
Jun Pataleta [Mon, 19 Nov 2018 07:51:38 +0000 (15:51 +0800)]
Merge branch 'MDL-63994-master-castoken' of git://github.com/mudrd8mz/moodle

2 years agoMerge branch 'MDL-64035-master' of https://github.com/snake/moodle
Andrew Nicols [Mon, 19 Nov 2018 07:08:22 +0000 (15:08 +0800)]
Merge branch 'MDL-64035-master' of https://github.com/snake/moodle

2 years agoMerge branch 'MDL-63487-master' of https://github.com/lucaboesch/moodle
David Monllao [Mon, 19 Nov 2018 07:07:05 +0000 (08:07 +0100)]
Merge branch 'MDL-63487-master' of https://github.com/lucaboesch/moodle

2 years agoMerge branch 'MDL-63913-master' of https://github.com/snake/moodle
Andrew Nicols [Mon, 19 Nov 2018 06:59:39 +0000 (14:59 +0800)]
Merge branch 'MDL-63913-master' of https://github.com/snake/moodle

2 years agoMDL-63817 block_timeline: Persist page limits when sorting by dates
Peter [Fri, 2 Nov 2018 06:45:38 +0000 (14:45 +0800)]
MDL-63817 block_timeline: Persist page limits when sorting by dates

* Included privacy provider for new pref with unit test
* JS changes

2 years agoMerge branch 'MDL-63696-master' of https://github.com/Dagefoerde/moodle
Damyon Wiese [Mon, 19 Nov 2018 06:51:46 +0000 (14:51 +0800)]
Merge branch 'MDL-63696-master' of https://github.com/Dagefoerde/moodle

2 years agoMDL-64058 core_message: add unread counts to the conversations view
Jake Dallimore [Mon, 19 Nov 2018 03:56:37 +0000 (11:56 +0800)]
MDL-64058 core_message: add unread counts to the conversations view

2 years agoMDL-63913 core_message: fix to ensure favourites is exclusive
Jake Dallimore [Mon, 19 Nov 2018 05:51:40 +0000 (13:51 +0800)]
MDL-63913 core_message: fix to ensure favourites is exclusive

If a conversation is included in the favourites unread count, it
cannot be included in any other type-based counts.

2 years agoMerge branch 'MDL-63768-master' of https://github.com/lucaboesch/moodle
David Monllao [Mon, 19 Nov 2018 05:06:20 +0000 (06:06 +0100)]
Merge branch 'MDL-63768-master' of https://github.com/lucaboesch/moodle

2 years agoMerge branch 'MDL-64034-master' of https://github.com/snake/moodle
Jun Pataleta [Mon, 19 Nov 2018 04:59:22 +0000 (12:59 +0800)]
Merge branch 'MDL-64034-master' of https://github.com/snake/moodle

2 years agoMerge branch 'MDL-63969-master-4' of git://github.com/mihailges/moodle
Andrew Nicols [Mon, 19 Nov 2018 04:27:37 +0000 (12:27 +0800)]
Merge branch 'MDL-63969-master-4' of git://github.com/mihailges/moodle

2 years agoMDL-64049 core: Cache prefs for current user
Andrew Nicols [Fri, 16 Nov 2018 05:58:54 +0000 (13:58 +0800)]
MDL-64049 core: Cache prefs for current user

We were already caching these preferences when a user object is provided
to get_user_preferences, or when $USER is provided.

This changee swaps get_user_preferences to use the global USER object
when the USER->id matches the userid supplied to the function.

2 years agoMDL-63973 core_badges: exclude related badges when adding related badges
Jake Dallimore [Mon, 19 Nov 2018 03:19:12 +0000 (11:19 +0800)]
MDL-63973 core_badges: exclude related badges when adding related badges

The form which allows a user to add related badges should exclude any
related badges, regardless of the direction of the relationship.

2 years agoMDL-63973 core_badges: fix related badges count in the badges tabs
Jake Dallimore [Mon, 19 Nov 2018 03:06:15 +0000 (11:06 +0800)]
MDL-63973 core_badges: fix related badges count in the badges tabs

If A is related to B, this should show a 1 count for either A or B.

2 years agoMDL-63973 core_badges: related badges query now works both ways
Jake Dallimore [Thu, 15 Nov 2018 07:54:54 +0000 (15:54 +0800)]
MDL-63973 core_badges: related badges query now works both ways

If A is related to B, then we should be able to view this relationship
from both badge A and badge B. The following badge methods were updated:
- get_related_badges()
- has_related()
- delete_related_badge()

2 years agoMerge branch 'MDL-63468-master-v1' of git://github.com/lameze/moodle
Andrew Nicols [Mon, 19 Nov 2018 02:33:23 +0000 (10:33 +0800)]
Merge branch 'MDL-63468-master-v1' of git://github.com/lameze/moodle

2 years agoMDL-64034 core_message: return conversationid in search_messages()
Jake Dallimore [Fri, 16 Nov 2018 04:27:24 +0000 (12:27 +0800)]
MDL-64034 core_message: return conversationid in search_messages()

2 years agoMDL-63468 mod_quiz: fix stats report visual style
Simey Lameze [Wed, 14 Nov 2018 03:07:43 +0000 (11:07 +0800)]
MDL-63468 mod_quiz: fix stats report visual style

2 years agoMerge branch 'MDL-63793-master' of git://github.com/peterRd/moodle
Andrew Nicols [Mon, 19 Nov 2018 01:57:50 +0000 (09:57 +0800)]
Merge branch 'MDL-63793-master' of git://github.com/peterRd/moodle

2 years agoMerge branch 'MDL-63913-master' of https://github.com/snake/moodle
Andrew Nicols [Mon, 19 Nov 2018 01:56:48 +0000 (09:56 +0800)]
Merge branch 'MDL-63913-master' of https://github.com/snake/moodle

2 years agoMDL-63913 core_message: add method to get unread conversation counts
Jake Dallimore [Wed, 14 Nov 2018 05:58:18 +0000 (13:58 +0800)]
MDL-63913 core_message: add method to get unread conversation counts

2 years agoMDL-63793 block_myoverview: Persist the user's paging limit preference
Peter [Tue, 30 Oct 2018 05:42:14 +0000 (13:42 +0800)]
MDL-63793 block_myoverview: Persist the user's paging limit preference

* providers for paging preferences
* Moved the user pref persistence to the factory
* Added client defined namespace in config
* Define custom client events in the client instead of passing to the
  factory

2 years agoMoodle release 3.6beta v3.6.0-beta
Eloy Lafuente (stronk7) [Sun, 18 Nov 2018 11:38:48 +0000 (12:38 +0100)]
Moodle release 3.6beta

2 years agoMerge branch 'MDL-64066' of git://github.com/stronk7/moodle
Jun Pataleta [Sat, 17 Nov 2018 17:02:24 +0000 (01:02 +0800)]
Merge branch 'MDL-64066' of git://github.com/stronk7/moodle

2 years agoMDL-64066 behat: increase data export sizes, we were hitting them
Eloy Lafuente (stronk7) [Sat, 17 Nov 2018 11:11:05 +0000 (12:11 +0100)]
MDL-64066 behat: increase data export sizes, we were hitting them

With MDL-63660 we changed to a bundled moodle.css approach, that
made dowloaded exports size to increase. Although the expected
sizes already were raised in the issue, it seems that some of
them were not enough, so increasing a little bit more.

Side note, we have MDL-63399 about to try to change these tests...

2 years agoMDL-64066 behat: more fixes to dialog names, old "add" steps
Eloy Lafuente (stronk7) [Sat, 17 Nov 2018 00:10:01 +0000 (01:10 +0100)]
MDL-64066 behat: more fixes to dialog names, old "add" steps

2 years agoMDL-64066 behat: fix missing quote preventing jobs to complete
Eloy Lafuente (stronk7) [Fri, 16 Nov 2018 23:16:18 +0000 (00:16 +0100)]
MDL-64066 behat: fix missing quote preventing jobs to complete

2 years agoMDL-63768 atto_link: dialog auto width.
Luca Bösch [Thu, 25 Oct 2018 07:54:01 +0000 (09:54 +0200)]
MDL-63768 atto_link: dialog auto width.

2 years agoMDL-63487 badges: Style "◀ Award badge" and "Revoke badge ▶" buttons
Luca Bösch [Sat, 29 Sep 2018 10:56:22 +0000 (12:56 +0200)]
MDL-63487 badges: Style "◀ Award badge" and "Revoke badge ▶" buttons

2 years agoMDL-63394 mod_quiz: Do not fail overdue if there is a grace period
Juan Leyva [Fri, 16 Nov 2018 15:37:09 +0000 (16:37 +0100)]
MDL-63394 mod_quiz: Do not fail overdue if there is a grace period

2 years agoMDL-64060 message: Use error string identifier instead full message
Juan Leyva [Fri, 16 Nov 2018 12:20:11 +0000 (13:20 +0100)]
MDL-64060 message: Use error string identifier instead full message

The conversationdoesntexist string does not exists but it is better to use an error string catchable by an external client.

2 years agoon-demand release 3.6dev+
Eloy Lafuente (stronk7) [Fri, 16 Nov 2018 11:03:18 +0000 (12:03 +0100)]
on-demand release 3.6dev+

2 years agoNOBUG: Fixed SVG browser compatibility
Eloy Lafuente (stronk7) [Fri, 16 Nov 2018 11:03:16 +0000 (12:03 +0100)]
NOBUG: Fixed SVG browser compatibility

2 years agoMDL-63696 oauth2: Store system account access tokens in DB
Jan Dageförde [Fri, 19 Oct 2018 17:44:02 +0000 (19:44 +0200)]
MDL-63696 oauth2: Store system account access tokens in DB

2 years agoMerge branch 'MDL-63999-master' of git://github.com/lameze/moodle
Jun Pataleta [Fri, 16 Nov 2018 06:36:14 +0000 (14:36 +0800)]
Merge branch 'MDL-63999-master' of git://github.com/lameze/moodle

2 years agoMerge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Fri, 16 Nov 2018 06:15:16 +0000 (14:15 +0800)]
Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle

2 years agoMDL-63303 message: fix bugs in message drawer part 4
Ryan Wyllie [Fri, 16 Nov 2018 06:10:10 +0000 (14:10 +0800)]
MDL-63303 message: fix bugs in message drawer part 4

* Add clarification to delete messages lang strings
* Stop message polling when sending a message to fix UI bug
* Publish update last message event when polling finds more messages
* Remove logged in user from group conversation participants list
* Use user object to fetch user preferences to reduce DB calls
* Remove animated slide transitions because the browser breaks when
  showing some conversations

2 years agoMDL-63999 calendar: double escape event name on templates
Simey Lameze [Wed, 14 Nov 2018 04:30:35 +0000 (12:30 +0800)]
MDL-63999 calendar: double escape event name on templates

2 years agoMDL-63969 core_course: Store favourite courses in the course context
Mihail Geshoski [Fri, 16 Nov 2018 04:20:17 +0000 (12:20 +0800)]
MDL-63969 core_course: Store favourite courses in the course context

The course favourites were previously set in the system context which
is not right as they should be stored in the course context.

2 years agoMDL-63969 core_course: Update course privacy provider unit tests
Mihail Geshoski [Fri, 16 Nov 2018 04:19:46 +0000 (12:19 +0800)]
MDL-63969 core_course: Update course privacy provider unit tests

2 years agoMDL-63969 core_course: Include core_favourites subsystem in provider
Mihail Geshoski [Fri, 16 Nov 2018 04:18:58 +0000 (12:18 +0800)]
MDL-63969 core_course: Include core_favourites subsystem in provider

2 years agoMDL-63969 core_favourites: Add support for removal of context users
Mihail Geshoski [Fri, 16 Nov 2018 04:18:22 +0000 (12:18 +0800)]
MDL-63969 core_favourites: Add support for removal of context users

2 years agoMDL-64035 core_message: get_conversations() excludes disabled chats
Jake Dallimore [Fri, 16 Nov 2018 00:23:34 +0000 (08:23 +0800)]
MDL-64035 core_message: get_conversations() excludes disabled chats

Linked conversations which have been disabled must be excluded from
the results.

2 years agoMerge branch 'MDL-63660-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Fri, 16 Nov 2018 02:54:25 +0000 (10:54 +0800)]
Merge branch 'MDL-63660-master' of git://github.com/junpataleta/moodle

2 years agoMerge branch 'wip-MDL-63854-master' of https://github.com/kwiliarty/moodle
Damyon Wiese [Fri, 16 Nov 2018 02:35:37 +0000 (10:35 +0800)]
Merge branch 'wip-MDL-63854-master' of https://github.com/kwiliarty/moodle

2 years agoMDL-63660 tool_dataprivacy: Increase expected export file size
Jun Pataleta [Fri, 16 Nov 2018 02:30:14 +0000 (10:30 +0800)]
MDL-63660 tool_dataprivacy: Increase expected export file size

2 years agoMDL-64010 badges: Validate URL form fields.
Adrian Greeve [Fri, 16 Nov 2018 02:23:00 +0000 (10:23 +0800)]
MDL-64010 badges: Validate URL form fields.

2 years agoMerge branch 'MDL-64012' of https://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Fri, 16 Nov 2018 00:02:44 +0000 (01:02 +0100)]
Merge branch 'MDL-64012' of https://github.com/timhunt/moodle

2 years agoMerge branch 'MDL-53035-master' of git://github.com/vmdef/moodle
Eloy Lafuente (stronk7) [Thu, 15 Nov 2018 23:35:33 +0000 (00:35 +0100)]
Merge branch 'MDL-53035-master' of git://github.com/vmdef/moodle

2 years agoMDL-63854 competencies, themes: misplaced dropdown arrows
Kevin Wiliarty [Fri, 2 Nov 2018 14:30:53 +0000 (10:30 -0400)]
MDL-63854 competencies, themes: misplaced dropdown arrows

2 years agoMDL-63994 auth_cas: Include the login token in the simulated login form
David Mudrák [Thu, 15 Nov 2018 19:44:03 +0000 (20:44 +0100)]
MDL-63994 auth_cas: Include the login token in the simulated login form

The CAS login process relies on the standard authenticate_user_login()
call to set up the user. So we need to inject the login token to pass
the validation.

2 years agoMDL-63994 login: Improve the logintoken param input
David Mudrák [Thu, 15 Nov 2018 19:35:46 +0000 (20:35 +0100)]
MDL-63994 login: Improve the logintoken param input

The logintoken is supposed to arrive as a part of the login form ($frm)
together with the username and password. So it should be handled the
same way - including the opportunity for the auth plugins to provide the
form data via the loginpage_hook().

This also implies that only logintoken coming as a part of the POST
request are taken into account, which is a good thing and another thin
layer in this security mechanism.

2 years agoMDL-63994 login: Clarify inline comments on loginpage_hook() usage
David Mudrák [Thu, 15 Nov 2018 19:27:58 +0000 (20:27 +0100)]
MDL-63994 login: Clarify inline comments on loginpage_hook() usage

While working on the issue, I found these inline comments outdated and
confusing. The auth plugin types can implement a loginpage_hook()
method, the purpose of which is to inject the $user and/or $frm into
this login/index.php script. The new comments should make it more clear.

Note the second comment mentioned a prelogin_hook() which was an old
name of what is now called loginpage_hook(). It had nothing to do with
the existing pre_loginpage_hook() and was only confusing.

2 years agoMerge branch 'MDL-63832-master' of git://github.com/jleyva/moodle
Jun Pataleta [Thu, 15 Nov 2018 15:12:14 +0000 (23:12 +0800)]
Merge branch 'MDL-63832-master' of git://github.com/jleyva/moodle

2 years agoMerge branch 'MDL-63303_master-deleteduserfix' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Thu, 15 Nov 2018 10:20:36 +0000 (11:20 +0100)]
Merge branch 'MDL-63303_master-deleteduserfix' of https://github.com/markn86/moodle

2 years agoMDL-63303 core_message: dont check online status for deleted users
Mark Nelson [Thu, 15 Nov 2018 09:05:39 +0000 (17:05 +0800)]
MDL-63303 core_message: dont check online status for deleted users

2 years agoMerge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle
Eloy Lafuente (stronk7) [Thu, 15 Nov 2018 10:04:12 +0000 (11:04 +0100)]
Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle

2 years agoMerge branch 'MDL-63303-master-fix' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Thu, 15 Nov 2018 10:01:24 +0000 (11:01 +0100)]
Merge branch 'MDL-63303-master-fix' of git://github.com/andrewnicols/moodle

2 years agoMDL-63303 message: add member formatting to conversation
Ryan Wyllie [Thu, 15 Nov 2018 09:57:44 +0000 (17:57 +0800)]
MDL-63303 message: add member formatting to conversation

Make sure the members are formatted when adding to the state in
a conversation so that any missing data is normalised.

2 years agoMDL-63303 message: Stop WS from removing optional keys
Andrew Nicols [Thu, 15 Nov 2018 09:56:31 +0000 (17:56 +0800)]
MDL-63303 message: Stop WS from removing optional keys

2 years agoMerge branch 'MDL-62287-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Thu, 15 Nov 2018 09:10:54 +0000 (17:10 +0800)]
Merge branch 'MDL-62287-master' of git://github.com/andrewnicols/moodle

2 years agoMerge branch 'MDL-63811' of git://github.com/aolley/moodle
Jun Pataleta [Thu, 15 Nov 2018 09:09:28 +0000 (17:09 +0800)]
Merge branch 'MDL-63811' of git://github.com/aolley/moodle

2 years agoMerge branch 'MDL-64009-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Thu, 15 Nov 2018 08:30:20 +0000 (16:30 +0800)]
Merge branch 'MDL-64009-master' of git://github.com/abgreeve/moodle

2 years agoMDL-63303 behat: Behat fixes
Andrew Nicols [Thu, 15 Nov 2018 08:23:49 +0000 (16:23 +0800)]
MDL-63303 behat: Behat fixes

2 years agoMerge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Thu, 15 Nov 2018 08:25:20 +0000 (16:25 +0800)]
Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle

2 years agoMDL-63303 behat: Behat fixes
Andrew Nicols [Thu, 15 Nov 2018 08:23:49 +0000 (16:23 +0800)]
MDL-63303 behat: Behat fixes

2 years agoMerge branch 'MDL-64011-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Thu, 15 Nov 2018 08:10:21 +0000 (16:10 +0800)]
Merge branch 'MDL-64011-master' of git://github.com/abgreeve/moodle