Commit graph

48213 commits

Author SHA1 Message Date
Tim Hunt
01d203566f MDL-27925 Give meaningful keys to all the standard navigation mod settings nodes. 2011-06-18 16:24:31 +01:00
Tim Hunt
0c2f94e081 MDL-27925 A way to get the all the keys of the child nodes of a node. 2011-06-18 16:23:53 +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
e50a5813b7 MDL-27910 quiz stupid typo in a DB query 2011-06-18 11:37:08 +01:00
AMOS bot
9ba87c6c8c Automatically generated installer lang files 2011-06-18 00:55:15 +00:00
Tim Hunt
d610cb8980 MDL-27915 improved debuginfo for some file exceptions. 2011-06-17 19:46:09 +01:00
Tim Hunt
f263d4935f MDL-27913 Stray whitespace in backup. 2011-06-17 19:37:20 +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)
7a7d34febb on-demand release 2.1beta 2011-06-17 19:25:39 +02: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
83f93ec41f MDL-26948 quiz navigation fake block should have an id to allow styling. 2011-06-17 17:26:28 +01: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
David Mudrak
87e0230d0a MDL-27073 Support multi-language content in custom menu 2011-06-17 17:08:33 +02: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
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
Eloy Lafuente (stronk7)
ff30976ad5 Merge branch 'MDL-27887' of git://github.com/timhunt/moodle 2011-06-17 16:16:58 +02:00
Eloy Lafuente (stronk7)
5df6b3c87e Merge branch 'MDL-27877' of git://github.com/timhunt/moodle 2011-06-17 15:32:10 +02:00
Eloy Lafuente (stronk7)
5017d4dc7d Merge branch 'MDL-27878' of git://github.com/timhunt/moodle 2011-06-17 15:30:16 +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
cfcf9bb4e3 MDL-27897 moodle_database::get_in_or_equal must not use a static variable.
It makes unit testing impossible. Switch to a field.
2011-06-17 11:26:51 +01:00
Eloy Lafuente (stronk7)
d037c6bc3c on-demand release 2.1beta 2011-06-17 11:18:33 +02:00
Aparup Banerjee
cec76330fe MDL-27500 editor - updated plugin version references, thirdparty version reference and tinymce upgrade readme 2011-06-17 16:52:57 +08:00
Dongsheng Cai
da78b10ce0 MDL-27341, fixed flickr public plugin should check
search text, tag and nsid before searching photos
2011-06-17 12:14:05 +08:00
Dongsheng Cai
d55846d8bd MDL-26677 fixed undefined index usewatermarks in flickr plugin 2011-06-17 12:11:54 +08:00
Eloy Lafuente (stronk7)
16fd82d8ef MDL-27500 HTML Editor - bump version 2011-06-17 01:11:34 +02:00
Eloy Lafuente (stronk7)
33865a7812 MDL-27500 HTML Editor - deleted 3.3.9.2 build 2011-06-17 01:10:15 +02:00
Eloy Lafuente (stronk7)
7035b80ad9 Merge branch 'MDL-27500' of git://github.com/nebgor/moodle 2011-06-17 01:06:07 +02: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
a8c8641802 MDL-27887 In developer debug, use uncompressed TinyMCE code. 2011-06-16 18:59:41 +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
6481b28fe5 MDL-27878 make progress bars fail explicity if you forget to call create(). 2011-06-16 18:55:29 +01:00
Tim Hunt
08c458d10f MDL-27877 question engine progress bars not working. 2011-06-16 18:55:10 +01:00
Eloy Lafuente (stronk7)
c3f85e22d9 weekly release 2.1beta 2011-06-16 19:08:04 +02:00
Eloy Lafuente (stronk7)
28e23ea737 fix permissions 2011-06-16 19:06:07 +02:00
Eloy Lafuente (stronk7)
868ca72707 Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-06-16 19:03:16 +02:00
Andrew Davis (andyjdavis)
0f63f2714f MDL-26105 blocks: made the block settings help icons work 2011-06-16 12:05:53 +02:00
Andrew Davis (andyjdavis)
84a1bea972 MDL-26105 blocks: readded the my moodle page's page type list generator function 2011-06-16 12:05:48 +02: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
Eloy Lafuente (stronk7)
5c5f71172a Merge branch 'wip-MDL-24355-master' of git://github.com/andyjdavis/moodle 2011-06-16 10:38:49 +02:00
Eloy Lafuente (stronk7)
a31a6ce32d MDL-27171 take rid of 2 wrong strings moved to forum/lang/xx/forum.php 2011-06-16 00:43:58 +02: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
Eloy Lafuente (stronk7)
3420de9f97 Merge branch 'MDL-27865' of git://github.com/timhunt/moodle 2011-06-15 14:37:23 +02:00
Tim Hunt
e6d7658337 MDL-27865 fix editing of calculated* questions. 2011-06-15 12:20:26 +01:00