moodle.git
3 years agoMDL-53244 login: Add error message for recaptcha
Mathew May [Fri, 8 Sep 2017 01:09:29 +0000 (13:09 +1200)]
MDL-53244 login: Add error message for recaptcha

3 years agoweekly release 3.4dev
David Monllao [Thu, 7 Sep 2017 09:39:02 +0000 (11:39 +0200)]
weekly release 3.4dev

3 years agoMDL-59657 analytics: No predictions until training is completed
David Monllao [Thu, 7 Sep 2017 05:52:56 +0000 (07:52 +0200)]
MDL-59657 analytics: No predictions until training is completed

3 years agoMerge branch 'MDL-59657_master-fix' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 6 Sep 2017 13:24:12 +0000 (14:24 +0100)]
Merge branch 'MDL-59657_master-fix' of git://github.com/dmonllao/moodle

3 years agoMDL-59657 analytics: Move lang string to correct location
David Monllao [Wed, 6 Sep 2017 12:55:34 +0000 (14:55 +0200)]
MDL-59657 analytics: Move lang string to correct location

3 years agoMerge branch 'MDL-59983-master-enfix' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 6 Sep 2017 11:13:04 +0000 (13:13 +0200)]
Merge branch 'MDL-59983-master-enfix' of git://github.com/mudrd8mz/moodle

3 years agoMDL-59759 enrol: Update behat tests for unenrol confirm dialogue
Andrew Nicols [Wed, 6 Sep 2017 05:42:26 +0000 (13:42 +0800)]
MDL-59759 enrol: Update behat tests for unenrol confirm dialogue

3 years agoMDL-59969 admin: Warn admins if a development libs directory exists
David Mudrák [Tue, 29 Aug 2017 17:01:40 +0000 (19:01 +0200)]
MDL-59969 admin: Warn admins if a development libs directory exists

We can't really control the direct web access to directories in dirroot,
that is part of the server setup. So we at least warn admins as they may
not realize the risks of having directories like vendor or node_modules
exposed.

Credit goes to Petr Škoda for mentioning the PHPUnit issue CVE-2017-9841
to me.

3 years agoMDL-59972 mod_feedback: escape subject when showing the contact form
Marina Glancy [Wed, 30 Aug 2017 03:37:27 +0000 (11:37 +0800)]
MDL-59972 mod_feedback: escape subject when showing the contact form

3 years agoMDL-58953 user: additional test case for user_can_view_profile()
Jake Dallimore [Tue, 29 Aug 2017 02:39:11 +0000 (10:39 +0800)]
MDL-58953 user: additional test case for user_can_view_profile()

3 years agoMDL-58953 user: fix course checking logic in user_can_view_profile()
Jake Dallimore [Tue, 29 Aug 2017 02:38:44 +0000 (10:38 +0800)]
MDL-58953 user: fix course checking logic in user_can_view_profile()

Make sure to check that $user in enrolled in $course before checking
whether the current user has capabilities in that course, and make sure
that we don't check user context caps when handling a specific course.

3 years agoMDL-58762 core: Get full course objects on navigation
Juan Leyva [Wed, 5 Jul 2017 12:18:08 +0000 (13:18 +0100)]
MDL-58762 core: Get full course objects on navigation

The course object passed as parameter to extend_navigation_user
callback contained only a few parameters, some parameters like
showgrades or showreports were missing.
The callback should receive a full course object.

3 years agoMDL-58762 report: Check group permissions in course user reports
Juan Leyva [Tue, 2 May 2017 08:04:55 +0000 (10:04 +0200)]
MDL-58762 report: Check group permissions in course user reports

Teachers were able to see any student report even with forced separated
groups and capability moodle/course:accessallgroups off.

3 years agoMerge branch 'MDL-59753-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Tue, 5 Sep 2017 11:28:53 +0000 (13:28 +0200)]
Merge branch 'MDL-59753-master' of git://github.com/lameze/moodle

3 years agoMDL-59753 core_calendar: apply course filter without reload
Simey Lameze [Mon, 4 Sep 2017 01:04:33 +0000 (09:04 +0800)]
MDL-59753 core_calendar: apply course filter without reload

3 years agoMDL-59753 core_calendar: change course selector to normal select
Simey Lameze [Mon, 4 Sep 2017 01:03:50 +0000 (09:03 +0800)]
MDL-59753 core_calendar: change course selector to normal select

3 years agoMerge branch 'MDL-59759-master-2' of git://github.com/junpataleta/moodle
David Monllao [Tue, 5 Sep 2017 05:25:09 +0000 (07:25 +0200)]
Merge branch 'MDL-59759-master-2' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'm34_MDL-59635_Properly_Escape_Column_Names_Reserved_Words_Proof' of...
Jun Pataleta [Tue, 5 Sep 2017 02:29:48 +0000 (10:29 +0800)]
Merge branch 'm34_MDL-59635_Properly_Escape_Column_Names_Reserved_Words_Proof' of https://github.com/scara/moodle

3 years agoMDL-59672 coding style: whitespace fixes
Eloy Lafuente (stronk7) [Mon, 4 Sep 2017 23:36:36 +0000 (01:36 +0200)]
MDL-59672 coding style: whitespace fixes

3 years agoMerge branch 'MDL-59672-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 4 Sep 2017 23:18:57 +0000 (01:18 +0200)]
Merge branch 'MDL-59672-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'MDL-59696-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Mon, 4 Sep 2017 22:44:10 +0000 (00:44 +0200)]
Merge branch 'MDL-59696-master' of git://github.com/junpataleta/moodle

3 years agoMerge branch 'MDL-59198-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Mon, 4 Sep 2017 22:34:44 +0000 (00:34 +0200)]
Merge branch 'MDL-59198-master' of git://github.com/ankitagarwal/moodle

3 years agoMerge branch 'MDL-59279_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 4 Sep 2017 15:56:45 +0000 (16:56 +0100)]
Merge branch 'MDL-59279_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-59974-master' of git://github.com/lameze/moodle
David Monllao [Mon, 4 Sep 2017 11:55:31 +0000 (13:55 +0200)]
Merge branch 'MDL-59974-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'wip-MDL-59768-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 4 Sep 2017 11:45:39 +0000 (13:45 +0200)]
Merge branch 'wip-MDL-59768-master' of git://github.com/marinaglancy/moodle

3 years agoMerge branch 'wip-MDL-59770-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 4 Sep 2017 11:28:07 +0000 (12:28 +0100)]
Merge branch 'wip-MDL-59770-master' of git://github.com/marinaglancy/moodle

3 years agoMerge branch 'MDL-59786_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 4 Sep 2017 10:52:14 +0000 (11:52 +0100)]
Merge branch 'MDL-59786_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'master-MDL-59799' of https://github.com/jojoob/moodle
David Monllao [Mon, 4 Sep 2017 10:33:02 +0000 (12:33 +0200)]
Merge branch 'master-MDL-59799' of https://github.com/jojoob/moodle

3 years agoMerge branch 'MDL-59840_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 4 Sep 2017 10:24:54 +0000 (11:24 +0100)]
Merge branch 'MDL-59840_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'wip-MDL-59992-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 4 Sep 2017 10:23:22 +0000 (11:23 +0100)]
Merge branch 'wip-MDL-59992-master' of git://github.com/marinaglancy/moodle

3 years agoMerge branch 'wip-MDL-59815-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 4 Sep 2017 10:07:44 +0000 (12:07 +0200)]
Merge branch 'wip-MDL-59815-master' of git://github.com/abgreeve/moodle

3 years agoMerge branch 'MDL-59846-master' of git://github.com/lameze/moodle
David Monllao [Mon, 4 Sep 2017 10:01:52 +0000 (12:01 +0200)]
Merge branch 'MDL-59846-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'MDL_59834-Indexing_of_personal_messages' of https://github.com/mattporr...
Dan Poltawski [Mon, 4 Sep 2017 09:51:30 +0000 (10:51 +0100)]
Merge branch 'MDL_59834-Indexing_of_personal_messages' of https://github.com/mattporritt/moodle

3 years agoMerge branch 'MDL-59864-master' of git://github.com/lameze/moodle
David Monllao [Mon, 4 Sep 2017 09:33:34 +0000 (11:33 +0200)]
Merge branch 'MDL-59864-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'wip-MDL-59898-master-test' of git://github.com/abgreeve/moodle
David Monllao [Mon, 4 Sep 2017 09:24:27 +0000 (11:24 +0200)]
Merge branch 'wip-MDL-59898-master-test' of git://github.com/abgreeve/moodle

3 years agoMerge branch 'MDL-59657_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 4 Sep 2017 09:23:24 +0000 (10:23 +0100)]
Merge branch 'MDL-59657_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-59963-report-logs-origin-pagination' of https://github.com/lucaboes...
David Monllao [Mon, 4 Sep 2017 09:19:22 +0000 (11:19 +0200)]
Merge branch 'MDL-59963-report-logs-origin-pagination' of https://github.com/lucaboesch/moodle

3 years agoMerge branch 'MDL-59961_file_validation' of https://github.com/mrmark/moodle
David Monllao [Mon, 4 Sep 2017 09:08:23 +0000 (11:08 +0200)]
Merge branch 'MDL-59961_file_validation' of https://github.com/mrmark/moodle

3 years agoMerge branch 'MDL-59153_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 4 Sep 2017 09:03:04 +0000 (10:03 +0100)]
Merge branch 'MDL-59153_master' of git://github.com/dmonllao/moodle

3 years agoMDL-59983 lang: Fix Forum behat scenarios to use the new strings
David Mudrák [Tue, 5 Sep 2017 09:00:42 +0000 (11:00 +0200)]
MDL-59983 lang: Fix Forum behat scenarios to use the new strings

3 years agoMDL-59983 lang: Merge English strings from the en_fix language pack
Helen Foster [Tue, 5 Sep 2017 08:46:54 +0000 (10:46 +0200)]
MDL-59983 lang: Merge English strings from the en_fix language pack

Significant string changes:

* mobileappenabled, setuplink and setuplink_desc in tool_mobile -
  improved wording
* getmoodleonyourmobile and custommenuitems_desc in tool_mobile -
  improved wording

3 years agoMDL-59635 tool_replace: Escape the column name.
Matteo Scaramuccia [Sun, 25 Jun 2017 20:00:41 +0000 (22:00 +0200)]
MDL-59635 tool_replace: Escape the column name.

3 years agoMDL-59635 ddl: Added test_get_enc_quoted().
Matteo Scaramuccia [Sun, 25 Jun 2017 19:55:27 +0000 (21:55 +0200)]
MDL-59635 ddl: Added test_get_enc_quoted().

3 years agoMDL-59759 core_user: Use SAVE_CANCEL modal for unenrol dialog
Jun Pataleta [Tue, 8 Aug 2017 09:08:24 +0000 (17:08 +0800)]
MDL-59759 core_user: Use SAVE_CANCEL modal for unenrol dialog

3 years agoMDL-59759 core_message: Use SAVE_CANCEL modal for delete dialog
Jun Pataleta [Wed, 9 Aug 2017 03:37:37 +0000 (11:37 +0800)]
MDL-59759 core_message: Use SAVE_CANCEL modal for delete dialog

3 years agoMDL-59759 core_calendar: Use SAVE_CANCEL modal for delete dialog
Jun Pataleta [Thu, 31 Aug 2017 09:17:54 +0000 (17:17 +0800)]
MDL-59759 core_calendar: Use SAVE_CANCEL modal for delete dialog

* Plus reorganise the code to make it a little tidier.

3 years agoMDL-59759 core_amd: Deprecate core/modal_confirm
Jun Pataleta [Thu, 31 Aug 2017 07:18:53 +0000 (15:18 +0800)]
MDL-59759 core_amd: Deprecate core/modal_confirm

3 years agoMDL-59696 theme_bootstrapbase: Set max-width for custom-select elements
Jun Pataleta [Mon, 21 Aug 2017 07:39:14 +0000 (15:39 +0800)]
MDL-59696 theme_bootstrapbase: Set max-width for custom-select elements

* Set custom-select elements with a maximum width of 100% of their
container.

3 years agoMDL-59696 templates: Remove form-group div for url-select template
Jun Pataleta [Mon, 21 Aug 2017 07:43:17 +0000 (15:43 +0800)]
MDL-59696 templates: Remove form-group div for url-select template

* Removed the div with the class 'form-group' that's enclosing the
select element and friends. It's not needed since the urlselect template
is an inline form.
* Also, for completeness, I added the helpicon data for the template's
context.

3 years agoMDL-59898 access: Added Icon references.
Tobias Garske [Tue, 22 Aug 2017 09:44:08 +0000 (11:44 +0200)]
MDL-59898 access: Added Icon references.

3 years agoMDL-59974 core_calendar: remove JS code no longer used
Simey Lameze [Fri, 1 Sep 2017 08:32:09 +0000 (16:32 +0800)]
MDL-59974 core_calendar: remove JS code no longer used

3 years agoMDL-59974 core_calendar: hide elements based on event type
Simey Lameze [Thu, 31 Aug 2017 02:13:37 +0000 (10:13 +0800)]
MDL-59974 core_calendar: hide elements based on event type

3 years agoMDL-59672 core_calendar: set course event type on course context
Simey Lameze [Wed, 30 Aug 2017 02:45:05 +0000 (10:45 +0800)]
MDL-59672 core_calendar: set course event type on course context

3 years agoMDL-59846 core_calendar: add styling to action link
Simey Lameze [Thu, 17 Aug 2017 06:41:18 +0000 (14:41 +0800)]
MDL-59846 core_calendar: add styling to action link

3 years agoMDL-59864 core_calendar: add behat test for module events edit
Simey Lameze [Thu, 31 Aug 2017 01:40:05 +0000 (09:40 +0800)]
MDL-59864 core_calendar: add behat test for module events edit

3 years agoMDL-59864 core_calendar: add link to activity on module events
Simey Lameze [Thu, 31 Aug 2017 01:39:14 +0000 (09:39 +0800)]
MDL-59864 core_calendar: add link to activity on module events

3 years agoMDL-59834 Global Search: Indexing user messages
Matt Porritt [Thu, 31 Aug 2017 01:36:18 +0000 (11:36 +1000)]
MDL-59834 Global Search: Indexing user messages

Make indexing of user messages tolerant to user deletion.
When creating the search document for user messages,
add a check to see if the user has been deleted in the
system. If they have been deleted abort creating the search
document.
This is to avoid rasining an error when trying to get the
user context for a deleted user.

3 years agoMDL-59799 course: Include course/lib.php before using move_courses().
Johannes Burk [Sun, 13 Aug 2017 12:42:54 +0000 (14:42 +0200)]
MDL-59799 course: Include course/lib.php before using move_courses().

3 years agoMDL-53936 reports: State default index page explicitly in pagination url
Luca Bösch [Tue, 29 Aug 2017 05:33:21 +0000 (07:33 +0200)]
MDL-53936 reports: State default index page explicitly in pagination url

3 years agoMDL-59963 reports: origin parameter looked at in log reports
Luca Bösch [Tue, 29 Aug 2017 05:53:42 +0000 (07:53 +0200)]
MDL-59963 reports: origin parameter looked at in log reports

3 years agoMDL-59153 report_insights: UI improvements
David Monllao [Thu, 31 Aug 2017 16:01:50 +0000 (18:01 +0200)]
MDL-59153 report_insights: UI improvements

- Accessible info tables
- Outcome icons
- Navigation bar for missing contexts
- Heading contents standarisation

3 years agoMDL-59153 analytics: No access to disabled models predictions
David Monllao [Fri, 25 Aug 2017 06:49:18 +0000 (08:49 +0200)]
MDL-59153 analytics: No access to disabled models predictions

3 years agoMDL-59786 analytics: Discard invalid samples
David Monllao [Mon, 21 Aug 2017 14:18:02 +0000 (16:18 +0200)]
MDL-59786 analytics: Discard invalid samples

3 years agoMDL-59840 analytics: Enable single range instead of no splitting
David Monllao [Wed, 16 Aug 2017 11:30:48 +0000 (13:30 +0200)]
MDL-59840 analytics: Enable single range instead of no splitting

3 years agoweekly release 3.4dev
Jun Pataleta [Fri, 1 Sep 2017 05:26:56 +0000 (13:26 +0800)]
weekly release 3.4dev

3 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Jun Pataleta [Fri, 1 Sep 2017 05:26:55 +0000 (13:26 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

3 years agoMDL-59801 tool_lp: Behat fix for autocomplete
Andrew Nicols [Fri, 1 Sep 2017 00:24:49 +0000 (08:24 +0800)]
MDL-59801 tool_lp: Behat fix for autocomplete

An earlier Behat fix made the use of autocomplete stricter on checking
an exact match instead of a substring, which in turn broke this use
which was searching for a partial match.

3 years agoMerge branch 'MDL-56646-master-fix' of https://github.com/xow/moodle
Andrew Nicols [Thu, 31 Aug 2017 07:00:08 +0000 (15:00 +0800)]
Merge branch 'MDL-56646-master-fix' of https://github.com/xow/moodle

3 years agoMDL-56646 mod_assign: Improve grade fix strings
John Okely [Thu, 31 Aug 2017 06:38:22 +0000 (14:38 +0800)]
MDL-56646 mod_assign: Improve grade fix strings

3 years agoMDL-56646 mod_assign: Make rescale behat more specific
John Okely [Thu, 31 Aug 2017 06:22:15 +0000 (14:22 +0800)]
MDL-56646 mod_assign: Make rescale behat more specific

3 years agoMDL-59768 tasks: schedule task only if it is not scheduled
Marina Glancy [Wed, 9 Aug 2017 00:04:00 +0000 (08:04 +0800)]
MDL-59768 tasks: schedule task only if it is not scheduled

3 years agoMerge branch 'MDL-59801-master-fix1' of http://github.com/damyon/moodle
Andrew Nicols [Thu, 31 Aug 2017 06:12:31 +0000 (14:12 +0800)]
Merge branch 'MDL-59801-master-fix1' of github.com/damyon/moodle

3 years agoMDL-59801 users: Behat fixes
Damyon Wiese [Thu, 31 Aug 2017 04:32:03 +0000 (12:32 +0800)]
MDL-59801 users: Behat fixes

Firstly - the list of roles to filter needs to be a combination of the assignable roles and the existing roles in the course.
Secondly - the auto-complete behat step needs to search for entire strings, not substrings.

3 years agoMDL-59992 webservice: fix debugging message event context already set
Marina Glancy [Thu, 31 Aug 2017 04:13:15 +0000 (12:13 +0800)]
MDL-59992 webservice: fix debugging message event context already set

3 years agoMerge branch 'MDL-59828-master-fix1' of http://github.com/damyon/moodle
Andrew Nicols [Thu, 31 Aug 2017 02:25:49 +0000 (10:25 +0800)]
Merge branch 'MDL-59828-master-fix1' of github.com/damyon/moodle

3 years agoMDL-59828 inplaceeditable: CSS class fix
Damyon Wiese [Thu, 31 Aug 2017 02:16:53 +0000 (10:16 +0800)]
MDL-59828 inplaceeditable: CSS class fix

The form-autocomplete-original-select was applied to the wrong element.

inplaceeditable selects => inplaceeditable autocompletes

3 years agoMerge branch 'MDL-59832_master-fix' of git://github.com/markn86/moodle
Andrew Nicols [Wed, 30 Aug 2017 07:44:24 +0000 (15:44 +0800)]
Merge branch 'MDL-59832_master-fix' of git://github.com/markn86/moodle

3 years agoMDL-59832 core_course: removed faulty logic in unit test
Mark Nelson [Wed, 30 Aug 2017 04:55:57 +0000 (12:55 +0800)]
MDL-59832 core_course: removed faulty logic in unit test

3 years agoMerge branch 'MDL-59394-master-2' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Wed, 30 Aug 2017 03:35:40 +0000 (11:35 +0800)]
Merge branch 'MDL-59394-master-2' of git://github.com/ryanwyllie/moodle

3 years agoMDL-59815 access: Fix definition of risks for user:delete.
Peter Spicer [Wed, 30 Aug 2017 03:29:42 +0000 (11:29 +0800)]
MDL-59815 access: Fix definition of risks for user:delete.

3 years agoMerge branch 'MDL-59713-master-2' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Wed, 30 Aug 2017 03:30:59 +0000 (11:30 +0800)]
Merge branch 'MDL-59713-master-2' of git://github.com/ryanwyllie/moodle

3 years agoMDL-59713 calendar: fix nav link ajax reload
Ryan Wyllie [Wed, 30 Aug 2017 03:25:39 +0000 (03:25 +0000)]
MDL-59713 calendar: fix nav link ajax reload

3 years agoMDL-59394 calendar: add drag and drop between months
Ryan Wyllie [Thu, 24 Aug 2017 08:20:35 +0000 (08:20 +0000)]
MDL-59394 calendar: add drag and drop between months

3 years agoMerge branch 'MDL-59884-master' of git://github.com/lameze/moodle
Jun Pataleta [Wed, 30 Aug 2017 02:10:30 +0000 (10:10 +0800)]
Merge branch 'MDL-59884-master' of git://github.com/lameze/moodle

3 years agoMDL-59884 core_calendar: display spinner when reloading month content
Simey Lameze [Tue, 22 Aug 2017 07:38:06 +0000 (15:38 +0800)]
MDL-59884 core_calendar: display spinner when reloading month content

3 years agoMDL-59884 themes: add styles for overlay loading
Simey Lameze [Tue, 22 Aug 2017 07:38:53 +0000 (15:38 +0800)]
MDL-59884 themes: add styles for overlay loading

3 years agoMDL-59884 core: add new overlay_loading template
Simey Lameze [Tue, 22 Aug 2017 07:36:52 +0000 (15:36 +0800)]
MDL-59884 core: add new overlay_loading template

3 years agoMerge branch 'MDL-59713' of https://github.com/stronk7/moodle
Andrew Nicols [Wed, 30 Aug 2017 00:20:09 +0000 (08:20 +0800)]
Merge branch 'MDL-59713' of https://github.com/stronk7/moodle

3 years agoMerge branch 'MDL-59832_master-v2' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 29 Aug 2017 23:21:22 +0000 (01:21 +0200)]
Merge branch 'MDL-59832_master-v2' of git://github.com/markn86/moodle

3 years agoMerge branch 'MDL-59779_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 29 Aug 2017 23:09:20 +0000 (01:09 +0200)]
Merge branch 'MDL-59779_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-59685-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 29 Aug 2017 22:36:07 +0000 (00:36 +0200)]
Merge branch 'MDL-59685-master' of git://github.com/damyon/moodle

3 years agoMDL-59713 forms: prevent php warning when 'optional' option is missing
Eloy Lafuente (stronk7) [Tue, 29 Aug 2017 18:12:41 +0000 (20:12 +0200)]
MDL-59713 forms: prevent php warning when 'optional' option is missing

3 years agoMDL-59279 analytics: Include more info about the dataset
David Monllao [Tue, 29 Aug 2017 13:48:55 +0000 (15:48 +0200)]
MDL-59279 analytics: Include more info about the dataset

3 years agoMerge branch 'MDL-59951-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 29 Aug 2017 13:32:43 +0000 (14:32 +0100)]
Merge branch 'MDL-59951-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-59195_assign_comment_permissions' of git://github.com/davosmith...
Dan Poltawski [Tue, 29 Aug 2017 10:54:07 +0000 (11:54 +0100)]
Merge branch 'MDL-59195_assign_comment_permissions' of git://github.com/davosmith/moodle

3 years agoMerge branch 'MDL-59615-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 29 Aug 2017 09:58:42 +0000 (10:58 +0100)]
Merge branch 'MDL-59615-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-59908-master' of git://github.com/ankitagarwal/moodle
Jun Pataleta [Tue, 29 Aug 2017 09:41:39 +0000 (17:41 +0800)]
Merge branch 'MDL-59908-master' of git://github.com/ankitagarwal/moodle

3 years agoMerge branch 'MDL-59688-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 29 Aug 2017 09:24:50 +0000 (10:24 +0100)]
Merge branch 'MDL-59688-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-59830_master-v2' of git://github.com/markn86/moodle
Jun Pataleta [Tue, 29 Aug 2017 09:23:44 +0000 (17:23 +0800)]
Merge branch 'MDL-59830_master-v2' of git://github.com/markn86/moodle

3 years agoMDL-59830 core_user: do not show roles that can not be deleted
Mark Nelson [Tue, 22 Aug 2017 13:01:57 +0000 (21:01 +0800)]
MDL-59830 core_user: do not show roles that can not be deleted