15214 Commits

Author SHA1 Message Date
Sam Hemelryk
46c627cf05 Merge branch 'MDL-44690-master' of git://github.com/jamiepratt/moodle 2014-03-26 13:25:51 +13:00
Marina Glancy
daf7b64ef7 Merge branch 'w13_MDL-44107_m27_canview' of git://github.com/skodak/moodle 2014-03-25 17:10:27 +08:00
Andrew Nicols
1f777e5c6c MDL-41987 Javascript: Tidy up YUI documentation 2014-03-25 17:01:37 +08:00
Marina Glancy
e34003004e MDL-42588 scorm: revert accidental change of variable module back to plugin 2014-03-25 16:43:24 +08:00
Marina Glancy
d43556a63f Merge branch 'mdl44573-master' of git://github.com/tlock/moodle 2014-03-25 16:20:37 +08:00
Marina Glancy
c5ff2a76e1 Merge branch 'MDL-42575-master' of git://github.com/jethac/moodle 2014-03-25 16:19:33 +08:00
Jetha Chan
197407cabe MDL-42588 mod_scorm: display activity name
Added option to display or hide activity name on SCORM player.
2014-03-25 16:17:00 +08:00
James Pratt
49dda8fe6e MDL-44690 core_questions : amending unit tests
to use more human friendly format for submitted question type data.
2014-03-25 14:37:51 +07:00
Petr Škoda
15f009e1a2 MDL-44107 add debugging to deprecated event::can_view() 2014-03-25 14:53:17 +08:00
Marina Glancy
2bcb6dbeb0 Merge branch 'MDL-44665' of git://github.com/timhunt/moodle 2014-03-25 14:28:55 +08:00
Marina Glancy
81e50a3661 Merge branch 'MDL-44316_master' of git://github.com/markn86/moodle 2014-03-25 14:03:06 +08:00
Sam Hemelryk
11862768ce Merge branch 'wip-MDL-40059-master' of git://github.com/marinaglancy/moodle 2014-03-25 16:11:10 +13:00
Sam Hemelryk
027d10d67f Merge branch 'MDL-44075-master-v3' of git://github.com/jamiepratt/moodle 2014-03-25 15:06:44 +13:00
Sam Hemelryk
8134eb8573 Merge branch 'MDL-44535-master-v2' of https://github.com/jamiepratt/moodle 2014-03-25 12:51:14 +13:00
Damyon Wiese
b5196badcd MDL-43960 assign: Add missing include
There was a report of mod_assign_save_grade webservice failing because of this.
I couldn't reproduce it, but grepping the code found one place where this include
should be added.
2014-03-25 12:38:09 +13:00
Mark Nelson
cc033d48b5 MDL-44316 core_tag: changed the API to accept a contextid and component 2014-03-22 13:50:08 -07:00
Tim Hunt
f38965db42 MDL-44665 declare all quiz page types in the blocks UI. 2014-03-21 14:40:57 +00:00
Marina Glancy
2d4d742f71 MDL-40059 glossary: unittests for events 2014-03-21 15:48:51 +08:00
Marina Glancy
7c92f9be80 MDL-40059 glossary: event for entry viewed 2014-03-21 15:48:51 +08:00
Marina Glancy
1ce054a38b MDL-40059 glossary: events for entry approval/disapproval 2014-03-21 15:48:51 +08:00
Marina Glancy
4d7c298f51 MDL-40059 glossary: events for add/edit/delete glossary category 2014-03-21 15:48:51 +08:00
Marina Glancy
99912e3044 MDL-40059 glossary: events for add/delete/update entries 2014-03-21 15:48:50 +08:00
Marina Glancy
f527c5d040 MDL-40059 glossary: event course_module_instance_list_viewed 2014-03-21 15:48:50 +08:00
Marina Glancy
3dbe89ac62 MDL-40059 glossary: event course_module_viewed 2014-03-21 15:48:50 +08:00
Jetha Chan
846ffe600c MDL-42575 mod_page: revert heading option display
Reverted heading option display for page resource; made sure to not re-introduce class issues.
2014-03-21 15:42:34 +08:00
James Pratt
58794ac948 MDL-44690 core_questions : download of question steps data as csv file 2014-03-21 12:32:00 +07:00
Petr Škoda
bc29320285 MDL-44661 implement event->anonymous property 2014-03-20 17:33:35 +08:00
Petr Škoda
d58a8932b8 MDL-44107 deprecate can_view() in feedback events, to be replaced by is_anonymous()
See MDL-44661 for more info.
2014-03-20 17:29:19 +08:00
Sam Hemelryk
84e8be12e5 Merge branch 'wip-mdl-44552' of https://github.com/rajeshtaneja/moodle 2014-03-19 21:22:24 +01:00
Marina Glancy
ef3bffdec4 MDL-42025 behat: changed behat tag _only_local to _file_upload 2014-03-19 21:22:24 +01:00
Marina Glancy
4158a6f5ed Merge branch 'MDL-43341' of git://github.com/nobelium/moodle 2014-03-19 21:22:23 +01:00
Rajesh Taneja
b54696395d MDL-44552 Events: Fixed wrong id returned in get_url 2014-03-19 09:57:44 +08:00
Eloy Lafuente (stronk7)
1c774322ba Merge branch 'MDL-41760-master-v8' of https://github.com/jamiepratt/moodle
Conflicts:
	version.php
2014-03-19 02:14:00 +01:00
Eloy Lafuente (stronk7)
b9add57766 Merge branch 'MDL-41216' of https://github.com/nobelium/moodle 2014-03-19 01:23:08 +01:00
James Pratt
fcdd04db0a MDL-44075 quiz_statistics : Various coding style / phpdocs fixes 2014-03-18 19:09:39 +07:00
James Pratt
ebb8de5d37 MDL-44535 quiz_statistics : response analysis - limit tries counted 2014-03-18 18:54:07 +07:00
James Pratt
038014c415 MDL-41760 quiz_statistics : response analysis for first/last/all tries 2014-03-18 18:47:19 +07:00
Andreas Grabs
e68fc3c6f1 MDL-44653 mod_feedback - Include additional name fields using user_picture::fields() 2014-03-18 18:24:18 +08:00
Marina Glancy
7019e15e60 MDL-42025 behat: renamed deprecated method 2014-03-18 17:15:36 +08:00
Jerome Mouneyrac
9e103d6e15 MDL-42025 assignfeedback_editpdf: add behat tests 2014-03-18 17:14:31 +08:00
David Monllao
0176d12dd6 MDL-44246 behat: New mod_quiz test when JS is disabled
Also including a modification in behat_question_base
to make the internal method work with both JS and non-JS.
2014-03-18 15:32:58 +08:00
Juan Leyva
2e1eda559e MDL-44444 Add fileurl to mod_assign_get_submissions webservice response parameters 2014-03-18 13:46:16 +08:00
Sam Hemelryk
f3516ad3b8 Merge branch 'wip-MDL-44542-master' of git://github.com/marinaglancy/moodle 2014-03-18 17:04:57 +13:00
Marina Glancy
d2097020b4 MDL-44524 feedback: fix bug in sql under oracle
Thanks to Rob King"
2014-03-18 12:00:14 +08:00
Sam Hemelryk
c98edede85 Merge branch 'MDL-44505' of https://github.com/bostelm/moodle 2014-03-18 15:00:24 +13:00
Marina Glancy
e65825830f Merge branch 'MDL-44588' of git://github.com/timhunt/moodle 2014-03-17 18:18:36 +08:00
Tim Lock
6b7aa837c9 MDL-44573: Remove HTML tags in outputs column in offline grading worksheet 2014-03-17 12:43:41 +10:30
Nobelium
b4f71f0c10 MDL-41216 scorm: style.css now follows block format 2014-03-15 11:00:58 +00:00
Nobelium
76e9e1028f MDL-43341 SCORM Report: spacer.gif must be managed with $OUTPUT->spacer 2014-03-14 22:16:07 +00:00
Henning Bostelmann
013e85bbcc MDL-44505 mod_forum: Make mailing subject a configurable language string 2014-03-14 11:39:15 +00:00