10728 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
8032990022 Merge branch 'MDL-26948' of git://github.com/timhunt/moodle 2011-06-22 02:35:25 +02:00
Eloy Lafuente (stronk7)
6057bf5b05 MDL-27810 portfolio: Added ->portfolioenabled check to one more place 2011-06-22 02:10:11 +02:00
Eloy Lafuente (stronk7)
555cc4b4a0 Merge branch 'wip-MDL-27810-master' of git://github.com/samhemelryk/moodle 2011-06-22 01:56:30 +02:00
Eloy Lafuente (stronk7)
f5a6bf5e35 Merge branch 'master_MDL-27959' of git://github.com/danmarsden/moodle 2011-06-22 01:35:15 +02:00
David Mudrak
c1ab2b109e MDL-27970 workshop submission can't be edited after the deadline even if late submissions are allowed 2011-06-22 00:34:45 +02:00
Dan Marsden
b447192e8f Choice MDL-27959 invalid strings 2011-06-21 16:39:46 +12:00
Sam Hemelryk
6708a1f525 MDL-27810 portfolio: Added ->portfolioenabled checks before creating portfolio buttons to avoid initialising portfolio requirements 2011-06-21 10:35:53 +08:00
Eloy Lafuente (stronk7)
9192e9fe45 Merge branch 'master_MDL-27366' of git://github.com/danmarsden/moodle 2011-06-20 23:38:47 +02:00
Eloy Lafuente (stronk7)
aed0dbe70a Merge branch 'MDL-27942' of git://github.com/timhunt/moodle 2011-06-20 17:05:54 +02:00
Eloy Lafuente (stronk7)
ee37607188 Merge branch 'MDL-27925' of git://github.com/timhunt/moodle 2011-06-20 11:56:34 +02:00
Tim Hunt
e28bbd8919 MDL-27942 Use picture not displayed during quiz attempts. 2011-06-20 10:26:01 +01:00
Sam Hemelryk
8ffaf7b4dd Merge branch 'MDL-27928' of git://github.com/timhunt/moodle 2011-06-20 13:06:10 +08:00
Sam Hemelryk
3fc7c06b99 Merge branch 'quiz_feedback_for_grade' of git://github.com/stronk7/moodle 2011-06-20 13:02:02 +08:00
Eloy Lafuente (stronk7)
1b327dec8a MDL-27932 quiz - fix some calls to quiz_feedback_for_grade() 2011-06-20 01:46:29 +02:00
Eloy Lafuente (stronk7)
f2113d66cd Merge branch 'MDL-27910' of git://github.com/timhunt/moodle 2011-06-20 01:26:03 +02:00
Eloy Lafuente (stronk7)
b9412668c4 Merge branch 'MDL-27902' of git://github.com/timhunt/moodle 2011-06-20 01:21:18 +02:00
Tim Hunt
460797abbd MDL-27928 missing string in the question bank UI.
AMOS BEGIN
 MOV [categorymove,mod_quiz],[categorymove,question]
AMOS END
2011-06-19 10:44:44 +01:00
Tim Hunt
bc502c166c MDL-27908 quiz settings menu, make the order more logical. 2011-06-18 16:27:21 +01:00
Tim Hunt
e50a5813b7 MDL-27910 quiz stupid typo in a DB query 2011-06-18 11:37:08 +01:00
Tim Hunt
83f93ec41f MDL-26948 quiz navigation fake block should have an id to allow styling. 2011-06-17 17:26:28 +01:00
Tim Hunt
3a5da40b4c MDL-27902 quiz reviewquestion.php page needs to be converted to use the renderer. 2011-06-17 15:27:41 +01:00
Dan Marsden
1a70a6470c SCORM MDL-27366 - show content if attemptstatus is set even if closed. 2011-06-17 09:08:26 +12:00
Dan Marsden
6257f66455 SCORM MDL-27366 add attempt status to My home 2011-06-17 09:08:26 +12:00
Tim Hunt
08c458d10f MDL-27877 question engine progress bars not working. 2011-06-16 18:55:10 +01:00
Aparup Banerjee
da4772a276 Backup - mod lesson conversion: apply jumpto fix only to matching question types. 2011-06-16 10:52:55 +02:00
Aparup Banerjee
914bfea245 MDL-27819 Backup - fixed extra answers/jump data.
- fixed unset causing missing property
	- fixed answers empty notice, allowed for page with no answers.
2011-06-16 10:52:45 +02:00
Aparup Banerjee
6df63e4f9b MDL-27819 Backup - mod_lesson conversion: optimized page buffering from all pages to 3 pages 2011-06-15 12:09:33 +02:00
Aparup Banerjee
496a576aa9 MDL-27819 backup - added nextpageid and prevpageid elements to lesson moodle1 backup conversion to 2.x 2011-06-15 12:09:24 +02:00
Eloy Lafuente (stronk7)
84a5f2d26e Merge branch 'MDL-27820' of git://github.com/stronk7/moodle 2011-06-15 11:59:52 +02:00
Eloy Lafuente (stronk7)
5edac71d16 MDL-27820 backup - fix backup of ratings 2011-06-15 11:01:41 +02:00
Eloy Lafuente (stronk7)
a16e137f21 Merge branch 'MDL-27639_wip' of git://github.com/timhunt/moodle 2011-06-15 01:30:59 +02:00
Eloy Lafuente (stronk7)
5800c0fde1 Merge branch 'master_MDL-27858' of git://github.com/danmarsden/moodle 2011-06-15 01:18:05 +02:00
Dan Marsden
bdea587be2 SCORM MDL-27858 - fix typo 2011-06-15 10:31:52 +12:00
Eloy Lafuente (stronk7)
ee1235e7af Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle 2011-06-14 22:38:27 +02:00
Tim Hunt
18ab06bac5 MDL-27639 restore of attempt data from 2.0 - first attempt.
This is now at the stage where it mostly appears to work, at lease on
one backup file.
2011-06-14 12:11:19 +01:00
Eloy Lafuente (stronk7)
e298ec5162 Merge branch 'MDL-27525' of git://github.com/rwijaya/moodle 2011-06-14 12:11:54 +02:00
Eloy Lafuente (stronk7)
a0be4a1fcb Merge branch 'MDL-27065-workshop-categories' of git://github.com/mudrd8mz/moodle 2011-06-13 19:52:49 +02:00
Eloy Lafuente (stronk7)
269c173e81 whitespace fixes 2011-06-13 12:21:48 +02:00
Sam Hemelryk
46d3b9be73 Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes 2011-06-13 16:54:52 +08:00
Aparup Banerjee
486e889262 MDL-27446 Backup - added answers 'jumpto' conversion to moodle1 converter for
lesson
2011-06-13 10:02:28 +02:00
Sam Hemelryk
12aafa8769 Merge branch 'master_MDL-272522' of git://github.com/danmarsden/moodle 2011-06-13 15:49:24 +08:00
Sam Hemelryk
f44c912bd0 Merge branch 'MDL-26147-workshop-ignore-deadlines' of git://github.com/mudrd8mz/moodle 2011-06-13 15:32:44 +08:00
Sam Hemelryk
aa8ec18b52 Merge branch 'master_MDL-27404' of git://github.com/danmarsden/moodle 2011-06-13 14:53:37 +08:00
Sam Hemelryk
a7b7c2d3db Merge branch 'MDL-20538' of git://github.com/timhunt/moodle 2011-06-13 11:22:51 +08:00
Rossiani Wijaya
6ff768a67f MDL-27525 mod_wiki: Fixed typing error for the variable and assign the value contextid to use mod context id 2011-06-13 10:54:07 +08:00
Dan Marsden
d1e3b5c2d3 MDL-27404 SCORM fix for IE 6 - thanks to Howard Miller 2011-06-13 11:32:26 +12:00
Dan Marsden
2875714e4a MDL-27522 SCORM tidy up commit 2011-06-13 11:00:43 +12:00
Ankit Kumar Agarwal
b4baa7faa3 MDL-27522 SCORM - seperate user report from main report page to allow better re-use in preparation for MDL-27256 2011-06-13 10:21:40 +12:00
David Mudrak
9ddff589df MDL-26147 workshop - added capability to ignore time restrictions 2011-06-10 19:01:27 +02:00
David Mudrak
a74cadfa77 MDL-27065 workshop grades categories can be defined in mod_form
Because the Workshop module creates two grade items in the gradebook, we
can't use standard modedit features to set the corresponding category in
the gradebook (it supports single grade item only).

The patch also cleans the mod_form.php so that it does not use the
global $COURSE (just because I do not like this global variable).

And for the record - QuickForms must die.
2011-06-10 16:48:09 +02:00