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)
3552484b91
on-demand release 2.1beta
2011-06-21 02:31:40 +02:00
Eloy Lafuente (stronk7)
b3c1b5f1a6
Merge branch 'install_master' of git://github.com/amosbot/moodle
2011-06-21 02:30:37 +02: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)
5e811bb000
Merge branch 's11_MDL-27941_partipants_page_master' of github.com:dongsheng/moodle
2011-06-20 18:44:08 +02:00
Eloy Lafuente (stronk7)
ca31e935e6
Merge branch 'wip-MDL-27899-master' of git://github.com/samhemelryk/moodle
2011-06-20 18:38:42 +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)
8edbfba909
Merge branch 'MDL-24594_wip' of git://github.com/timhunt/moodle
2011-06-20 12:48:55 +02:00
Eloy Lafuente (stronk7)
6f9297b48b
Merge branch 'MDL-27915' of git://github.com/timhunt/moodle
2011-06-20 12:39:19 +02:00
Eloy Lafuente (stronk7)
ee37607188
Merge branch 'MDL-27925' of git://github.com/timhunt/moodle
2011-06-20 11:56:34 +02:00
Sam Hemelryk
0ebb526f85
MDL-27899 Moved initialise_fullme during setup to after sam has been initialised
2011-06-20 17:40:03 +08:00
Tim Hunt
e28bbd8919
MDL-27942 Use picture not displayed during quiz attempts.
2011-06-20 10:26:01 +01:00
Dongsheng Cai
3712f7aaca
MDL-27941 Fixed a bug introduced by block setting improvement, the
...
context should be course context
2011-06-20 16:30:16 +08:00
Sam Hemelryk
8a322fc19b
Merge branch 'MDL-24255' of git://github.com/timhunt/moodle
2011-06-20 15:51:59 +08:00
Sam Hemelryk
fe70d8814b
Merge branch 's11_MDL-27880_get_course_participants_ws' of git://github.com/dongsheng/moodle
2011-06-20 14:31:23 +08:00
Sam Hemelryk
8e307054d3
Merge branch 'MDL-27907' of git://github.com/timhunt/moodle
2011-06-20 14:10:41 +08:00
Dongsheng Cai
ea4e96c248
MDL-27880
...
1. moodle_user_get_course_participants_by_id web service to get user details in course context
2. Fixed the proformance issues of get_users_by_id web service
2011-06-20 13:46:47 +08:00
Sam Hemelryk
70e35c4d1d
Merge branch 'MDL-27916' of git://github.com/timhunt/moodle
2011-06-20 13:45:12 +08:00
Sam Hemelryk
1533a25e51
Merge branch 'MDL-27927' of git://github.com/timhunt/moodle
2011-06-20 13:15:37 +08: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
AMOS bot
e0dd2857ea
Automatically generated installer lang files
2011-06-20 00:55:10 +00: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
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
AMOS bot
e97eaa907e
Automatically generated installer lang files
2011-06-19 00:55:21 +00: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
bc502c166c
MDL-27908 quiz settings menu, make the order more logical.
2011-06-18 16:27:21 +01:00
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
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
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
