moodle.git
4 years agoMerge branch 'MDL-60538-master' of https://github.com/mihailges/moodle
David Monllao [Wed, 25 Oct 2017 13:08:49 +0000 (15:08 +0200)]
Merge branch 'MDL-60538-master' of https://github.com/mihailges/moodle

4 years agoMerge branch 'MDL-60560-master' of git://github.com/andrewnicols/moodle
David Monllao [Wed, 25 Oct 2017 13:06:49 +0000 (15:06 +0200)]
Merge branch 'MDL-60560-master' of git://github.com/andrewnicols/moodle

4 years agoMoodle release 3.4beta v3.4.0-beta
David Monllao [Wed, 25 Oct 2017 09:14:22 +0000 (11:14 +0200)]
Moodle release 3.4beta

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Wed, 25 Oct 2017 09:14:20 +0000 (11:14 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

4 years agoMerge branch 'MDL-60506-master-fix1' of git://github.com/lameze/moodle
Andrew Nicols [Tue, 24 Oct 2017 23:54:34 +0000 (07:54 +0800)]
Merge branch 'MDL-60506-master-fix1' of git://github.com/lameze/moodle

4 years agoMerge branch 'MDL-36580' of https://github.com/stronk7/moodle
Andrew Nicols [Tue, 24 Oct 2017 23:03:57 +0000 (07:03 +0800)]
Merge branch 'MDL-36580' of https://github.com/stronk7/moodle

4 years agoMDL-60429 calendar: fix for updating event course and group
Jake Dallimore [Tue, 24 Oct 2017 08:21:18 +0000 (16:21 +0800)]
MDL-60429 calendar: fix for updating event course and group

The property courseid and groupid might not be set, so if updating,
use the existing value if a new value wasn't specified.

4 years agoMerge branch 'MDL-60561-master' of git://github.com/andrewnicols/moodle
Jake Dallimore [Tue, 24 Oct 2017 06:45:45 +0000 (14:45 +0800)]
Merge branch 'MDL-60561-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'MDL-60545_master' of git://github.com/markn86/moodle
Jake Dallimore [Tue, 24 Oct 2017 06:25:01 +0000 (14:25 +0800)]
Merge branch 'MDL-60545_master' of git://github.com/markn86/moodle

4 years agoMerge branch 'MDL-60429-master' of git://github.com/lameze/moodle
Jake Dallimore [Tue, 24 Oct 2017 05:59:33 +0000 (13:59 +0800)]
Merge branch 'MDL-60429-master' of git://github.com/lameze/moodle

4 years agoMerge branch 'MDL-36580' of https://github.com/stronk7/moodle
Andrew Nicols [Tue, 24 Oct 2017 04:47:56 +0000 (12:47 +0800)]
Merge branch 'MDL-36580' of https://github.com/stronk7/moodle

4 years agoMDL-60538 lesson: check if max attempts exceeded, use new lang string
Mihail Geshoski [Wed, 25 Oct 2017 01:00:20 +0000 (09:00 +0800)]
MDL-60538 lesson: check if max attempts exceeded, use new lang string

4 years agoMDL-36580 backup: Avoid PHP notice restoring old backups
Eloy Lafuente (stronk7) [Tue, 24 Oct 2017 20:49:10 +0000 (22:49 +0200)]
MDL-36580 backup: Avoid PHP notice restoring old backups

Before this implementation, both resourcekey and password
were not being included in the backups, so old backups are
missing them. To keep upwards compatibility and avoid a PHP
Notice (undefined property), existence is checked via isset(),
that is the usual way all over the restore process.

4 years agoAutomatically generated installer lang files
AMOS bot [Tue, 24 Oct 2017 16:05:34 +0000 (00:05 +0800)]
Automatically generated installer lang files

4 years agoMDL-60429 calendar: update group and course id for repeated events
Simey Lameze [Fri, 20 Oct 2017 07:37:15 +0000 (15:37 +0800)]
MDL-60429 calendar: update group and course id for repeated events

4 years agoMDL-60561 calendar: Increase event limit for calendar
Andrew Nicols [Tue, 24 Oct 2017 05:31:02 +0000 (13:31 +0800)]
MDL-60561 calendar: Increase event limit for calendar

It's quite common to have more than 50 events in a calendar month, but
we do not want to change the default value when the API is called in
other ways.

4 years agoMDL-60506 enrol: remove unwanted hidden elements
Simey Lameze [Tue, 24 Oct 2017 05:11:06 +0000 (13:11 +0800)]
MDL-60506 enrol: remove unwanted hidden elements

4 years agoMDL-60545 core_calendar: ensure 'All courses' shows accurate data
Mark Nelson [Tue, 24 Oct 2017 05:16:26 +0000 (13:16 +0800)]
MDL-60545 core_calendar: ensure 'All courses' shows accurate data

4 years agoMDL-60560 calendar: Correct type of JS event on update
Andrew Nicols [Tue, 24 Oct 2017 01:45:17 +0000 (09:45 +0800)]
MDL-60560 calendar: Correct type of JS event on update

4 years agoMDL-57477 session: Comment tidyup
Andrew Nicols [Tue, 24 Oct 2017 00:08:13 +0000 (08:08 +0800)]
MDL-57477 session: Comment tidyup

4 years agoMerge branch 'MDL-57477' of https://github.com/appalachianstate/moodle
Andrew Nicols [Tue, 24 Oct 2017 00:04:54 +0000 (08:04 +0800)]
Merge branch 'MDL-57477' of https://github.com/appalachianstate/moodle

4 years agoMDL-57477 core: If memcached 3.x mimic 2.2.0 lock acquisition behavior
Fred Woolard [Mon, 23 Oct 2017 17:22:42 +0000 (13:22 -0400)]
MDL-57477 core: If memcached 3.x mimic 2.2.0 lock acquisition behavior

4 years agoMerge branch 'MDL-60422_master' of git://github.com/markn86/moodle
David Monllao [Mon, 23 Oct 2017 15:42:06 +0000 (17:42 +0200)]
Merge branch 'MDL-60422_master' of git://github.com/markn86/moodle

4 years agoMerge branch 'MDL-60527-action-menu-links-missing-spaces-attributes' of https://githu...
David Monllao [Mon, 23 Oct 2017 14:55:35 +0000 (16:55 +0200)]
Merge branch 'MDL-60527-action-menu-links-missing-spaces-attributes' of https://github.com/lucaboesch/moodle

4 years agoMDL-60489 javascript: Add missing promise fails
Andrew Nicols [Mon, 23 Oct 2017 12:25:21 +0000 (20:25 +0800)]
MDL-60489 javascript: Add missing promise fails

4 years agoMerge branch 'MDL-60489-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Mon, 23 Oct 2017 12:07:33 +0000 (20:07 +0800)]
Merge branch 'MDL-60489-master' of git://github.com/ryanwyllie/moodle

4 years agoMerge branch 'm34_MDL-59100_MySQL8_INFORMATION_SCHEMAs_Need_Lowercasing' of https...
Eloy Lafuente (stronk7) [Mon, 23 Oct 2017 10:10:25 +0000 (12:10 +0200)]
Merge branch 'm34_MDL-59100_MySQL8_INFORMATION_SCHEMAs_Need_Lowercasing' of https://github.com/scara/moodle

4 years agoMDL-60422 core_calendar: do not lose track of the selected course
Mark Nelson [Fri, 20 Oct 2017 07:13:41 +0000 (15:13 +0800)]
MDL-60422 core_calendar: do not lose track of the selected course

4 years agoMDL-60489 javascript: add animations to modal setBody
Ryan Wyllie [Tue, 17 Oct 2017 08:14:53 +0000 (08:14 +0000)]
MDL-60489 javascript: add animations to modal setBody

4 years agoMerge branch 'MDL-60537-master' of git://github.com/andrewnicols/moodle
Jake Dallimore [Mon, 23 Oct 2017 06:28:51 +0000 (14:28 +0800)]
Merge branch 'MDL-60537-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'MDL-60506-master' of git://github.com/lameze/moodle
Andrew Nicols [Mon, 23 Oct 2017 05:37:09 +0000 (13:37 +0800)]
Merge branch 'MDL-60506-master' of git://github.com/lameze/moodle

4 years agoMerge branch 'MDL-42834_master' of git://github.com/markn86/moodle
Jake Dallimore [Mon, 23 Oct 2017 05:25:35 +0000 (13:25 +0800)]
Merge branch 'MDL-42834_master' of git://github.com/markn86/moodle

4 years agoMerge branch 'MDL-52653-master' of http://github.com/damyon/moodle
Damyon Wiese [Mon, 23 Oct 2017 05:14:03 +0000 (13:14 +0800)]
Merge branch 'MDL-52653-master' of github.com/damyon/moodle

4 years agoMDL-60506 enrol: use optional_param_array to handle cohorts array
Simey Lameze [Mon, 23 Oct 2017 04:54:09 +0000 (12:54 +0800)]
MDL-60506 enrol: use optional_param_array to handle cohorts array

4 years agoMDL-60506 enrol: use optional_param_array to handle users array
Simey Lameze [Mon, 23 Oct 2017 04:48:11 +0000 (12:48 +0800)]
MDL-60506 enrol: use optional_param_array to handle users array

4 years agoMDL-42834 admin: Remove wwwroot if used with moodle_url
John Okely [Tue, 12 Sep 2017 06:05:51 +0000 (14:05 +0800)]
MDL-42834 admin: Remove wwwroot if used with moodle_url

4 years agoMDL-42834 admin: Removal of httpswwwroot
John Okely [Fri, 15 Sep 2017 02:09:01 +0000 (10:09 +0800)]
MDL-42834 admin: Removal of httpswwwroot

4 years agoMDL-42834 admin: Upgrade script and warning for loginhttps sites
John Okely [Fri, 15 Sep 2017 01:23:20 +0000 (09:23 +0800)]
MDL-42834 admin: Upgrade script and warning for loginhttps sites

4 years agoMDL-42834 admin: Cleanup logic of login page only needed for loginhttps
John Okely [Fri, 15 Sep 2017 01:20:37 +0000 (09:20 +0800)]
MDL-42834 admin: Cleanup logic of login page only needed for loginhttps

4 years agoMDL-42834 admin: Deprecate https_required and verify_https_required
John Okely [Fri, 15 Sep 2017 01:18:18 +0000 (09:18 +0800)]
MDL-42834 admin: Deprecate https_required and verify_https_required

4 years agoMDL-42834 admin: Remove loginhttps
John Okely [Thu, 14 Sep 2017 08:13:13 +0000 (16:13 +0800)]
MDL-42834 admin: Remove loginhttps

4 years agoMerge branch 'MDL-60517_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 23 Oct 2017 04:10:04 +0000 (12:10 +0800)]
Merge branch 'MDL-60517_master' of git://github.com/dmonllao/moodle

4 years agoMerge branch 'MDL-58605-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 23 Oct 2017 03:13:32 +0000 (11:13 +0800)]
Merge branch 'MDL-58605-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'wip-MDL-60390-master-full' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 23 Oct 2017 03:11:14 +0000 (11:11 +0800)]
Merge branch 'wip-MDL-60390-master-full' of git://github.com/marinaglancy/moodle

4 years agoMDL-60390 libraries: annonate horde upgrade to 2.30.2
Marina Glancy [Fri, 13 Oct 2017 08:37:03 +0000 (16:37 +0800)]
MDL-60390 libraries: annonate horde upgrade to 2.30.2

4 years agoMDL-60390 libraries: upgrade horde to 2.30.2
Marina Glancy [Fri, 13 Oct 2017 07:12:49 +0000 (15:12 +0800)]
MDL-60390 libraries: upgrade horde to 2.30.2

4 years agoMerge branch 'MDL-60388_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Mon, 23 Oct 2017 02:00:41 +0000 (10:00 +0800)]
Merge branch 'MDL-60388_master' of git://github.com/dmonllao/moodle

4 years agoMDL-60537 calendar: Fix behat following string changes
Andrew Nicols [Mon, 23 Oct 2017 00:26:24 +0000 (08:26 +0800)]
MDL-60537 calendar: Fix behat following string changes

4 years agoMDL-60537 tool_httpsreplace: Fix behat following langstring
Andrew Nicols [Mon, 23 Oct 2017 00:25:55 +0000 (08:25 +0800)]
MDL-60537 tool_httpsreplace: Fix behat following langstring

4 years agoMDL-58605 mod_scorm: Simplify feature
Andrew Nicols [Fri, 20 Oct 2017 07:12:15 +0000 (15:12 +0800)]
MDL-58605 mod_scorm: Simplify feature

The singlescobasic_missingorg.zip file includes a modified version of
the javascript which deliberately breaks content.

We need it to have different file names to not break other similar copies
of the file.

4 years agoMDL-60527 templates: missing spaces round attribute and aria-labelledby
Luca Bösch [Sat, 21 Oct 2017 16:17:42 +0000 (17:17 +0100)]
MDL-60527 templates: missing spaces round attribute and aria-labelledby

4 years agoMDL-59100 dml: Lower the case of INFORMATION_SCHEMA.* fields.
Matteo Scaramuccia [Mon, 4 Sep 2017 20:58:00 +0000 (22:58 +0200)]
MDL-59100 dml: Lower the case of INFORMATION_SCHEMA.* fields.

4 years agoon-demand release 3.4dev+
Eloy Lafuente (stronk7) [Fri, 20 Oct 2017 21:55:42 +0000 (23:55 +0200)]
on-demand release 3.4dev+

4 years agoMDL-60485 modgrade: Change string expectation in related test
Eloy Lafuente (stronk7) [Fri, 20 Oct 2017 16:55:40 +0000 (18:55 +0200)]
MDL-60485 modgrade: Change string expectation in related test

4 years agoMDL-60388 analytics: Any write action looking at all contexts below course
David Monllao [Tue, 10 Oct 2017 09:00:41 +0000 (11:00 +0200)]
MDL-60388 analytics: Any write action looking at all contexts below course

4 years agoMDL-60517 mlbackend_python: Use 0.0.4 moodlemlbackend package
David Monllao [Fri, 20 Oct 2017 09:22:35 +0000 (11:22 +0200)]
MDL-60517 mlbackend_python: Use 0.0.4 moodlemlbackend package

0.0.4 update fixes an incorrectly specified tensorflow dependency

4 years agoMDL-60108 registration: do not offer registration in behat tests
Marina Glancy [Fri, 20 Oct 2017 06:35:31 +0000 (14:35 +0800)]
MDL-60108 registration: do not offer registration in behat tests

4 years agoMerge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Fri, 20 Oct 2017 03:49:54 +0000 (16:49 +1300)]
Merge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle

4 years agoMDL-60072 mod_lesson: Add missing name attribute
Andrew Nicols [Fri, 20 Oct 2017 03:43:15 +0000 (11:43 +0800)]
MDL-60072 mod_lesson: Add missing name attribute

4 years agoMerge branch 'wip-MDL-60485-master' of git://github.com/abgreeve/moodle
David Monllao [Fri, 20 Oct 2017 02:43:19 +0000 (04:43 +0200)]
Merge branch 'wip-MDL-60485-master' of git://github.com/abgreeve/moodle

4 years agoMerge branch 'MDL-60406-master' of git://github.com/lameze/moodle
David Monllao [Fri, 20 Oct 2017 02:38:06 +0000 (04:38 +0200)]
Merge branch 'MDL-60406-master' of git://github.com/lameze/moodle

4 years agoMDL-60406 core_calendar: proper calendar dates calculation
Simey Lameze [Tue, 17 Oct 2017 01:19:14 +0000 (09:19 +0800)]
MDL-60406 core_calendar: proper calendar dates calculation

4 years agoMerge branch 'MDL-60456-master' of git://github.com/damyon/moodle
Andrew Nicols [Fri, 20 Oct 2017 02:27:20 +0000 (10:27 +0800)]
Merge branch 'MDL-60456-master' of git://github.com/damyon/moodle

4 years agoMerge branch 'MDL-60123-master' of https://github.com/snake/moodle
David Monllao [Fri, 20 Oct 2017 00:22:11 +0000 (02:22 +0200)]
Merge branch 'MDL-60123-master' of https://github.com/snake/moodle

4 years agoMDL-60072 course: Apply correct event name for assign due date
Jun Pataleta [Thu, 19 Oct 2017 22:35:17 +0000 (11:35 +1300)]
MDL-60072 course: Apply correct event name for assign due date

4 years agoMerge branch 'MDL-60342-master' of https://github.com/patkira/moodle
Eloy Lafuente (stronk7) [Thu, 19 Oct 2017 21:23:49 +0000 (23:23 +0200)]
Merge branch 'MDL-60342-master' of https://github.com/patkira/moodle

4 years agoMerge branch 'wip-MDL-60314-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Thu, 19 Oct 2017 21:17:26 +0000 (23:17 +0200)]
Merge branch 'wip-MDL-60314-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'wip-MDL-60313-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Thu, 19 Oct 2017 20:48:40 +0000 (22:48 +0200)]
Merge branch 'wip-MDL-60313-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Thu, 19 Oct 2017 20:30:08 +0000 (22:30 +0200)]
Merge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'MDL-60449-master-enfix' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Thu, 19 Oct 2017 20:20:01 +0000 (22:20 +0200)]
Merge branch 'MDL-60449-master-enfix' of git://github.com/mudrd8mz/moodle

4 years agoMDL-60449 lang: Properly replace the generic string with a specific one
David Mudrák [Thu, 19 Oct 2017 15:35:06 +0000 (17:35 +0200)]
MDL-60449 lang: Properly replace the generic string with a specific one

The general string 'Publish' has been used in sense of publishing a
course on a hub - as such, it is better to keep that string together
with other related strings in the core_hub component. All these are
being reworded to 'Share'.

As this has been the only meaning of the string in the core, I am
deprecating it now. Third party plugins should better come with their
own variant of the string, should they need it.

4 years agoMDL-60449 lang: Merge English strings from the en_fix language pack
Helen Foster [Thu, 19 Oct 2017 15:19:08 +0000 (17:19 +0200)]
MDL-60449 lang: Merge English strings from the en_fix language pack

Significant string changes:

* multiple strings in core_hub - 'Publish' changed to 'Share' plus other
  wording improvements to avoid misunderstandings
* errorretrievingkey in message_airnotifier - improved wording and
  removing reference to Moodle.org
* enddate_help and courseduration_desc in core - clearer wording
  explaining what the date actually does
* restore:viewautomatedfilearea in core_role - changing wording to match
  the behaviour
* dropzones_help in qtype_ddmarker - improved wording
* autologinkeygenerationlockout in tool_mobile - updated error message
* configallowemailaddresses in core_admin - clearer description
* subscriptionmode_helpin mod_forum - removing misleading sentence about
  subscription mode changes not affecting existing users

4 years agoMerge branch 'master-MDL-60116' of https://github.com/fwsl/moodle
David Monllao [Thu, 19 Oct 2017 13:54:23 +0000 (15:54 +0200)]
Merge branch 'master-MDL-60116' of https://github.com/fwsl/moodle

4 years agoMerge branch 'wip-MDL-58915-master' of git://github.com/marinaglancy/moodle
David Monllao [Thu, 19 Oct 2017 13:44:07 +0000 (15:44 +0200)]
Merge branch 'wip-MDL-58915-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'MDL-60444-master' of git://github.com/andrewnicols/moodle
David Monllao [Thu, 19 Oct 2017 13:41:56 +0000 (15:41 +0200)]
Merge branch 'MDL-60444-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'MDL-60179_master' of git://github.com/markn86/moodle
David Monllao [Thu, 19 Oct 2017 13:26:27 +0000 (15:26 +0200)]
Merge branch 'MDL-60179_master' of git://github.com/markn86/moodle

4 years agoMerge branch 'MDL-60378-master' of git://github.com/jleyva/moodle
David Monllao [Thu, 19 Oct 2017 12:06:26 +0000 (14:06 +0200)]
Merge branch 'MDL-60378-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-60233-master' of git://github.com/jleyva/moodle
David Monllao [Thu, 19 Oct 2017 11:49:23 +0000 (13:49 +0200)]
Merge branch 'MDL-60233-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-60182_master' of https://github.com/nadavkav/moodle
David Monllao [Thu, 19 Oct 2017 11:29:52 +0000 (13:29 +0200)]
Merge branch 'MDL-60182_master' of https://github.com/nadavkav/moodle

4 years agoMerge branch 'MDL-60375_master' of git://github.com/dmonllao/moodle
Jun Pataleta [Thu, 19 Oct 2017 09:03:56 +0000 (22:03 +1300)]
Merge branch 'MDL-60375_master' of git://github.com/dmonllao/moodle

4 years agoMerge branch 'MDL-60410_master' of git://github.com/dmonllao/moodle
Jun Pataleta [Thu, 19 Oct 2017 09:01:21 +0000 (22:01 +1300)]
Merge branch 'MDL-60410_master' of git://github.com/dmonllao/moodle

4 years agoMerge branch 'MDL-60469-master' of git://github.com/andrewnicols/moodle
David Monllao [Thu, 19 Oct 2017 08:51:59 +0000 (10:51 +0200)]
Merge branch 'MDL-60469-master' of git://github.com/andrewnicols/moodle

4 years agoMDL-60247 block_glossary_random: Skip rendundant value assign
David Monllao [Thu, 19 Oct 2017 08:36:25 +0000 (10:36 +0200)]
MDL-60247 block_glossary_random: Skip rendundant value assign

4 years agoMerge branch 'MDL-60247-multilang-html-glossary-block-titles' of https://github.com...
David Monllao [Thu, 19 Oct 2017 08:31:08 +0000 (10:31 +0200)]
Merge branch 'MDL-60247-multilang-html-glossary-block-titles' of https://github.com/lucaboesch/moodle

4 years agoMerge branch 'MDL-60153-master' of git://github.com/junpataleta/moodle
David Monllao [Thu, 19 Oct 2017 08:18:23 +0000 (10:18 +0200)]
Merge branch 'MDL-60153-master' of git://github.com/junpataleta/moodle

4 years agoMDL-36580 backup: Apply the decrypt() method to lti "secrets"
Eloy Lafuente (stronk7) [Tue, 17 Oct 2017 22:44:20 +0000 (00:44 +0200)]
MDL-36580 backup: Apply the decrypt() method to lti "secrets"

4 years agoMDL-36580 backup: General support for decrypted contents in restore
Eloy Lafuente (stronk7) [Tue, 17 Oct 2017 22:40:54 +0000 (00:40 +0200)]
MDL-36580 backup: General support for decrypted contents in restore

- Uses site generated (on backup) key.
- Can be applied potentially everywhere in the restore process.
- Covered with unit tests.
- Authentication / integrity aware so can be used between any 2 servers
  (just requires matching key).

4 years agoMDL-36580 backup: Use the encrypted_final_element for lti "secrets"
Eloy Lafuente (stronk7) [Mon, 27 Jun 2016 01:28:53 +0000 (03:28 +0200)]
MDL-36580 backup: Use the encrypted_final_element for lti "secrets"

4 years agoMDL-36580 backup: General support for encrypted contents in backups
Eloy Lafuente (stronk7) [Mon, 27 Jun 2016 00:32:09 +0000 (02:32 +0200)]
MDL-36580 backup: General support for encrypted contents in backups

- Built using standard backup custom fields.
- Can be applied potentially everywhere.
- Automatically addded 'encrypted' attribute.
- Defaults to site generated key.
- Enforces key robutness / provides authentication (hmac integrity)
- Covered with unit tests.

4 years agoMerge branch 'wip-MDL-60108-master' of git://github.com/marinaglancy/moodle
David Monllao [Thu, 19 Oct 2017 07:12:34 +0000 (09:12 +0200)]
Merge branch 'wip-MDL-60108-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'MDL-60175-master' of git://github.com/andrewnicols/moodle
David Monllao [Thu, 19 Oct 2017 07:07:05 +0000 (09:07 +0200)]
Merge branch 'MDL-60175-master' of git://github.com/andrewnicols/moodle

4 years agoMDL-52653 scorm: Comment for cms.completion_status
Damyon Wiese [Thu, 19 Oct 2017 06:55:18 +0000 (14:55 +0800)]
MDL-52653 scorm: Comment for cms.completion_status

4 years agoMDL-52653 SCORM: fix scorm_check_mode on v1.3
Christian Lawson-Perfect [Wed, 4 Oct 2017 10:27:03 +0000 (11:27 +0100)]
MDL-52653 SCORM: fix scorm_check_mode on v1.3

SCORM 2004 uses the element 'cmi.completion_status' to store the
completion status of a SCO, not 'cmi.core.lesson_status'.

This amends scorm_check_mode so that the right element is looked up.

When scorm_version_check returns false, SCORM 1.2 is assumed.

4 years agoMDL-60179 core: make it clear what enrolment instance is being edited
Mark Nelson [Mon, 16 Oct 2017 09:55:34 +0000 (17:55 +0800)]
MDL-60179 core: make it clear what enrolment instance is being edited

4 years agoMDL-60375 analytics: Fix incorrect var reference
David Monllao [Mon, 9 Oct 2017 09:26:43 +0000 (11:26 +0200)]
MDL-60375 analytics: Fix incorrect var reference

4 years agoMerge branch 'wip-MDL-60211-master' of https://github.com/Beedell/moodle
Andrew Nicols [Thu, 19 Oct 2017 06:22:30 +0000 (14:22 +0800)]
Merge branch 'wip-MDL-60211-master' of https://github.com/Beedell/moodle

4 years agoMDL-60456 javascript: Rebuild npm-shrinkwrap
Damyon Wiese [Thu, 19 Oct 2017 03:42:36 +0000 (11:42 +0800)]
MDL-60456 javascript: Rebuild npm-shrinkwrap

Build npm-shrinkwrap with the latest node version and only test the latest node version on travis.

4 years agoMerge branch 'MDL-60001_gzopen' of https://github.com/mrmark/moodle
Damyon Wiese [Thu, 19 Oct 2017 05:00:13 +0000 (13:00 +0800)]
Merge branch 'MDL-60001_gzopen' of https://github.com/mrmark/moodle

4 years agoMDL-58388 course: bump version
Damyon Wiese [Thu, 19 Oct 2017 04:54:27 +0000 (12:54 +0800)]
MDL-58388 course: bump version

Add a version bump for new admin setting

4 years agoMerge branch 'MDL-58388-master' of https://github.com/abias/moodle
Damyon Wiese [Thu, 19 Oct 2017 04:47:18 +0000 (12:47 +0800)]
Merge branch 'MDL-58388-master' of https://github.com/abias/moodle