Commit graph

20463 commits

Author SHA1 Message Date
Andrew Nicols
455b2c4b9f 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.
2017-10-23 07:56:10 +08:00
Jun Pataleta
eed0bc36e1 Merge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle 2017-10-20 16:49:54 +13:00
Andrew Nicols
fac5051624 MDL-60072 mod_lesson: Add missing name attribute 2017-10-20 11:43:15 +08:00
David Monllao
202221f934 Merge branch 'MDL-60123-master' of https://github.com/snake/moodle 2017-10-20 02:22:11 +02:00
Eloy Lafuente (stronk7)
6b7194a7cf Merge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle 2017-10-19 22:30:08 +02:00
Eloy Lafuente (stronk7)
ecb4a05cc2 Merge branch 'MDL-60449-master-enfix' of git://github.com/mudrd8mz/moodle 2017-10-19 22:20:01 +02:00
Helen Foster
89db57ca6d 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
2017-10-19 17:19:08 +02:00
David Monllao
23892d0843 Merge branch 'MDL-60378-master' of git://github.com/jleyva/moodle 2017-10-19 14:06:26 +02:00
David Monllao
eef0ce917b Merge branch 'MDL-60233-master' of git://github.com/jleyva/moodle 2017-10-19 13:49:23 +02:00
David Monllao
254c19e26f Merge branch 'MDL-60182_master' of https://github.com/nadavkav/moodle 2017-10-19 13:29:52 +02:00
Eloy Lafuente (stronk7)
059079e945 MDL-36580 backup: Apply the decrypt() method to lti "secrets" 2017-10-19 10:11:47 +02:00
Eloy Lafuente (stronk7)
4a7afd2bb9 MDL-36580 backup: Use the encrypted_final_element for lti "secrets" 2017-10-19 10:11:47 +02:00
Damyon Wiese
b233630c93 MDL-52653 scorm: Comment for cms.completion_status 2017-10-19 14:58:07 +08:00
Christian Lawson-Perfect
5d1ad088ea 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.
2017-10-19 14:58:07 +08:00
Mark Nelson
3dfd48ba9c MDL-57455 mod_data: moved export tag checkbox and set default
Also capitalised string 'tags'.

AMOS BEGIN
 CPY [tags,core],[tags,mod_data]
AMOS END
2017-10-18 16:03:17 +08:00
Juan Leyva
fe7b3e7e51 MDL-60378 mod_workshop: Add missing dimensions info
We need additional info from the dimensions used like the scale items
(if used).
2017-10-17 15:40:39 +02:00
David Monllao
b1a9a6a19a Merge branch 'wip-MDL-60281-master' of git://github.com/marinaglancy/moodle 2017-10-17 09:45:44 +02:00
Damyon Wiese
b35b588f00 Merge branch 'MDL-60058-int-fix-1' of github.com:ryanwyllie/moodle 2017-10-17 12:04:23 +08:00
Ryan Wyllie
83d4635d99 MDL-60063 feedback: add drag and drop of open close events 2017-10-17 03:54:24 +00:00
Ryan Wyllie
f2c3818b39 MDL-60063 feedback: show feedback events on calendar for teacher 2017-10-17 03:54:23 +00:00
Ryan Wyllie
dbe537fb50 MDL-60058 assign: add missing locallib require_once calls 2017-10-17 03:04:47 +00:00
Jake Dallimore
21bb56fd96 Merge branch 'MDL-59254-master' of git://github.com/jleyva/moodle 2017-10-17 10:33:41 +08:00
Eloy Lafuente (stronk7)
76feb5ac9b MDL-57455 mod_data: table aliases cannot use AS for crossdb 2017-10-16 19:16:17 +02:00
Juan Leyva
695b8712f6 MDL-59254 mod_workshop: Implement check_updates_since callback 2017-10-16 09:41:51 +02:00
Andrew Nicols
f10721d6b9 MDL-60072 mod: Fix bad event naming 2017-10-16 14:47:09 +08:00
Jun Pataleta
177c0a36ec Merge branch 'MDL-60124-master' of https://github.com/snake/moodle 2017-10-16 14:33:53 +08:00
Damyon Wiese
6dc633fd93 Merge branch 'MDL-60058-master-4' of git://github.com/ryanwyllie/moodle 2017-10-16 12:28:59 +08:00
Jake Dallimore
6b76e041f4 Merge branch 'MDL-57455_master' of git://github.com/markn86/moodle 2017-10-16 10:34:01 +08:00
Marina Glancy
33683bc80c MDL-60281 general: function each() is deprecated in PHP7.2 2017-10-16 09:37:20 +08:00
Marina Glancy
484b43f456 MDL-60281 general: create_function is deprecated in PHP7.2 2017-10-16 09:37:19 +08:00
Jake Dallimore
ee9d4a77ea MDL-60124 assign: comment annotation now auto reduces in size on delete 2017-10-16 08:49:36 +08:00
Jake Dallimore
324debc34b MDL-60123 assign: Allow teachers to deselect pdf annotations in editpdf
Clicking a blank area of the canvas will now deselect any currently
selected annotation.
2017-10-16 08:41:51 +08:00
Juan Segarra Montesinos
6e4e60ef9f MDL-60441 mod_glossary: Add a link to glossary entries 2017-10-15 15:33:17 +02:00
Juan Segarra Montesinos
f8c0b9e71f MDL-55808 mod_glossary: Search glossary entries with ratings enabled doesn't work 2017-10-13 17:12:37 +02:00
Juan Leyva
21824a9325 MDL-60433 mod_data: Fix groups in Web Services 2017-10-13 12:42:10 +02:00
Ryan Wyllie
7ec6d873e1 MDL-60058 assign: stop teacher from seeing due date event on dashboard
Thanks to Damyon Wiese for the patch.
2017-10-13 06:38:03 +00:00
Andrew Nicols
028fa14436 MDL-60058 assign: Updating gradingduedate on drag/drop 2017-10-13 06:38:02 +00:00
Ryan Wyllie
8c4b939cfe MDL-60058 choice: implement timestart range callback for calendar UI 2017-10-13 06:38:02 +00:00
Jake Dallimore
20b5ea16b7 NOBUG: Fixed file access permissions 2017-10-13 14:33:08 +08:00
Ryan Wyllie
f4c2156189 MDL-60058 assign: allow update of assign calendar action events 2017-10-13 06:18:43 +00:00
Mark Nelson
0f09368cbb MDL-57455 mod_data: extended Behat test to cover searching names
Merged two Behat files that were doing similar things.
2017-10-13 11:01:42 +08:00
Jake Dallimore
41be91c00b MDL-60002 assign: Fixed validation on save and save and show next. 2017-10-13 09:04:08 +08:00
Mark Nelson
822b3346ce MDL-57455 mod_data: added 'Manage standard tags' link 2017-10-12 16:59:16 +08:00
Mark Nelson
80effa0faa MDL-57455 mod_data: added reset tags functionality 2017-10-12 16:59:16 +08:00
Mark Nelson
5623d18784 MDL-57455 mod_data: performance improvement for tags backup/restore 2017-10-12 16:59:16 +08:00
Mark Nelson
a783cf701c MDL-57455 mod_data: allow tags to be removed from search criteria 2017-10-12 16:59:16 +08:00
Mark Nelson
f7a12344cb MDL-57455 mod_data: added missing accessibility check 2017-10-12 16:59:15 +08:00
Andrew Hancox
ee9a2706b3 MDL-57455 mod_data: Added PHPUnit tests 2017-10-12 16:59:15 +08:00
Andrew Hancox
f4c5328c2b MDL-57455 mod_data: Added Behat tests to cover tagging 2017-10-12 16:59:15 +08:00
Andrew Hancox
04f7b079bc MDL-57455 mod_data: Import and export tags 2017-10-12 16:59:15 +08:00