22036 Commits

Author SHA1 Message Date
Jake Dallimore
ccae2f74f8 Merge branch 'MDL-69130-master-enfix' of git://github.com/mudrd8mz/moodle 2020-07-02 12:07:58 +08:00
Jake Dallimore
c39dc16da4 Merge branch 'MDL-58926-ajax-timer' of https://github.com/rboyatt/moodle 2020-07-02 09:37:00 +08:00
Andrew Nicols
868a1c377d MDL-69072 mod_scorm: Stop mink reset after tests
This is now done for all scenarios. It is no longer necessary to do so
specifically for mod_scorm.
2020-06-26 21:17:23 +08:00
Helen Foster
38d5e3db1b MDL-69130 lang: Import fixed English strings (en_fix)
Significant string change:

- presentationoraltrequired,atto_image - wording changed to mention
  'decorative only' checkbox
2020-06-25 21:54:13 +02:00
Victor Deniz Falcon
e055a45160 Merge branch 'MDL-66899-log-quiz-regrade' of https://github.com/rboyatt/moodle 2020-06-18 04:16:53 +01:00
Jun Pataleta
26f3788857 Merge branch 'MDL-67294-master' of git://github.com/mihailges/moodle 2020-06-17 10:33:55 +08:00
Mihail Geshoski
2e5e143061 MDL-67294 assignsubmission_file: Make sure record exists before updating 2020-06-17 00:50:22 +08:00
Eloy Lafuente (stronk7)
b764343e5a MDL-69044 upgrade: add 3.9.0 separation line to all upgrade scripts 2020-06-14 13:08:09 +02:00
Eloy Lafuente (stronk7)
698e225d61 Merge branch 'MDL-68632' of git://github.com/aolley/moodle 2020-06-12 19:59:55 +02:00
Adam Olley
9db6c361fd MDL-68632 quizaccess_seb: Limit privacy queriyes to the quiz module
Without this, joins are performed against the course_modules table purely on
the instance id - other modules can share this ID, resulting in incorrect
contexts being pulled in.
2020-06-12 12:31:01 +09:30
Sara Arjona
1826ac971a Merge branch 'MDL-68902-master' of git://github.com/ferranrecio/moodle 2020-06-10 17:57:40 +02:00
Ferran Recio
56d9b5f8d5 MDL-68902 mod_h5pactivity: fix result report output 2020-06-10 17:50:55 +02:00
Víctor Déniz Falcón
69184789b5 Merge branch 'MDL-68986-master' of git://github.com/merrill-oakland/moodle 2020-06-10 13:12:58 +01:00
Jake Dallimore
337e2e2b23 Merge branch 'MDL-68973' of https://github.com/stronk7/moodle 2020-06-10 16:13:57 +08:00
Sara Arjona
e5a2b74d8b Merge branch 'MDL-68955' of https://github.com/Chocolate-lightning/moodle 2020-06-10 08:06:05 +02:00
Mathew May
e0c41c0449 MDL-68955 mod_h5pactivity: Enable dndupload to H5P activity 2020-06-10 10:10:51 +08:00
Helen Foster
1ab405f4a2 MDL-68972 lang: Import fixed English strings (en_fix) 2020-06-09 20:56:34 +02:00
Eloy Lafuente (stronk7)
e69ab798dd MDL-68973 versions: Fix other small details
Thanks to Luca Bösch and Matteo Scaramuccia that detected
these 2 minor, but ugly details in core version files:

1) Adding comments pointed to versions (3.x, 20190801...) is not
   recommended, they easily come outdated.
2) Using plugin->release in core is no sense. Core plugins belong
   to the core release.

This commit just gets rid of them. That's all.
2020-06-09 20:27:30 +02:00
Eloy Lafuente (stronk7)
115cc0214f MDL-68973 versions: bump all versions and requires near release
version = 2020061500 release version
requires= 2020060900 current rc1 (week7roll1) version
2020-06-09 16:23:09 +02:00
Eric Merrill
178a914acd MDL-68986 quiz: Add back default/adv for questionsperpage setting 2020-06-09 09:24:19 -04:00
Russell Boyatt
8a2d8ec472 MDL-66899 quiz: Adding test for regrading quiz event. 2020-06-09 09:50:34 +01:00
Andrew Nicols
f2d6a96494 Merge branch 'MDL-68956' of https://github.com/Chocolate-lightning/moodle 2020-06-09 08:51:38 +08:00
Russell Boyatt
fad72d7177 MDL-66899 quiz: Log a regrading event when quiz attempt is regraded. 2020-06-08 20:44:23 +01:00
Jun Pataleta
eee5661146 Merge branch 'MDL-68916-master' of git://github.com/mihailges/moodle 2020-06-08 14:25:54 +08:00
Mihail Geshoski
36c3eb0438 MDL-68916 mod_h5pactivity: Fix duplicated user error in attempts report 2020-06-08 14:17:10 +08:00
Mathew May
39bc6c4c2e MDL-68956 mod_h5pactivity: Move templates to L2 namespaces 2020-06-08 12:50:03 +08:00
Adrian Greeve
5244420b1b Merge branch 'MDL-68930-master' of git://github.com/cescobedo/moodle 2020-06-08 11:47:44 +08:00
Andrew Nicols
99de0bb062 Merge branch 'MDL-68918-master' of git://github.com/ferranrecio/moodle 2020-06-08 10:47:24 +08:00
Russell Boyatt
747f5ba09b MDL-58926 quiz: Addition of AJAX based quiz timer. 2020-06-06 17:28:02 +01:00
Eloy Lafuente (stronk7)
f6128f3919 Merge branch 'MDL-68888-master-enfix' of git://github.com/mudrd8mz/moodle 2020-06-05 19:21:43 +02:00
cescobedo
00ae91688d MDL-68930 mod_h5pactivity: Check submit cap when tracking is enabled 2020-06-05 17:08:47 +02:00
Ferran Recio
2bdd6b120c MDL-68918 mod_h5pactivity: add context to get_h5pactivities_by_courses 2020-06-05 14:27:38 +02:00
Sara Arjona
d85980fd85 NOBUG: Fixed SVG browser compatibility 2020-06-05 13:24:10 +02:00
Adrian Greeve
be812a064b Merge branch 'MDL-68826-master' of git://github.com/ferranrecio/moodle 2020-06-05 15:24:26 +08:00
Helen Foster
98c882132d MDL-68888 lang: Import fixed English strings (en_fix)
Significant string changes: userdata, userdata_help, keptroles,
keptroles_help in core_backup - Clearer wording about how the settings
work.
2020-06-05 08:33:55 +02:00
Ferran Recio
dd75c98889 MDL-68826 mod_h5pactivity: fix content bank link 2020-06-05 08:31:00 +02:00
Adrian Greeve
ac69c0eb96 Merge branch 'MDL-68826-master' of git://github.com/ferranrecio/moodle 2020-06-05 13:35:03 +08:00
Jun Pataleta
618b13e1f5 Merge branch 'MDL-67883-squash' of https://github.com/Chocolate-lightning/moodle 2020-06-05 11:52:36 +08:00
Mathew May
16d77f1884 MDL-67883 core: Make core ready for MoodleNet. 2020-06-05 11:47:42 +08:00
Ferran Recio
7f6026323d MDL-68826 mod_h5pactivity: content bank message in form 2020-06-04 18:41:05 +02:00
Jake Dallimore
aa40de942a Merge branch 'MDL-68800-lti-gbs-patch-fixes' of https://github.com/cengage/moodle 2020-06-04 14:55:58 +08:00
Andrew Nicols
2eba6e42a5 Merge branch 'MDL-68825-master' of git://github.com/ferranrecio/moodle 2020-06-04 08:40:18 +08:00
Sara Arjona
688ba22d6b Merge branch 'MDL-68871-master' of git://github.com/ferranrecio/moodle 2020-06-03 18:48:01 +02:00
Sara Arjona
7e05ece1b3 Merge branch 'MDL-68772-master' of https://github.com/Clyxz/moodle 2020-06-03 13:17:32 +02:00
Ferran Recio
3af22ad962 MDL-68871 mod_h5pactivity: fix webservice get_results return types 2020-06-02 17:23:56 +02:00
Martin Hanusch
398f0ae110 MDL-68772 mod_quiz: Navigation overlay fix 2020-06-02 16:50:02 +02:00
Ferran Recio
90d8fe1532 MDL-68825 mod_h5pactivity: fixing svg icon size 2020-06-02 12:22:15 +02:00
Bas Brands
94fd778dbf MDL-68840 mod_quiz: random question in question list css fix 2020-06-02 10:54:54 +02:00
Claude Vervoort
c93c711ab0 MDL-68800 mod_lti: create gbs only for restored activity 2020-05-29 17:46:07 -04:00
Jun Pataleta
323f5f46c7 Merge branch 'MDL-68855-master' of git://github.com/cescobedo/moodle 2020-05-29 11:48:46 +08:00