88460 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
2f27dca60d Merge branch 'MDL-60548-master-v4' of https://github.com/Dave-B/moodle 2018-04-10 17:14:46 +02:00
Eloy Lafuente (stronk7)
bd0391d284 Merge branch 'wip-MDL-58697-master-assigngrading' of git://github.com/adamann2/moodle 2018-04-10 15:53:37 +02:00
Kathrin Osswald
64448e1ea9 MDL-61298 theme Boost: Nav drawer icon improvements. 2018-04-10 15:31:12 +02:00
David Monllao
5ba5a5e31d Merge branch 'MDL-61838-master' of git://github.com/mihailges/moodle 2018-04-10 13:44:05 +02:00
David Monllao
8373df9687 Merge branch 'MDL-61843-master' of git://github.com/mihailges/moodle 2018-04-10 13:42:43 +02:00
Dan Marsden
fbfd69a865 MDL-32585 mod_scorm: Improve force new attempts setting.
AMOS BEGIN
 MOV [forcenewattempt,mod_scorm],[forcenewattempts,mod_scorm]
AMOS END
2018-04-10 13:38:51 +02:00
Eloy Lafuente (stronk7)
a706fd79a5 MDL-61875 tests: Use existing component & support $CFG->admin 2018-04-10 13:14:34 +02:00
Eloy Lafuente (stronk7)
7aeb85770f Merge branch 'MDL-61875-master' of https://github.com/snake/moodle 2018-04-10 13:03:27 +02:00
Mark Nelson
23de6f3a2d MDL-61255 core_message: add warning when notifications not migrated 2018-04-10 17:28:52 +08:00
Mark Nelson
78348dfc4e MDL-61255 core_message: added helper function to detect legacy messages 2018-04-10 17:28:52 +08:00
Mark Nelson
84f6a716b2 MDL-61255 core_message: migrate data from the 'message_popup' table 2018-04-10 17:26:43 +08:00
Mark Nelson
6f0731adc5 MDL-61255 core_message: adjusted upgrade.txt 2018-04-10 15:17:01 +08:00
Mark Nelson
e78523bff8 MDL-61255 message_popup: change API so it uses new table 2018-04-10 15:17:01 +08:00
Mark Nelson
1f64f17429 MDL-61255 message_popup: add table to store notifications 2018-04-10 15:17:01 +08:00
Mark Nelson
7022b8d9e4 MDL-61255 core_message: add notification when data not migrated 2018-04-10 15:17:01 +08:00
Mark Nelson
5cc6b3eeb5 MDL-61255 core_message: added unit test for task 2018-04-10 15:17:01 +08:00
Mark Nelson
41bc5aa587 MDL-61255 core_message: created task to handle migration of data 2018-04-10 15:17:01 +08:00
David Monllao
d25a8e3c69 Merge branch 'MDL-61846-master' of git://github.com/mihailges/moodle 2018-04-10 08:59:25 +02:00
David Monllao
e7d10540d9 Merge branch 'MDL-61343-master' of git://github.com/Kathrin84/moodle 2018-04-10 08:29:39 +02:00
David Monllao
fd91aab1e7 Merge branch 'MDL-61129-fix-accessibility-on-tables-mod_survey_MASTER' of https://github.com/guillalva06/moodle 2018-04-10 07:57:47 +02:00
Farhan Karmali
fe5b5be1dd MDL-61208 enrol: Standard enrol plugins should use tasks instead of cron 2018-04-10 09:16:17 +05:30
Andrew Nicols
0d900be445 Merge branch 'MDL-61837-master' of git://github.com/lameze/moodle 2018-04-10 11:16:12 +08:00
Andrew Nicols
091a2630a7 Merge branch 'MDL-61795-master' of git://github.com/mihailges/moodle 2018-04-10 10:40:01 +08:00
Mihail Geshoski
9b8822d2a6 MDL-61795 block_rss_client: Add privacy files and unit tests 2018-04-10 09:34:38 +08:00
Andrew Nicols
f31450578a MDL-58065 media_videojs: Clarify langstring 2018-04-10 08:54:16 +08:00
Andrew Nicols
b4deb66146 Merge branch 'MDL-58065-master' of https://github.com/lucisgit/moodle 2018-04-10 08:54:12 +08:00
Jake Dallimore
6e6ba82305 MDL-61875 core_privacy: update the core_component_list in the manager 2018-04-10 08:44:42 +08:00
Jake Dallimore
5749f8a4f7 MDL-61875 core_component: new method to get full components list 2018-04-10 08:44:40 +08:00
Eloy Lafuente (stronk7)
6502ba9a26 Merge branch 'MDL-61869_master' of https://github.com/marxjohnson/moodle 2018-04-10 02:26:24 +02:00
Eloy Lafuente (stronk7)
1f4670653d Merge branch 'MDL-61860-master' of https://github.com/mackensen/moodle 2018-04-10 01:00:31 +02:00
Eloy Lafuente (stronk7)
805a3a4ed7 Merge branch 'MDL-60196_master' of https://github.com/mfabriczy/moodle 2018-04-10 00:55:54 +02:00
Eloy Lafuente (stronk7)
445f3e3f4f Merge branch 'MDL-61449-master' of git://github.com/jleyva/moodle 2018-04-10 00:43:31 +02:00
Eloy Lafuente (stronk7)
90ce448189 Merge branch 'MDL-60774-master' of git://github.com/jleyva/moodle 2018-04-10 00:02:49 +02:00
Daniel Thies
e909bfc70f MDL-61476 mod_glossary: Check XML arrays exist 2018-04-09 23:27:27 +02:00
Daniel Thies
26c9798596 MDL-61476 mod_glossary: Support tags in entries export 2018-04-09 23:26:34 +02:00
Eloy Lafuente (stronk7)
cb03034466 Merge branch 'MDL-61861-master' of git://github.com/andrewnicols/moodle 2018-04-09 20:23:49 +02:00
Tony Butler
60e9f9083e MDL-59691 assignfeedback_editpdf: Allow comment placement to all edges
Plus a couple of extra usability improvements:
- Collapse comment during move to allow precise placement
- Change cursor style to indicate that dragging is possible
2018-04-09 16:55:36 +01:00
Tony Butler
ad7c719de4 MDL-59691 assignfeedback_editpdf: Allow comments to collapse to top-left
Forcing them to collapse to the bottom-left corner seems less natural
and effectively changes the location of existing comments from pre-3.3
2018-04-09 16:55:36 +01:00
sam marshall
a539e5605c MDL-61824 core_search: Deleting restored context caused error
When restoring content, this adds it to a queue for indexing. If the
restored content was then deleted before the indexing takes place,
this caused an exception in the scheduled task.

This change makes it continue safely past missing contexts.
2018-04-09 16:36:30 +01:00
Guillermo Alvarez
f1dd1cb5e0 MDL-61129 survey: Add colgroup attribute at survey question tables 2018-04-09 10:33:43 -05:00
Stephen Bourget
75653a3068 MDL-55491 badges: Add cohort as badge criteria 2018-04-09 11:03:30 +02:00
Eugene Venter
abc07b53a7 MDL-55491 badges: Add cohort as badge criteria
commissioned by NZ Customs Service
2018-04-09 10:23:50 +02:00
Jake Dallimore
417ef862e4 Merge branch 'MDL-61711' of git://github.com/stronk7/moodle 2018-04-09 16:19:44 +08:00
Andrew Nicols
adf4ae83fc Merge branch 'MDL-61829-master' of git://github.com/zig-moodle/moodle 2018-04-09 15:28:18 +08:00
Andrew Nicols
43c5278ad3 Merge branch 'MDL-61736-master' of git://github.com/sarjona/moodle 2018-04-09 15:25:02 +08:00
Sara Arjona
3449816e7f MDL-61736 user: Show correct status when enrol method is disabled
When disabling an enrolment method, the user status will be displayed
as "Not current" instead of "Active".
2018-04-09 08:45:57 +02:00
Zig Tan
f5edb0c638 MDL-61829 block_community: Implement privacy provider 2018-04-09 14:09:14 +08:00
Andrew Nicols
98645b5be4 Merge branch 'MDL-60416_master' of git://github.com/markn86/moodle 2018-04-09 13:38:56 +08:00
Marina Glancy
5714c88b5f MDL-61852 core: 3rd party lib include cleanup 2018-04-09 12:27:45 +08:00
Bas Brands
ea33609e4b MDL-61852 lib: move popper.js to core
Popper is used in tool_usertours. Bootstrap 4 stable depends on popper too. Moving to /lib so both can use a single popper.js lib
2018-04-09 12:08:48 +08:00