moodle.git
3 years agoMDL-60194 lib: Internal changes by Moodle to phpmailer.
Adrian Greeve [Tue, 3 Oct 2017 07:13:14 +0000 (15:13 +0800)]
MDL-60194 lib: Internal changes by Moodle to phpmailer.

3 years agoweekly release 3.4dev
Jake Dallimore [Fri, 6 Oct 2017 06:34:29 +0000 (14:34 +0800)]
weekly release 3.4dev

3 years agoNOBUG: Fixed file access permissions
Jake Dallimore [Fri, 6 Oct 2017 06:34:29 +0000 (14:34 +0800)]
NOBUG: Fixed file access permissions

3 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Jake Dallimore [Fri, 6 Oct 2017 06:34:28 +0000 (14:34 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

3 years agoMDL-59630 analytics: Unit tests fixes
David Monllao [Thu, 5 Oct 2017 15:38:17 +0000 (17:38 +0200)]
MDL-59630 analytics: Unit tests fixes

3 years agoMerge branch 'MDL-60096-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Thu, 5 Oct 2017 08:56:46 +0000 (16:56 +0800)]
Merge branch 'MDL-60096-master' of git://github.com/junpataleta/moodle

3 years agoMDL-60096 calendar: Add JS for day view
Andrew Nicols [Fri, 29 Sep 2017 03:16:57 +0000 (11:16 +0800)]
MDL-60096 calendar: Add JS for day view

3 years agoMerge branch 'MDL-60352-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Thu, 5 Oct 2017 08:16:34 +0000 (16:16 +0800)]
Merge branch 'MDL-60352-master' of git://github.com/andrewnicols/moodle

3 years agoMerge branch 'MDL-59630_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Thu, 5 Oct 2017 06:56:57 +0000 (14:56 +0800)]
Merge branch 'MDL-59630_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-59751-master-v2' of git://github.com/lameze/moodle
Jun Pataleta [Thu, 5 Oct 2017 06:53:31 +0000 (14:53 +0800)]
Merge branch 'MDL-59751-master-v2' of git://github.com/lameze/moodle

3 years agoMDL-60352 calendar: Do not select original event for collection
Andrew Nicols [Thu, 5 Oct 2017 06:31:26 +0000 (14:31 +0800)]
MDL-60352 calendar: Do not select original event for collection

3 years agoMDL-59751 calendar: remove unused show_upcoming_events method
Simey Lameze [Thu, 5 Oct 2017 06:27:58 +0000 (14:27 +0800)]
MDL-59751 calendar: remove unused show_upcoming_events method

3 years agoMDL-59751 calendar: Update JS to be more sharable
Andrew Nicols [Fri, 29 Sep 2017 03:16:20 +0000 (11:16 +0800)]
MDL-59751 calendar: Update JS to be more sharable

3 years agoMDL-59751 core_calendar: move code to avoid duplication
Simey Lameze [Fri, 29 Sep 2017 05:05:15 +0000 (13:05 +0800)]
MDL-59751 core_calendar: move code to avoid duplication

3 years agoMDL-59751 core_calendar: make upcoming view use AJAX
Simey Lameze [Fri, 29 Sep 2017 04:59:24 +0000 (12:59 +0800)]
MDL-59751 core_calendar: make upcoming view use AJAX

3 years agoMDL-59751 core_calendar: move new event button to header
Simey Lameze [Fri, 29 Sep 2017 05:06:00 +0000 (13:06 +0800)]
MDL-59751 core_calendar: move new event button to header

3 years agoMDL-59751 core_calendar: add upcoming view templates
Simey Lameze [Fri, 29 Sep 2017 04:48:13 +0000 (12:48 +0800)]
MDL-59751 core_calendar: add upcoming view templates

3 years agoMDL-59751 core_calendar: add calendar_upcoming exporter
Simey Lameze [Fri, 29 Sep 2017 04:46:17 +0000 (12:46 +0800)]
MDL-59751 core_calendar: add calendar_upcoming exporter

3 years agoMDL-59751 core_calendar: add get_calendar_upcoming_view webservice
Simey Lameze [Fri, 29 Sep 2017 04:43:48 +0000 (12:43 +0800)]
MDL-59751 core_calendar: add get_calendar_upcoming_view webservice

3 years agoMerge branch 'MDL-59890-master-fix' of git://github.com/andrewnicols/moodle
Jun Pataleta [Thu, 5 Oct 2017 03:00:47 +0000 (11:00 +0800)]
Merge branch 'MDL-59890-master-fix' of git://github.com/andrewnicols/moodle

3 years agoMDL-59890 calendar: Use calculated context instead of guessing
Andrew Nicols [Thu, 5 Oct 2017 02:14:35 +0000 (10:14 +0800)]
MDL-59890 calendar: Use calculated context instead of guessing

3 years agoMerge branch 'MDL-60130_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Wed, 4 Oct 2017 21:47:07 +0000 (23:47 +0200)]
Merge branch 'MDL-60130_master' of git://github.com/markn86/moodle

3 years agoMerge branch 'MDL-60264-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 4 Oct 2017 21:06:17 +0000 (23:06 +0200)]
Merge branch 'MDL-60264-master' of git://github.com/jleyva/moodle

3 years agoMDL-59890 upgrade: bump redirect_if_major_update_required
Eloy Lafuente (stronk7) [Wed, 4 Oct 2017 20:17:25 +0000 (22:17 +0200)]
MDL-59890 upgrade: bump redirect_if_major_update_required

3 years agoMDL-59241 mod_workshop: Fix testing found issues
Juan Leyva [Wed, 4 Oct 2017 11:09:59 +0000 (13:09 +0200)]
MDL-59241 mod_workshop: Fix testing found issues

- totalfilesize counting all submissions
- Improved function documentation

3 years agoMDL-59248 mod_workshop: Fix permissions checks
Juan Leyva [Wed, 4 Oct 2017 14:37:00 +0000 (16:37 +0200)]
MDL-59248 mod_workshop: Fix permissions checks

3 years agoMerge branch 'MDL-59890-master-fix' of git://github.com/junpataleta/moodle
Jun Pataleta [Wed, 4 Oct 2017 06:55:32 +0000 (14:55 +0800)]
Merge branch 'MDL-59890-master-fix' of git://github.com/junpataleta/moodle

3 years agoMDL-59890 calendar: Reorganise data generation steps
Jun Pataleta [Wed, 4 Oct 2017 06:20:07 +0000 (14:20 +0800)]
MDL-59890 calendar: Reorganise data generation steps

* Reorganise the data generation steps to avoid creating cells with
empty string values.

3 years agoMDL-59890 behat: Revert to checking if isset instead of not empty
Jun Pataleta [Wed, 4 Oct 2017 06:18:47 +0000 (14:18 +0800)]
MDL-59890 behat: Revert to checking if isset instead of not empty

Reverting changes made by commit
1957d33996309d6fd448ce34c8568b904f78953c

3 years agoMerge branch 'MDL-57228' of git://github.com/timhunt/moodle
Jake Dallimore [Wed, 4 Oct 2017 05:42:51 +0000 (13:42 +0800)]
Merge branch 'MDL-57228' of git://github.com/timhunt/moodle

3 years agoMerge branch 'MDL-59890-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Wed, 4 Oct 2017 03:19:33 +0000 (11:19 +0800)]
Merge branch 'MDL-59890-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-59890 calendar: Add behat tests
Andrew Nicols [Thu, 28 Sep 2017 05:54:02 +0000 (13:54 +0800)]
MDL-59890 calendar: Add behat tests

3 years agoMDL-59890 behat: Check empty not isset for switchids
Andrew Nicols [Thu, 28 Sep 2017 05:50:45 +0000 (13:50 +0800)]
MDL-59890 behat: Check empty not isset for switchids

3 years agoMDL-59890 calendar: Allow event creation in behat
Andrew Nicols [Thu, 28 Sep 2017 05:50:26 +0000 (13:50 +0800)]
MDL-59890 calendar: Allow event creation in behat

3 years agoMDL-59890 calendar: Correct context checks for edit test
Andrew Nicols [Fri, 22 Sep 2017 04:01:00 +0000 (12:01 +0800)]
MDL-59890 calendar: Correct context checks for edit test

3 years agoMDL-59890 calendar: Select current category when adding event
Andrew Nicols [Fri, 22 Sep 2017 01:56:18 +0000 (09:56 +0800)]
MDL-59890 calendar: Select current category when adding event

3 years agoMerge branch 'MDL-33174-master' of https://github.com/matt-catalyst/moodle
Eloy Lafuente (stronk7) [Tue, 3 Oct 2017 21:01:45 +0000 (23:01 +0200)]
Merge branch 'MDL-33174-master' of https://github.com/matt-catalyst/moodle

3 years agoMerge branch 'MDL-49005-master' of https://github.com/abias/moodle
Eloy Lafuente (stronk7) [Tue, 3 Oct 2017 20:48:28 +0000 (22:48 +0200)]
Merge branch 'MDL-49005-master' of https://github.com/abias/moodle

3 years agoMerge branch 'MDL-59273-master' of https://github.com/lucisgit/moodle
Eloy Lafuente (stronk7) [Tue, 3 Oct 2017 20:38:13 +0000 (22:38 +0200)]
Merge branch 'MDL-59273-master' of https://github.com/lucisgit/moodle

3 years agoMerge branch 'MDL-59883-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 3 Oct 2017 18:58:23 +0000 (20:58 +0200)]
Merge branch 'MDL-59883-master' of git://github.com/andrewnicols/moodle

3 years agoMerge branch 'MDL-59882-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 3 Oct 2017 18:48:28 +0000 (20:48 +0200)]
Merge branch 'MDL-59882-master' of git://github.com/andrewnicols/moodle

3 years agoMerge branch 'MDL-58714-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 3 Oct 2017 18:38:16 +0000 (20:38 +0200)]
Merge branch 'MDL-58714-master' of git://github.com/jleyva/moodle

3 years agoMerge branch 'MDL-60198-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 3 Oct 2017 18:15:42 +0000 (20:15 +0200)]
Merge branch 'MDL-60198-master' of git://github.com/jleyva/moodle

3 years agoMDL-60144 mod_workshop: New WS mod_workshop_evaluate_submission
Juan Leyva [Fri, 15 Sep 2017 14:01:50 +0000 (16:01 +0200)]
MDL-60144 mod_workshop: New WS mod_workshop_evaluate_submission

3 years agoMDL-60144 mod_workshop: Move submission evaluation code to API
Juan Leyva [Fri, 15 Sep 2017 14:01:34 +0000 (16:01 +0200)]
MDL-60144 mod_workshop: Move submission evaluation code to API

3 years agoMDL-59239 mod_workshop: Move submission event trigger
Juan Leyva [Fri, 8 Sep 2017 10:15:45 +0000 (12:15 +0200)]
MDL-59239 mod_workshop: Move submission event trigger

The submission viewed event was being triggered at the beginning of the
script (before doing all the validation/safety checks).
I’ve moved the triggering to a better place so the event it is only
triggered when is verified that the user has permissions to view
the submission.

3 years agoMDL-59239 mod_workshop: New WS mod_workshop_view_submission
Juan Leyva [Fri, 8 Sep 2017 10:07:20 +0000 (12:07 +0200)]
MDL-59239 mod_workshop: New WS mod_workshop_view_submission

3 years agoMDL-59253 mod_workshop: New WS mod_workshop_get_grades_report
Juan Leyva [Fri, 30 Jun 2017 15:08:18 +0000 (16:08 +0100)]
MDL-59253 mod_workshop: New WS mod_workshop_get_grades_report

3 years agoMDL-59252 mod_workshop: New WS mod_workshop_evaluate_assessment
Juan Leyva [Thu, 29 Jun 2017 13:34:57 +0000 (14:34 +0100)]
MDL-59252 mod_workshop: New WS mod_workshop_evaluate_assessment

3 years agoMDL-59252 mod_workshop: Move assessment evaluation code to API
Juan Leyva [Thu, 29 Jun 2017 13:34:41 +0000 (14:34 +0100)]
MDL-59252 mod_workshop: Move assessment evaluation code to API

3 years agoMDL-59251 mod_workshop: New WS mod_workshop_get_grades
Juan Leyva [Thu, 29 Jun 2017 09:39:52 +0000 (10:39 +0100)]
MDL-59251 mod_workshop: New WS mod_workshop_get_grades

3 years agoMerge branch 'MDL-59250-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 3 Oct 2017 16:34:56 +0000 (18:34 +0200)]
Merge branch 'MDL-59250-master' of git://github.com/jleyva/moodle

3 years agoAutomatically generated installer lang files
AMOS bot [Tue, 3 Oct 2017 16:10:10 +0000 (00:10 +0800)]
Automatically generated installer lang files

3 years agoMDL-59250 mod_workshop: New WS mod_workshop_update_assessment
Juan Leyva [Wed, 28 Jun 2017 10:24:49 +0000 (11:24 +0100)]
MDL-59250 mod_workshop: New WS mod_workshop_update_assessment

3 years agoMDL-59250 mod_workshop: Move assessment edition code to API function
Juan Leyva [Wed, 28 Jun 2017 15:08:48 +0000 (16:08 +0100)]
MDL-59250 mod_workshop: Move assessment edition code to API function

3 years agoMDL-59890 calendar: Support for categories in legacy event fetch
Andrew Nicols [Tue, 19 Sep 2017 03:15:13 +0000 (11:15 +0800)]
MDL-59890 calendar: Support for categories in legacy event fetch

3 years agoMDL-59890 calendar: Delete category events upon category removal
Andrew Nicols [Thu, 21 Sep 2017 03:09:50 +0000 (11:09 +0800)]
MDL-59890 calendar: Delete category events upon category removal

3 years agoMDL-59890 calendar: Display category events on calendars
Andrew Nicols [Tue, 19 Sep 2017 03:17:04 +0000 (11:17 +0800)]
MDL-59890 calendar: Display category events on calendars

3 years agoMDL-59890 calendar: Exporters support for categories
Andrew Nicols [Tue, 19 Sep 2017 03:31:50 +0000 (11:31 +0800)]
MDL-59890 calendar: Exporters support for categories

3 years agoMDL-59890 coursecat: Add helper to fetch nested view of coursecat
Andrew Nicols [Thu, 21 Sep 2017 05:57:12 +0000 (13:57 +0800)]
MDL-59890 coursecat: Add helper to fetch nested view of coursecat

3 years agoMDL-59890 calendar: Stop adding time for mini view - not used
Andrew Nicols [Tue, 19 Sep 2017 03:16:30 +0000 (11:16 +0800)]
MDL-59890 calendar: Stop adding time for mini view - not used

3 years agoMDL-59890 calendar: Add support for the category to vault
Andrew Nicols [Tue, 19 Sep 2017 03:39:39 +0000 (11:39 +0800)]
MDL-59890 calendar: Add support for the category to vault

3 years agoMDL-59890 calendar: Accept categories in calendar_info
Andrew Nicols [Tue, 19 Sep 2017 03:12:29 +0000 (11:12 +0800)]
MDL-59890 calendar: Accept categories in calendar_info

3 years agoMDL-59401 mod_workshop: rename method remanining fix
Eloy Lafuente (stronk7) [Tue, 3 Oct 2017 11:05:12 +0000 (13:05 +0200)]
MDL-59401 mod_workshop: rename method remanining fix

3 years agoMerge branch 'MDL-59401-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 3 Oct 2017 10:59:25 +0000 (12:59 +0200)]
Merge branch 'MDL-59401-master' of git://github.com/jleyva/moodle

3 years agoMerge branch 'MDL-59248-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 3 Oct 2017 10:35:59 +0000 (12:35 +0200)]
Merge branch 'MDL-59248-master' of git://github.com/jleyva/moodle

3 years agoMDL-59630 analytics: mlbackend model directories deletion
David Monllao [Wed, 6 Sep 2017 16:42:46 +0000 (18:42 +0200)]
MDL-59630 analytics: mlbackend model directories deletion

3 years agoMDL-59630 analytics: New clean up task
David Monllao [Wed, 30 Aug 2017 12:20:15 +0000 (14:20 +0200)]
MDL-59630 analytics: New clean up task

3 years agoMDL-59630 analytics: Purge everything when the model is deleted
David Monllao [Wed, 30 Aug 2017 10:53:38 +0000 (12:53 +0200)]
MDL-59630 analytics: Purge everything when the model is deleted

3 years agoMDL-59630 analytics: Move get_analysables to abstract class
David Monllao [Tue, 29 Aug 2017 15:45:15 +0000 (17:45 +0200)]
MDL-59630 analytics: Move get_analysables to abstract class

3 years agoMDL-59401 mod_workshop: New WS get_reviewer_assessments
Juan Leyva [Tue, 27 Jun 2017 16:18:11 +0000 (17:18 +0100)]
MDL-59401 mod_workshop: New WS get_reviewer_assessments

3 years agoMDL-59248 mod_workshop: New WS get_assessment_form_definition
Juan Leyva [Tue, 27 Jun 2017 12:18:24 +0000 (13:18 +0100)]
MDL-59248 mod_workshop: New WS get_assessment_form_definition

3 years agoMDL-59248 mod_workshop: New API check_examples_assessed_before_assessment
Juan Leyva [Tue, 27 Jun 2017 10:06:23 +0000 (11:06 +0100)]
MDL-59248 mod_workshop: New API check_examples_assessed_before_assessment

For consistency I renamed the old check_examples_assessed function to
check_examples_assessed_before_submission.
I also call the new function in the existing
get_workshop_access_information external function.

3 years agoMerge branch 'MDL-60234-master' of https://github.com/abias/moodle
Andrew Nicols [Tue, 3 Oct 2017 05:10:17 +0000 (13:10 +0800)]
Merge branch 'MDL-60234-master' of https://github.com/abias/moodle

3 years agoMerge branch 'MDL-59913-master' of https://github.com/sammarshallou/moodle
Andrew Nicols [Tue, 3 Oct 2017 04:44:25 +0000 (12:44 +0800)]
Merge branch 'MDL-59913-master' of https://github.com/sammarshallou/moodle

3 years agoMerge branch 'MDL-60210-master-upgradecheck' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Tue, 3 Oct 2017 02:32:15 +0000 (10:32 +0800)]
Merge branch 'MDL-60210-master-upgradecheck' of git://github.com/mudrd8mz/moodle

3 years agoMerge branch 'MDL-59247-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 2 Oct 2017 21:48:24 +0000 (23:48 +0200)]
Merge branch 'MDL-59247-master' of git://github.com/jleyva/moodle

3 years agoMerge branch 'MDL-59246-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 2 Oct 2017 21:08:25 +0000 (23:08 +0200)]
Merge branch 'MDL-59246-master' of git://github.com/jleyva/moodle

3 years agoMerge branch 'MDL-59242-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 2 Oct 2017 20:59:38 +0000 (22:59 +0200)]
Merge branch 'MDL-59242-master' of git://github.com/jleyva/moodle

3 years agoMerge branch 'MDL-60003_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Mon, 2 Oct 2017 12:18:21 +0000 (20:18 +0800)]
Merge branch 'MDL-60003_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-60277_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Mon, 2 Oct 2017 07:58:00 +0000 (15:58 +0800)]
Merge branch 'MDL-60277_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-59241-master' of git://github.com/jleyva/moodle
Andrew Nicols [Mon, 2 Oct 2017 07:52:40 +0000 (15:52 +0800)]
Merge branch 'MDL-59241-master' of git://github.com/jleyva/moodle

3 years agoMerge branch 'MDL-58790' of git://github.com/timhunt/moodle
Andrew Nicols [Mon, 2 Oct 2017 07:39:26 +0000 (15:39 +0800)]
Merge branch 'MDL-58790' of git://github.com/timhunt/moodle

3 years agoMDL-59247 mod_workshop: New WS mod_workshop_get_assessment
Juan Leyva [Mon, 26 Jun 2017 13:26:15 +0000 (14:26 +0100)]
MDL-59247 mod_workshop: New WS mod_workshop_get_assessment

3 years agoMDL-59246 mod_workshop: New WS get_submission_assessments
Juan Leyva [Thu, 22 Jun 2017 19:33:35 +0000 (20:33 +0100)]
MDL-59246 mod_workshop: New WS get_submission_assessments

3 years agoMDL-59242 mod_workshop: New WS mod_workshop_get_submission
Juan Leyva [Thu, 22 Jun 2017 12:34:14 +0000 (13:34 +0100)]
MDL-59242 mod_workshop: New WS mod_workshop_get_submission

3 years agoMerge branch 'wip-MDL-60287-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Mon, 2 Oct 2017 07:33:55 +0000 (15:33 +0800)]
Merge branch 'wip-MDL-60287-master' of git://github.com/marinaglancy/moodle

3 years agoMDL-59241 mod_workshop: New WS mod_workshop_get_submissions
Juan Leyva [Thu, 22 Jun 2017 10:00:43 +0000 (11:00 +0100)]
MDL-59241 mod_workshop: New WS mod_workshop_get_submissions

3 years agoMDL-60239 libraries: patch Markdown for PHP7.2
Marina Glancy [Mon, 2 Oct 2017 07:15:36 +0000 (15:15 +0800)]
MDL-60239 libraries: patch Markdown for PHP7.2

3 years agoMDL-60277 report_insights: Pass the prediction as a float
David Monllao [Thu, 28 Sep 2017 16:55:24 +0000 (18:55 +0200)]
MDL-60277 report_insights: Pass the prediction as a float

3 years agoMerge branch 'wip-MDL-58548-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Mon, 2 Oct 2017 06:47:08 +0000 (14:47 +0800)]
Merge branch 'wip-MDL-58548-master' of git://github.com/abgreeve/moodle

3 years agoMDL-59883 behat: Update close button link
Andrew Nicols [Wed, 6 Sep 2017 08:35:28 +0000 (16:35 +0800)]
MDL-59883 behat: Update close button link

3 years agoMDL-59883 behat: Check aria-label for button content
Andrew Nicols [Wed, 6 Sep 2017 08:35:10 +0000 (16:35 +0800)]
MDL-59883 behat: Check aria-label for button content

3 years agoMDL-59882 behat: Update known uses of dialogue CSS
Andrew Nicols [Wed, 6 Sep 2017 06:13:34 +0000 (14:13 +0800)]
MDL-59882 behat: Update known uses of dialogue CSS

3 years agoMDL-59882 behat: Add newer modal type to selectors
Andrew Nicols [Wed, 6 Sep 2017 06:13:13 +0000 (14:13 +0800)]
MDL-59882 behat: Add newer modal type to selectors

3 years agoMerge branch 'MDL-58550-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Mon, 2 Oct 2017 03:57:34 +0000 (11:57 +0800)]
Merge branch 'MDL-58550-master' of git://github.com/ankitagarwal/moodle

3 years agoMerge branch 'MDL-60289-master' of git://github.com/lameze/moodle
Andrew Nicols [Mon, 2 Oct 2017 03:32:03 +0000 (11:32 +0800)]
Merge branch 'MDL-60289-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'MDL-60236-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Mon, 2 Oct 2017 02:31:40 +0000 (10:31 +0800)]
Merge branch 'MDL-60236-master' of git://github.com/ankitagarwal/moodle

3 years agoMDL-60289 libraries: Upgrade Chart.js to 2.7.0
Simey Lameze [Fri, 29 Sep 2017 04:09:49 +0000 (12:09 +0800)]
MDL-60289 libraries: Upgrade Chart.js to 2.7.0

3 years agoMerge branch 'MDL-60239-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Mon, 2 Oct 2017 02:21:56 +0000 (10:21 +0800)]
Merge branch 'MDL-60239-master' of git://github.com/ankitagarwal/moodle