mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
48,140 Commits 36 Branches 519 Tags
Commit Graph

1751 Commits

Author SHA1 Message Date
Tim Hunt
ef01d2c8f5 MDL-27973 hopefully fix QTI2 question export. 
Well, at least fix the most obvious notices.
 2011-06-22 15:56:05 +01:00
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
Sam Hemelryk
70e35c4d1d Merge branch 'MDL-27916' of git://github.com/timhunt/moodle 2011-06-20 13:45:12 +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
88ef9d0b2b MDL-27916 Question state was described wrongly in adaptive and immediate feedback behaviours. 2011-06-18 13:29:39 +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
Eloy Lafuente (stronk7)
faf1f957ac Merge branch 'MDL-27490' of git://github.com/timhunt/moodle 2011-06-17 17:24:51 +02:00
Tim Hunt
fde4560dae MDL-27490 Implement a manage question behaviours admin page 
While doing this, I found various bugs in the manages question types admin page, and so fixed them, and updated the code
there to use $OUTPUT and html_writer.

AMOS BEGIN
 MOV [cannotdeletemissingqtype,admin],[cannotdeletemissingqtype,question]
 MOV [cannotdeleteqtypeinuse,admin],[cannotdeleteqtypeinuse,question]
 MOV [cannotdeleteqtypeneeded,admin],[cannotdeleteqtypeneeded,question]
 MOV [deleteqtypeareyousure,admin],[deleteqtypeareyousure,question]
 MOV [deleteqtypeareyousuremessage,admin],[deleteqtypeareyousuremessage,question]
 MOV [deletingqtype,admin],[deletingqtype,question]
 MOV [numquestions,admin],[numquestions,question]
 MOV [numquestionsandhidden,admin],[numquestionsandhidden,question]
 MOV [qtypedeletefiles,admin],[qtypedeletefiles,question]
 MOV [uninstallqtype,admin],[uninstallqtype,question]
AMOS END
 2011-06-17 16:21:32 +01:00
Eloy Lafuente (stronk7)
3c158ff95e Merge branch 'MDL-27868' of git://github.com/timhunt/moodle 2011-06-17 16:45:30 +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
Eloy Lafuente (stronk7)
5df6b3c87e Merge branch 'MDL-27877' of git://github.com/timhunt/moodle 2011-06-17 15:32:10 +02:00
Tim Hunt
5f79a9bcb6 MDL-27898 fix question/engine/simpletest/testdatalib.php unit tests. 
Now that MDL-27897 is fixed.
 2011-06-17 11:28:05 +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
08c458d10f MDL-27877 question engine progress bars not working. 2011-06-16 18:55:10 +01:00
Eloy Lafuente (stronk7)
192026f6e5 Merge branch 'MDL-27797_fixup' of git://github.com/timhunt/moodle 2011-06-15 18:18:26 +02:00
Tim Hunt
1f1c60c6a7 MDL-27797 supplimental. Fix two minor issues found by Sam H during testing. 2011-06-15 15:38:46 +01:00
Tim Hunt
e6d7658337 MDL-27865 fix editing of calculated* questions. 2011-06-15 12:20:26 +01:00
Eloy Lafuente (stronk7)
31c7fbafa6 Merge branch 'MDL-27797' of git://github.com/timhunt/moodle 2011-06-15 02:00:23 +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)
ee1235e7af Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle 2011-06-14 22:38:27 +02:00
Tim Hunt
8a5d05eea8 MDL-27854 qformat_xml fix import/export of essay questions to include the new options. 2011-06-14 17:36:11 +01:00
Tim Hunt
79e25fb456 MDL-27797 fix all the codechecker issues in format_xml 
After this change, I can still export my test course with one of each question type, and all the unit tests still pass.
 2011-06-14 17:06:55 +01:00
Tim Hunt
67b8b40cfa MDL-27797 fix bugs with Moodle XML export. 2011-06-14 16:34:14 +01: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
Eloy Lafuente (stronk7)
379f39eb9f Merge branch 'MDL-27789-qe2plugins' of git://github.com/mudrd8mz/moodle 2011-06-13 10:12:03 +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
d1c77ac372 MDL-27789 The new question plugins reported as standard ones 2011-06-09 14:29:27 +02: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
3b049b7626 MDL-27747 question engine stupid typo in DB query broke regrading. #472 2011-06-07 16:22:10 +01:00
Tim Hunt
97cdc1de72 MDL-27747 quiz summary, add a CSS class to the table rows based on question state. 
The standard themes do not use this for anything, but it makes it easier for themers to do cool stuff.
Also improve the API for getting the question state class.
 2011-06-07 15:11:04 +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
e198992b20 MDL-27747 Fix a lot of coding style issues in question/format.php 2011-06-07 14:04:24 +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
af2f98ee39 MDL-27747 Imporove API for getting the standard fraction choices. 
This includes moving the None option to the top, which is slightly better for usability.
 2011-06-07 13:53:29 +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