97260 Commits

Author SHA1 Message Date
Sara Arjona
a58e8cb0a1 Merge branch 'MDL-68379-master' of git://github.com/ferranrecio/moodle 2020-05-04 20:02:06 +02:00
Sara Arjona
da2f9f6510 Merge branch 'MDL-67713-master' of git://github.com/ferranrecio/moodle 2020-05-04 19:30:45 +02:00
Ferran Recio
72a2335151 MDL-68379 core_xapi: adding result, attachments and context to statement 2020-05-04 18:47:11 +02:00
Ferran Recio
75ba339cdb MDL-68379 mod_h5pactivity: adding item_result to xAPI handler 2020-05-04 18:47:11 +02:00
Ferran Recio
7f5b6adac1 MDL-67713 mod_h5pactivity: adding backup and restore 2020-05-04 18:42:48 +02:00
Sara Arjona
271d08f37b Merge branch 'MDL-68315-master' of https://github.com/kabalin/moodle 2020-05-04 10:37:17 +02:00
Andrew Nicols
3ba4248fe7 Merge branch 'MDL-68502-master' of git://github.com/ferranrecio/moodle 2020-05-04 15:59:04 +08:00
Andrew Nicols
34851c1171 Merge branch 'MDL-68266-master' of git://github.com/bmbrands/moodle 2020-05-04 15:33:14 +08:00
Ferran Recio
b4f617a609 MDL-68502 mod_h5pactivity: fixing get_file_info error 2020-05-04 09:30:32 +02:00
Jun Pataleta
716ac2c902 Merge branch 'MDL-68409-master' of git://github.com/andrewnicols/moodle 2020-05-04 15:22:12 +08:00
Bas Brands
a521226dd2 MDL-68266 core_course: accessibility improvements for course managent
colour contrast improvements
use custom checkboxes
use accessible colour for text-muted
2020-05-04 09:11:03 +02:00
Andrew Nicols
47d094817f MDL-68409 behat: Fix tests from modal rewrite 2020-05-04 15:08:11 +08:00
Andrew Nicols
67774a9567 MDL-68409 js: Convert cancel modals to ES6 2020-05-04 15:08:11 +08:00
Andrew Nicols
9050f3f17e MDL-68409 js: Convert alert and confirmation dialogues to use modal 2020-05-04 15:08:10 +08:00
Andrew Nicols
e8df743b3b MDL-68409 js: Convert core/notification to ES6 2020-05-04 15:07:49 +08:00
Andrew Nicols
b810c84f2b MDL-68409 js: Add Alert modal 2020-05-04 15:07:49 +08:00
Andrew Nicols
fc3d7d693a MDL-68409 js: Fix eslint failure in modal 2020-05-04 15:07:48 +08:00
Andrew Nicols
92810f7af9 MDL-68409 js: Add setButtonText modal helper 2020-05-04 15:07:48 +08:00
Andrew Nicols
fa6101ba27 MDL-68409 js: Add helper to register close event on save/cancel 2020-05-04 15:07:48 +08:00
Adrian Greeve
5d91ca0d7a Merge branch 'MDL-68454-master' of git://github.com/andrewnicols/moodle 2020-05-04 12:18:54 +08:00
Andrew Nicols
2cc28979f0 MDL-68454 mod_feedback: Update get_context to match parent 2020-05-04 11:52:20 +08:00
Andrew Nicols
685fe08003 MDL-68454 table: Improve documentation for dynamic table 2020-05-04 11:52:19 +08:00
Andrew Nicols
5615a772a6 MDL-68454 table: Move guessing of base URL to flexible 2020-05-04 11:52:19 +08:00
Andrew Nicols
56143dd622 MDL-68454 table: Move filterset functionality to flexible_table 2020-05-04 11:52:19 +08:00
Andrew Nicols
c00552b3b0 MDL-68454 table: Move get_context from dynamic to flexible 2020-05-04 11:52:19 +08:00
Andrew Nicols
ff475522fb MDL-68454 table: Drop get_unique_id_from_argument fn requirement
This was originally intended to be a way for the calling code to specify
data as part of the table construction which could then be used as
appropriate. When the filterset was created the requirement for this
function no longer existed.

Removing this to simplify the API.
2020-05-04 11:52:19 +08:00
Jake Dallimore
cd98a57b9f Merge branch 'MDL-68382-master' of https://github.com/HuongNV13/moodle 2020-05-04 10:37:50 +08:00
Adrian Greeve
4f7b9e3276 Merge branch 'MDL-68330-master-2' of git://github.com/mihailges/moodle 2020-05-04 07:15:03 +08:00
Andrew Nicols
2d1944fe60 Merge branch 'MDL-66263' of https://github.com/stronk7/moodle 2020-05-03 20:21:17 +08:00
Andrew Nicols
e2ad2506df Merge branch 'MDL-68589' of https://github.com/stronk7/moodle 2020-05-03 20:13:54 +08:00
Andrew Nicols
53c06b63c5 Merge branch 'MDL-68473-master' of git://github.com/vmdef/moodle 2020-05-03 19:59:46 +08:00
Eloy Lafuente (stronk7)
2f24562d07 MDL-68589 plist: Add information about local changes 2020-05-03 01:28:41 +02:00
Eloy Lafuente (stronk7)
bf527c8bf9 MDL-68589 plist: PHP 7.4 curly bracket fixes
Note this is, partially, https://github.com/TECLIB/CFPropertyList/pull/61

I only have applied the stricly required PHP 7.4 changes, keeping
apart the intval() ==> (int) change, because that's unrelated to
this fix.
2020-05-03 01:05:10 +02:00
Eloy Lafuente (stronk7)
31bb99549e MDL-66263 travis: Simple bump to php74
Also update a couple of places (mysql, node)
that were not runnig really on highest. Now they are.
2020-05-02 17:19:15 +02:00
Eloy Lafuente (stronk7)
cd391f9922 on-demand release 3.9dev+ 2020-05-02 16:37:31 +02:00
Eloy Lafuente (stronk7)
89696acccf Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2020-05-02 16:37:29 +02:00
Eloy Lafuente (stronk7)
1097530242 Merge branch 'MDL-68328-dlfix' of https://github.com/cengage/moodle 2020-05-01 23:33:08 +02:00
Claude Vervoort
779e753faf MDL-68328 mod_lti: resourcekey and pwd hidden not removed 2020-05-01 15:03:14 -04:00
Eloy Lafuente (stronk7)
157f5c9e54 Merge branch 'MDL-66135' of https://github.com/paulholden/moodle 2020-05-01 16:07:56 +02:00
Víctor Déniz Falcón
a8455b7240 MDL-68473 core_h5p: moved fixture to anonymous class 2020-05-01 14:25:11 +01:00
Victor Deniz Falcon
e4127c9262 MDL-68473 core_h5p: fixed import of moodleform class 2020-05-01 13:59:16 +01:00
Paul Holden
e1dfd4b83c MDL-66135 tool_uploadcourse: case-insensitive date string comparison.
Account for PM/pm differences in PHP on different OS.
2020-05-01 09:05:07 +01:00
Jun Pataleta
c9a5ccccf0 Merge branch 'MDL-67798-master-fix' of git://github.com/andrewnicols/moodle 2020-05-01 15:44:26 +08:00
Andrew Nicols
9e0c40d1bd MDL-67798 contentbank: Sort data before comparison 2020-05-01 15:42:01 +08:00
Andrew Nicols
3076dfe55d Merge branch 'MDL-68492-master' of https://github.com/sammarshallou/moodle 2020-05-01 12:07:00 +08:00
Andrew Nicols
ce8cc79712 MDL-67798 contentbank: Whitespace fixes 2020-05-01 11:51:15 +08:00
Andrew Nicols
468817abcd Merge branch 'MDL-67798-master' of git://github.com/cescobedo/moodle 2020-05-01 11:43:20 +08:00
Andrew Nicols
aa3813b72b Merge branch 'master_MDL-67540' of https://github.com/golenkovm/moodle 2020-05-01 11:20:55 +08:00
Jun Pataleta
cfcbebaacb Merge branch 'MDL-68506-master' of git://github.com/andrewnicols/moodle 2020-05-01 11:20:21 +08:00
Andrew Nicols
8d186121ab Merge branch 'MDL-57680' of https://github.com/timhunt/moodle 2020-05-01 11:00:19 +08:00