18848 Commits

Author SHA1 Message Date
Dan Poltawski
5d970e1aa0 Merge branch 'master_MDL-50643' of git://github.com/danmarsden/moodle 2016-12-29 11:46:47 +00:00
Dan Poltawski
398e8fa1ed Merge branch 'MDL-55955_master' of git://github.com/markn86/moodle 2016-12-28 21:19:03 +00:00
Dan Poltawski
16cfeccad8 Merge branch 'wip-MDL-57366-master' of git://github.com/abgreeve/moodle 2016-12-28 21:19:02 +00:00
Dan Marsden
63c2ea5038 MDL-52168 mod_scorm: Fix issue when scorm does not define org. 2016-12-28 10:54:49 +13:00
Adrian Greeve
a7eb619b76 MDL-57464 mod_lesson: fix notice with sub-clusters. 2016-12-23 11:10:20 +08:00
Dan Marsden
39eee56fa6 MDL-49557 mod_scorm: fix AICC pre-requisite handling. 2016-12-23 12:21:53 +13:00
Dan Marsden
9536334dca MDL-50643 mod_scorm: redirect using current window instead of parent. 2016-12-23 10:17:43 +13:00
Rajesh Taneja
3b7a351d69
MDL-57494 behat: Fixed tags and removed reset in after_scenario
1. Added missing switch_window tags
2. Fixed switch_frame tags to use switch_iframe
3. Removed reset from after_scenario.
2016-12-22 12:42:39 +08:00
Mark Nelson
cc4fba8636 MDL-55955 mod_quiz: ensure duplicated override events are removed 2016-12-22 12:41:32 +08:00
Rajesh Taneja
6749b071d9
MDL-53814 behat: Use table step to check for string 2016-12-21 07:35:07 +08:00
David Monllao
d6db7a1d9a Merge branch 'MDL-56640-master' of git://github.com/danpoltawski/moodle 2016-12-20 11:09:39 +01:00
Dan Poltawski
9c9201ecde MDL-56640 lesson: switch from YUI to jquery.change() 2016-12-20 10:02:06 +00:00
Adrian Greeve
0a36b931e2 MDL-57366 mod_lesson: Zero now acceptable numeric answer.
When creating a numerical question. If the answer to the
question is 0 then the answer will not save.
2016-12-20 14:01:30 +08:00
Rajesh Taneja
7737744d1b
MDL-53814 behat: Columns have been moved ahead 2016-12-20 11:36:00 +08:00
Dan Poltawski
7d64e2c3bc Merge branch 'MDL-55568_m33v2' of https://github.com/sbourget/moodle 2016-12-19 14:33:05 +00:00
David Monllao
e3578224cc Merge branch 'MDL-55575_B' of https://github.com/bostelm/moodle 2016-12-19 14:59:13 +01:00
Dan Poltawski
64e032b6da Merge branch 'wip-MDL-56912-master' of git://github.com/marinaglancy/moodle 2016-12-19 12:21:06 +00:00
David Monllao
eacacae8cc Merge branch 'wip-MDL-57187-master' of https://github.com/marinaglancy/moodle 2016-12-19 12:46:19 +01:00
David Monllao
034996876c Merge branch 'MDL-57402' of git://github.com/timhunt/moodle 2016-12-19 12:20:57 +01:00
David Monllao
2b5c9f04e3 Merge branch 'MDL-53814-question-type-icon-quiz-manual-grading-overview' of https://github.com/lucaboesch/moodle 2016-12-19 11:38:43 +01:00
Juan Segarra Montesinos
669da91d54 MDL-53367 mod_forum: Subscribe current users when importing a forum
Subscribes currently enrolled users when importing a forum with
automatic subscription enabled.
2016-12-16 09:46:07 +01:00
Tim Hunt
1a07d5ef82 MDL-57402 quiz editing: fix add heading after remove page break 2016-12-14 16:34:50 +00:00
Stephen Bourget
71cfa70a0e MDL-55568 chat: chat_refresh_events should only create published events 2016-12-13 18:52:33 -05:00
Eloy Lafuente (stronk7)
6296803878 Merge branch 'MDL-55809-master' of https://github.com/xow/moodle 2016-12-13 20:05:15 +01:00
Dan Poltawski
ae2bf1626c Merge branch 'MDL-56810_master' of https://github.com/Syxton/moodle 2016-12-13 14:55:50 +00:00
Henning Bostelmann
a2a1a58683 MDL-55575 mod_glossary: Allow viewing all entries on one page 2016-12-13 11:43:29 +01:00
Dan Poltawski
ba78bd4f56 Merge branch 'MDL-56859-master' of https://github.com/snake/moodle 2016-12-13 09:45:15 +00:00
Dan Poltawski
0183338c38 Merge branch 'wip-MDL-57257-master' of git://github.com/abgreeve/moodle 2016-12-13 08:45:50 +00:00
Marina Glancy
ba9a471d59 MDL-56912 feedback: empty multichoice questions do not submit 2016-12-13 15:00:41 +08:00
Jan Dageförde
76a83260c5 MDL-57257 lesson: Validate type of numerical answer 2016-12-13 10:32:49 +08:00
Andrew Nicols
106c8026d1 Merge branch 'MDL-57222_master' of git://github.com/markn86/moodle 2016-12-13 10:25:30 +08:00
Eloy Lafuente (stronk7)
7c0313e414 Merge branch 'master_MDL-57324' of git://github.com/danmarsden/moodle 2016-12-13 02:01:56 +01:00
Dan Poltawski
e36d9b3ead Merge branch 'MDL-56525' of https://github.com/ak4t0sh/moodle 2016-12-12 14:08:34 +00:00
Matt Davidson
6be2b79b9c MDL-56810 unoconv: task fails if user removed
If the user is removed from a course after a submission has been made,
the task will crash and never continue.  This removes submissions from
the cron task if the user isn't enrolled in the course.
2016-12-12 08:22:51 -05:00
Dan Poltawski
5304258829 Merge branch 'wip-mdl-52796' of https://github.com/rajeshtaneja/moodle 2016-12-12 13:00:51 +00:00
Dan Poltawski
daab2b520f Merge branch 'wip-mdl-57314' of https://github.com/rajeshtaneja/moodle 2016-12-12 12:21:31 +00:00
Dan Poltawski
1483c172ed Merge branch 'wip-mdl-57343' of https://github.com/rajeshtaneja/moodle 2016-12-12 12:21:09 +00:00
Mark Nelson
3b5b35a326 MDL-57222 mod_assign: show validation message on visible element 2016-12-12 11:55:18 +08:00
Rajesh Taneja
7c1116dbbb
MDL-57343 behat: Ensure we wait enough for page to be fully loaded 2016-12-12 10:37:59 +08:00
Ramindu Deshapriya
f1a5cb1fde
MDL-52796 behat: Behat feature to test reset wiki page, tags & comments 2016-12-12 10:26:59 +08:00
Bram Tassyns
ddedf10e98 MDL-56859 SCORM: player shouldn't display TOC while loading 2016-12-12 09:09:31 +08:00
Arnaud Trouve
feda7b3692 MDL-56525 forum: remove targeted user enrolment check
By removing the check on the targeted user's enrolment we allow to show his forum posts even if he is unenrol from a course (obviouly we need to have access to this course to view them)
2016-12-09 10:21:06 +01:00
Dan Marsden
936030d9eb MDL-57324 scorm: exclude objective raw.score from grade update 2016-12-09 10:11:15 +13:00
Henning Bostelmann
5c4bd8f4e8 MDL-56566 mod_assign: ignore "doanything" in course overview
Do not count site admin "doanything" capability for determining
what should be shown in the course overview for assignments.
2016-12-08 19:53:37 +00:00
Franziska Hübler
b143191855 MDL-55809 glossary: Keep file author and license across import/export 2016-12-08 12:25:34 +08:00
Rajesh Taneja
bd755b5317
MDL-57314 behat: Press enter after setting password unmask 2016-12-08 09:18:39 +08:00
Andrew Nicols
75af0aa680 Merge branch 'MDL-57266' of git://github.com/stronk7/moodle 2016-12-07 09:53:16 +08:00
Andrew Nicols
3e9f3e30b2 Merge branch 'MDL-56240' of git://github.com/stronk7/moodle 2016-12-07 09:50:16 +08:00
Rajesh Taneja
9bad658aaf
MDL-56614 behat: Fixed steps to use new definition 2016-12-07 07:10:35 +08:00
Dan Poltawski
be1b12490e Merge branch 'MDL-45873' of https://github.com/bostelm/moodle 2016-12-06 15:56:23 +00:00