moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48140 commits 37 branches 540 tags 1.3 GiB
Commit graph

1016 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
8edbfba909 Merge branch 'MDL-24594_wip' of git://github.com/timhunt/moodle 2011-06-20 12:48:55 +02:00
Sam Hemelryk
8a322fc19b Merge branch 'MDL-24255' of git://github.com/timhunt/moodle 2011-06-20 15:51:59 +08:00
Sam Hemelryk
8e307054d3 Merge branch 'MDL-27907' of git://github.com/timhunt/moodle 2011-06-20 14:10:41 +08:00
Tim Hunt
635971c750 MDL-27927 qtype_multianswer remove hard-coded string. 2011-06-19 10:34:39 +01:00
Tim Hunt
928e7d2a33 MDL-27927 Fix invalid HTML in the multianswer editing form. 2011-06-19 10:27:24 +01:00
Tim Hunt
2d6829727d MDL-24255 Use the proper editor element for manual grading comments. 
It would be nice if someone imporoved the API for using the HTML editor outside formslib.
 2011-06-18 21:15:40 +01:00
Tim Hunt
fb17f129a3 MDL-27907 calculated* editing form inheritance mix up. 
Lead to duplicate fields appearing on the editing forms.
 2011-06-18 12:53:32 +01:00
Tim Hunt
35c9b65274 MDL-24594 Fix some issues with the display of HTML choices. 
The most significant issue is that the HTML editor alwasy wraps <p> tags round the input, but that is not appropriate for the choices. It is especially not appropriate because we want to display the choices in a <lable> for accessibility and usability reasons. In valid HTML label can only contain inline elemnts. Therefore, I introduced a make_html_inline method, with a minimal implementation. (It could be improved in future.)

Long term, I think the best option would be a new form field type, editorinline, or something like that. That would be a smaller version of TinyMCE that only lets you enter inline elements.
 2011-06-17 18:41:15 +01:00
ppichet
2a6c5c52ee MDL-24594 qtype_multichoice should allow images in the choices. 
This change was massively re-worked by Tim Hunt to update Pierre Pichet's original patch for Moodle 2.0 to work in Moodle 2.1.
 2011-06-17 18:41:13 +01:00
Eloy Lafuente (stronk7)
fd8f24dba8 Merge branch 'MDL-27869' of git://github.com/timhunt/moodle 2011-06-17 18:32:00 +02:00
Tim Hunt
5cf69d7ff5 MDL-27868 Hints (and some other things) lost when re-editing calculated* questions. 2011-06-17 15:42:03 +01:00
Tim Hunt
03b2b8fa29 MDL-27869 Fix images in numerical and calculated questions. 
Also fix an embarassing TODO in multianswer quetsions.
 2011-06-16 18:56:37 +01:00
Tim Hunt
e6d7658337 MDL-27865 fix editing of calculated* questions. 2011-06-15 12:20:26 +01: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)
ee1235e7af Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle 2011-06-14 22:38:27 +02:00
Tim Hunt
98a3898efc MDL-27849 fix qtype_multianswer attempt data restore (2.1 -> 2.1). 
Also, refactor calculatedmulti restore to avoid duplication.
 2011-06-14 15:17:50 +01:00
Tim Hunt
5b64e32645 MDL-27585 implement restore of qtype_calculatedmulti 2.1 attempt data 2011-06-14 12:11:23 +01: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
Tim Hunt
cee74600fa MDL-27839 supply default qtype_essay_options if they are not present in the XML. 2011-06-14 12:10:25 +01:00
Tim Hunt
d7ad6ac4ef MDL-27787 Fix restore of matching quetsions backed up from Moodle 2.0. 2011-06-14 12:10:23 +01:00
David Mudrak
85fbe3fdcf MDL-27811 Fixed incorrect qtype_essay conversion 2011-06-13 11:11:31 +02:00
Tim Hunt
55190d7e2c MDL-20538 get rid of badly name-spaced constants from lib/questionlib.php. 
Unfortunately, they are used all over the import/export code, so I cannot eliminate them completely. However, I was able to move them out of the core library.
 2011-06-09 19:27:36 +01:00
David Mudrak
b61cf3ff8a MDL-22414 Merge branch 'master' into backup-convert 
Conflicts:
	theme/base/style/core.css
 2011-06-09 13:04:49 +02:00
Tim Hunt
e84dacffeb MDL-27747 don't truncate essay responses in the reports. #601 2011-06-07 17:01:11 +01:00
Tim Hunt
4464734bb6 MDL-27747 qtype_truefalse, false feedback went missing whenre-editing a question. #465 2011-06-07 14:38:05 +01:00
Tim Hunt
92111e8d2c MDL-27747 questions remove all references to the recently deprecated get_grade_options() 2011-06-07 14:00:07 +01:00
Tim Hunt
aadad31a6e MDL-27737 numerical qtype upgrade bug 2.0dev -> 2.0. 2011-06-06 18:06:57 +01:00
Eloy Lafuente (stronk7)
1db15c2718 MDL-20636 changes to core & questions upgrade code 
Changes include:

    - fixing versions and requires to current weekly (2011060313)
    - fix essay wrong upgrade step. Review & test!
    - fix numerical missing savepoint.
 2011-06-06 17:16:11 +01:00
Tim Hunt
4c5743343f MDL-20636 make qe upgrade tests independent of html2text details. 
Based on Eloy's change, but refactored to be slightly nicer.
 2011-06-06 17:05:54 +01:00
Eloy Lafuente (stronk7)
36e91f1de1 MDL-20636 Whitespace fixes 2011-06-06 16:38:46 +01:00
David Mudrak
c0e3796e1b MDL-27626 calculated qtype conversion support 
uff...
 2011-06-03 21:57:00 +02:00
David Mudrak
aaf88d2cb2 MDL-27626 numerical_options are written only if there are some numerical_units available 
This reflects the logic of the backup 2.0. Previously, the new
numerical_options structure was written always, even if there were no
numerical_units.
 2011-06-03 21:56:59 +02:00
David Mudrak
0a562bafd1 MDL-27626 matching question type conversion handler 2011-06-03 21:56:59 +02:00
David Mudrak
a4158f8d93 MDL-27626 Make sure that the <answers> structure is present before converting it 
This corresponds the logic of question_backup_answers()
 2011-06-03 18:54:57 +02:00
David Mudrak
7cfff0ccfb MDL-27626 multianswer (embedded, cloze) question type conversion handler 2011-06-03 18:54:57 +02:00
David Mudrak
589475665e MDL-27626 numerical question type conversion handler 2011-06-03 18:54:56 +02:00
David Mudrak
afa08aeb15 MDL-27626 essay question type conversion handler 2011-06-03 18:06:34 +02:00
David Mudrak
2b129b4cb6 MDL-27626 truefalse question type conversion handler 2011-06-03 18:06:29 +02:00
David Mudrak
2554f389d4 MDL-27626 shortanswer question type conversion handler 2011-06-03 18:06:28 +02:00
David Mudrak
7ffc82df8b MDL-27626 multichoice question type conversion handler 2011-06-03 18:06:28 +02:00
Tim Hunt
a4c982917e MDL-20636 truefalse qtype clean up other unit tests to use the new way of making test tf questions. 2011-05-27 14:43:28 +01:00
Tim Hunt
188e174457 MDL-20636 truefalse qtype was showing the false feedback even when no response was given. #386 2011-05-27 14:41:48 +01:00
Tim Hunt
9199e7a569 MDL-20636 fix styling of essay questions. #371 2011-05-27 12:11:54 +01:00
Tim Hunt
c014b989ba MDL-27649 Convert the calculated question types to use the new variants mechanism. 2011-05-26 21:53:47 +01:00
Tim Hunt
1da821bbde MDL-27649 support question variants as a first-class concept in the question engine. 2011-05-26 21:23:56 +01:00
Tim Hunt
0500a3a92d MDL-27413 qtype_multianswer upgrade should be complete. 2011-05-26 19:19:45 +01:00
Tim Hunt
b3e146268f MDL-27413 qtype_multianswer two more upgrade tests. 2011-05-26 18:35:52 +01:00
Tim Hunt
1cacb05989 MDL-27413 qtype_multianswer upgrade. First passing test. 2011-05-26 18:25:19 +01:00
Tim Hunt
dcedbb0e25 MDL-27413 qtype_multianswer now works for all embedded types, I think. 2011-05-26 16:44:09 +01:00
Tim Hunt
7ac7977cbe MDL-27413 qtype_multianswer embedded inline multichoice now work. 2011-05-26 15:03:47 +01:00