moodle.git
2 years agoMDL-63571 grade_report_grader: Use correct context for capability check
Jun Pataleta [Thu, 22 Nov 2018 08:18:27 +0000 (16:18 +0800)]
MDL-63571 grade_report_grader: Use correct context for capability check

2 years agoMDL-63571 grade_report_grader: Set correct type for the context variable
Jun Pataleta [Thu, 22 Nov 2018 08:19:09 +0000 (16:19 +0800)]
MDL-63571 grade_report_grader: Set correct type for the context variable

2 years agoMerge branch 'MDL-64142-master-1' of git://github.com/mihailges/moodle
Jun Pataleta [Thu, 22 Nov 2018 07:46:01 +0000 (15:46 +0800)]
Merge branch 'MDL-64142-master-1' of git://github.com/mihailges/moodle

2 years agoMerge branch 'MDL-64165_master' of git://github.com/markn86/moodle
Andrew Nicols [Thu, 22 Nov 2018 07:40:41 +0000 (15:40 +0800)]
Merge branch 'MDL-64165_master' of git://github.com/markn86/moodle

2 years agoMDL-64165 core_message: fixed contact requests web service structure
Mark Nelson [Thu, 22 Nov 2018 06:45:50 +0000 (14:45 +0800)]
MDL-64165 core_message: fixed contact requests web service structure

2 years agoMDL-64165 core_message: removed unused params from WS helper method
Mark Nelson [Thu, 22 Nov 2018 06:43:27 +0000 (14:43 +0800)]
MDL-64165 core_message: removed unused params from WS helper method

2 years agoMDL-64142 gradebook: Fix the left hand table column on scroll
Mihail Geshoski [Thu, 22 Nov 2018 04:51:29 +0000 (12:51 +0800)]
MDL-64142 gradebook: Fix the left hand table column on scroll

2 years agoMerge branch 'MDL-64018_master' of git://github.com/markn86/moodle
Andrew Nicols [Thu, 22 Nov 2018 03:03:58 +0000 (11:03 +0800)]
Merge branch 'MDL-64018_master' of git://github.com/markn86/moodle

2 years agoMerge branch 'MDL-64092-master' of git://github.com/peterRd/moodle
Andrew Nicols [Thu, 22 Nov 2018 02:16:23 +0000 (10:16 +0800)]
Merge branch 'MDL-64092-master' of git://github.com/peterRd/moodle

2 years agoMerge branch 'MDL-64119-master' of git://github.com/sarjona/moodle
Jun Pataleta [Thu, 22 Nov 2018 01:52:56 +0000 (09:52 +0800)]
Merge branch 'MDL-64119-master' of git://github.com/sarjona/moodle

2 years agoMerge branch 'MDL-63920-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Wed, 21 Nov 2018 15:47:14 +0000 (16:47 +0100)]
Merge branch 'MDL-63920-master' of git://github.com/damyon/moodle

2 years agoMerge branch 'MDL-64129-master' of git://github.com/bmbrands/moodle
Eloy Lafuente (stronk7) [Wed, 21 Nov 2018 15:18:56 +0000 (16:18 +0100)]
Merge branch 'MDL-64129-master' of git://github.com/bmbrands/moodle

2 years agoMerge branch 'MDL-64149-master' of git://github.com/sarjona/moodle
Eloy Lafuente (stronk7) [Wed, 21 Nov 2018 15:14:42 +0000 (16:14 +0100)]
Merge branch 'MDL-64149-master' of git://github.com/sarjona/moodle

2 years agoMerge branch 'MDL-63798_assign_restore_groups' of git://github.com/davosmith/moodle
Eloy Lafuente (stronk7) [Wed, 21 Nov 2018 15:05:32 +0000 (16:05 +0100)]
Merge branch 'MDL-63798_assign_restore_groups' of git://github.com/davosmith/moodle

2 years agoMerge branch 'MDL-64079-master' of https://github.com/Dagefoerde/moodle
Jun Pataleta [Wed, 21 Nov 2018 14:44:16 +0000 (22:44 +0800)]
Merge branch 'MDL-64079-master' of https://github.com/Dagefoerde/moodle

2 years agoMDL-64149 core_badges: Remove and deprecate unused strings
Sara Arjona [Wed, 21 Nov 2018 12:06:52 +0000 (13:06 +0100)]
MDL-64149 core_badges: Remove and deprecate unused strings

2 years agoMDL-64129 messaging: messaging accordion
Bas Brands [Wed, 21 Nov 2018 10:06:27 +0000 (11:06 +0100)]
MDL-64129 messaging: messaging accordion

* fixes open / close chevron icons
* add 1 pixel content for Bootstrap 2 accordion Javascript to work

2 years agoMDL-64079 oauth2: Test access token expiration
Jun Pataleta [Wed, 21 Nov 2018 06:52:45 +0000 (14:52 +0800)]
MDL-64079 oauth2: Test access token expiration

2 years agoMDL-64079 oauth2: Set an arbitrary expiration date for eternal tokens
Jan Dageförde [Mon, 19 Nov 2018 10:30:27 +0000 (11:30 +0100)]
MDL-64079 oauth2: Set an arbitrary expiration date for eternal tokens

The oauth2 standard does not require access tokens to have an
expiration date. This assumes a default validity period of 7 days unless
an explicit expiration date is communicated by the server.

2 years agoMerge branch 'MDL-63591_master' of git://github.com/markn86/moodle
David Monllao [Wed, 21 Nov 2018 08:40:59 +0000 (09:40 +0100)]
Merge branch 'MDL-63591_master' of git://github.com/markn86/moodle

2 years agoMDL-63591 core_grades: updated privacy provider
Mark Nelson [Thu, 27 Sep 2018 01:40:18 +0000 (11:40 +1000)]
MDL-63591 core_grades: updated privacy provider

2 years agoMDL-63591 core_grades: delete files when grade object is deleted
Mark Nelson [Fri, 16 Nov 2018 03:23:59 +0000 (11:23 +0800)]
MDL-63591 core_grades: delete files when grade object is deleted

2 years agoMDL-63798 mod_assign: fix restore when group is missing
Davo Smith [Mon, 29 Oct 2018 09:26:58 +0000 (09:26 +0000)]
MDL-63798 mod_assign: fix restore when group is missing

2 years agoMerge branch 'MDL-64136-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Wed, 21 Nov 2018 06:48:31 +0000 (14:48 +0800)]
Merge branch 'MDL-64136-master' of git://github.com/ryanwyllie/moodle

2 years agoMDL-63591 assignfeedback_comments: fix privacy provider file URLs
Mark Nelson [Wed, 14 Nov 2018 04:19:30 +0000 (12:19 +0800)]
MDL-63591 assignfeedback_comments: fix privacy provider file URLs

2 years agoMDL-64092 block_timeline: Separate the activity view and submission link
Peter [Tue, 20 Nov 2018 03:38:51 +0000 (11:38 +0800)]
MDL-64092 block_timeline: Separate the activity view and submission link

* Reintroduce separate links similar to 35
* Hide submission links if not actionable

2 years agoMDL-64136 message: remove unused message_drawer_view_contacts_section.js
Ryan Wyllie [Wed, 21 Nov 2018 06:07:42 +0000 (14:07 +0800)]
MDL-64136 message: remove unused message_drawer_view_contacts_section.js

2 years agoMerge branch 'MDL-64128-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Wed, 21 Nov 2018 06:04:27 +0000 (14:04 +0800)]
Merge branch 'MDL-64128-master' of git://github.com/ryanwyllie/moodle

2 years agoMerge branch 'MDL-64063-master' of git://github.com/abgreeve/moodle
David Monllao [Wed, 21 Nov 2018 05:27:09 +0000 (06:27 +0100)]
Merge branch 'MDL-64063-master' of git://github.com/abgreeve/moodle

2 years agoMerge branch 'MDL-64091-master' of git://github.com/mickhawkins/moodle
Jun Pataleta [Wed, 21 Nov 2018 04:21:15 +0000 (12:21 +0800)]
Merge branch 'MDL-64091-master' of git://github.com/mickhawkins/moodle

2 years agoMDL-64128 message: fix exception when declining contact request
Ryan Wyllie [Wed, 21 Nov 2018 03:45:24 +0000 (11:45 +0800)]
MDL-64128 message: fix exception when declining contact request

2 years agoMerge branch 'MDL-64078-master' of https://github.com/Dagefoerde/moodle
Jun Pataleta [Wed, 21 Nov 2018 03:17:38 +0000 (11:17 +0800)]
Merge branch 'MDL-64078-master' of https://github.com/Dagefoerde/moodle

2 years agoMDL-64018 core_message: use new web service in UI
Mark Nelson [Tue, 20 Nov 2018 12:39:45 +0000 (20:39 +0800)]
MDL-64018 core_message: use new web service in UI

2 years agoMDL-64018 core_message: added external::get_user_contacts
Mark Nelson [Tue, 20 Nov 2018 04:01:01 +0000 (12:01 +0800)]
MDL-64018 core_message: added external::get_user_contacts

This is to replace usages of external::data_for_messagearea_contacts
in the new UI.

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 agoMDL-64091 theme_clean: Fix conflicting CSS for icon-size-* class
Michael Hawkins [Tue, 20 Nov 2018 04:37:42 +0000 (12:37 +0800)]
MDL-64091 theme_clean: Fix conflicting CSS for icon-size-* class

2 years agoMerge branch 'MDL-64054-master' of git://github.com/ryanwyllie/moodle
Damyon Wiese [Wed, 21 Nov 2018 02:07:42 +0000 (10:07 +0800)]
Merge branch 'MDL-64054-master' of git://github.com/ryanwyllie/moodle

2 years agoMerge branch 'MDL-64045-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Wed, 21 Nov 2018 01:58:50 +0000 (09:58 +0800)]
Merge branch 'MDL-64045-master' of git://github.com/ryanwyllie/moodle

2 years agoMDL-64063 core_calendar: Unit test for suspended users.
Adrian Greeve [Mon, 19 Nov 2018 02:08:48 +0000 (10:08 +0800)]
MDL-64063 core_calendar: Unit test for suspended users.

2 years agoMDL-64063 core_calendar: events by time considers enrolment status.
Adrian Greeve [Mon, 19 Nov 2018 02:07:39 +0000 (10:07 +0800)]
MDL-64063 core_calendar: events by time considers enrolment status.

2 years agoMDL-64045 message: stop favouriting null conversations
Ryan Wyllie [Tue, 20 Nov 2018 07:08:32 +0000 (15:08 +0800)]
MDL-64045 message: stop favouriting null conversations

Don't show the controls to favourite a conversation until one has been
created.

2 years agoMerge branch 'MDL-64077-master' of git://github.com/vmdef/moodle
Andrew Nicols [Wed, 21 Nov 2018 00:10:59 +0000 (08:10 +0800)]
Merge branch 'MDL-64077-master' of git://github.com/vmdef/moodle

2 years agoMDL-64119 user: Display full names consistently for teachers
Sara Arjona [Tue, 20 Nov 2018 14:05:36 +0000 (15:05 +0100)]
MDL-64119 user: Display full names consistently for teachers

Fix an error with users with the moodle/site:viewfullnames capability
in a course context (like teachers), to display properly the full
names in pages like the participants one.

2 years agoMerge branch 'MDL-63571-master' of git://github.com/peterRd/moodle
David Monllao [Tue, 20 Nov 2018 16:19:11 +0000 (17:19 +0100)]
Merge branch 'MDL-63571-master' of git://github.com/peterRd/moodle

2 years agoMDL-64078 oauth2: Google service relies on autodiscovery
Jan Dageförde [Mon, 19 Nov 2018 09:23:28 +0000 (10:23 +0100)]
MDL-64078 oauth2: Google service relies on autodiscovery

2 years agoMDL-64077 block_site_main: modify style to fix layout in boost theme
Víctor Déniz Falcón [Tue, 20 Nov 2018 13:08:13 +0000 (13:08 +0000)]
MDL-64077 block_site_main: modify style to fix layout in boost theme

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 agoMDL-63920 backup: Email string improvement
Damyon Wiese [Tue, 20 Nov 2018 08:14:35 +0000 (16:14 +0800)]
MDL-63920 backup: Email string improvement

Change from semicolon to colon in email.

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 agoMDL-63571 gradebook: Display the name header based on config setting
Peter [Tue, 20 Nov 2018 05:58:20 +0000 (13:58 +0800)]
MDL-63571 gradebook: Display the name header based on config setting

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-64054 message: add all processors to message settings
Ryan Wyllie [Mon, 19 Nov 2018 06:30:23 +0000 (14:30 +0800)]
MDL-64054 message: add all processors to message settings

Changed the settings page in the message drawer to display all message
notification processors (e.g. email, mobile, jabber) for the user to
configure based on which processors are enabled on the site.

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