Dan Poltawski
f4bd3cd6c9
Merge branch 'MDL-32347' of git://github.com/timhunt/moodle
2012-04-10 11:34:12 +08:00
Dan Poltawski
2d74d8a612
Merge branch 'MDL-32318' of git://github.com/timhunt/moodle
2012-04-10 10:26:49 +08:00
Sam Hemelryk
5bfeb5ffd3
Merge branch 'MDL-30843_b' of git://github.com/rwijaya/moodle
2012-04-10 12:34:37 +12:00
Jamie Pratt
19f5c30c25
MDL-47494 ddmarker: Merge branch 'wip_imagetargetupgrader_2_1' into wip_imagetargetupgrader
2012-04-08 19:29:10 +07:00
Jamie Pratt
ac4abff022
MDL-47494 ddmarker: NOBUG couple of small fixes
2012-04-08 19:28:06 +07:00
Jamie Pratt
4a1582ab7c
MDL-47494 ddmarker: Merge branch 'wip_imagetargetupgrader_2_1' into wip_imagetargetupgrader
2012-04-08 18:17:55 +07:00
Jamie Pratt
73f356a4ee
MDL-47494 ddmarker: NOBUG converted question conversion code to use a renderer
2012-04-08 18:16:38 +07:00
Jamie Pratt
2578a29ac2
MDL-47494 ddmarker: Merge branch 'wip_imagetargetupgrader_2_1' into wip_imagetargetupgrader
2012-04-07 14:37:29 +07:00
Jamie Pratt
b409f1990e
MDL-47494 ddmarker: NOBUG fixing and updating tags in phpdoc comments
2012-04-07 14:34:58 +07:00
Jamie Pratt
6a3b599366
MDL-47494 ddmarker: NOBUG added progress bar for question conversion during upgrade
2012-04-07 14:24:25 +07:00
Jamie Pratt
34ec5ad14d
MDL-47494 ddmarker: NOBUG made string for label into a constant so it is easy to change
2012-04-07 14:23:18 +07:00
ppichet
57239949ac
MDL-32217 Setting options->unitgradingtype
2012-04-06 11:02:13 -04:00
Tim Hunt
a031b0f334
MDL-32347 questions: API improvement for the benefit of strict syntax.
2012-04-05 17:26:44 +01:00
Tim Hunt
b9832f2b87
MDL-32318 question preview: fix php stric syntax error
...
Also, cheating, and committing a whitespace fix in the same commit.
Conflicts:
question/engine/questionusage.php
2012-04-05 16:42:23 +01:00
Tim Hunt
344d774ecd
MDL-47494 gapselect: Fix PHP strict errors.
2012-04-05 13:42:25 +01:00
Tim Hunt
81d1cac12b
MDL-47494 ddimageortext: Fix PHP strict errors.
2012-04-05 13:40:12 +01:00
Tim Hunt
5b8460a374
MDL-47494 ddwtos: Fix PHP strict errors.
2012-04-05 13:35:37 +01:00
Jamie Pratt
86529cb3ab
MDL-47494 ddmarker: NOBUG refactoring so that automatic and manual conversion code is shared
2012-04-04 14:42:40 +07:00
Dan Poltawski
86cfd9966a
MDL-32220 question import: readquestions arguments change
...
Removed the context parameter for blackboard and blackboard_six formats.
This parameter was removed in 4d188926
2012-04-04 14:46:54 +08:00
Jamie Pratt
d544fb24ce
MDL-47494 ddmarker: NOBUG added script to do upgrade automatically during 2.1 site upgrade
2012-04-04 12:58:02 +07:00
Eloy Lafuente (stronk7)
959a709ebe
Merge branch 'MDL-32240' of git://github.com/timhunt/moodle
2012-04-04 00:10:37 +02:00
Eloy Lafuente (stronk7)
46ed2f8b7f
Merge branch 'w14_MDL-32251_m23_strict3' of git://github.com/skodak/moodle
2012-04-03 21:17:58 +02:00
Dan Poltawski
1d40f283ce
Merge branch 'MDL-32220' of git://github.com/timhunt/moodle
2012-04-03 11:09:31 +08:00
Jamie Pratt
4b47ad4623
MDL-47494 ddmarker: Merge branch 'wip_imagetargetconverter_2_1' into wip_imagetargetconverter
2012-04-02 18:59:10 +07:00
Jamie Pratt
5153be2b26
MDL-47494 ddmarker: NOBUG not using list progress trace any more as it is has a bug
2012-04-02 17:20:12 +07:00
Jamie Pratt
35c7dea6d2
MDL-47494 ddmarker: NOBUG added script needed for upgrading attempt data from imagetarget qs
2012-04-02 16:33:09 +07:00
Dan Poltawski
aefc7e28ff
Merge branch 'MDL-32213_manual_grade_question_upgrade' of git://github.com/davosmith/moodle
2012-04-02 16:59:10 +08:00
Dan Poltawski
8408d23c99
Merge branch 'w14_MDL-32250_m23_simpletest110' of git://github.com/skodak/moodle
2012-04-02 16:15:35 +08:00
Petr Skoda
97621c33c9
MDL-32250 fixed case typo
...
Thanks Dan!
2012-04-02 09:21:14 +02:00
Sam Hemelryk
530eecc0f9
Merge branch 'MDL-32239' of git://github.com/timhunt/moodle
2012-04-02 14:31:30 +12:00
Dan Poltawski
6e83ae36a8
Merge branch 'MDL-32246' of git://github.com/timhunt/moodle
2012-04-02 10:03:10 +08:00
Jamie Pratt
a79d43fe9c
MDL-47494 ddmarker: NOBUG adding a condition to catch if there are no questions to convert
2012-04-01 17:30:42 +07:00
Jamie Pratt
874007d480
MDL-47494 ddmarker: Merge branch 'wip_imagetargetconverter_2_1' into wip_imagetargetconverter
...
Conflicts:
imagetargetconverter.php
2012-03-31 18:54:49 +07:00
Jamie Pratt
45766c517a
MDL-47494 ddmarker: NOBUG implemented conversion of question itself
2012-03-31 18:47:15 +07:00
Jamie Pratt
c3efffdb72
MDL-47494 ddmarker: NOBUG improvement in wording of messages for the user
2012-03-31 18:13:22 +07:00
Jamie Pratt
864e786019
MDL-47494 ddmarker: NOBUG make it possible to select just one question for processing
2012-03-31 14:23:25 +07:00
Jamie Pratt
e1bd1cf6e3
MDL-47494 ddmarker: NOBUG loading imagetarget and answers records all before processing
2012-03-31 14:09:31 +07:00
Jamie Pratt
f26e975dd5
MDL-47494 ddmarker: NOBUG subclass list and list item classes to add specific processing
2012-03-31 10:52:28 +07:00
Jamie Pratt
44f16ef16d
MDL-47494 ddmarker: NOBUG some fixes to php doc comments
2012-03-31 10:25:13 +07:00
Jamie Pratt
d4e4c3131d
MDL-47494 ddmarker: NOBUG moved list classes to new file
2012-03-31 10:04:15 +07:00
Jamie Pratt
d0c2245757
MDL-47494 ddmarker: NOBUG adding method to process questions.
2012-03-31 09:46:23 +07:00
Tim Hunt
995d770e66
MDL-47494 gapselect: Files in hints were not moved or deleted properly for OU qtypes. #3478
2012-03-30 10:32:13 +01:00
Tim Hunt
5110ed6134
MDL-47494 ddmarker: Files in hints were not moved or deleted properly for OU qtypes. #3478
2012-03-30 10:30:52 +01:00
Tim Hunt
daac3bb85e
MDL-47494 ddimageortext: Files in hints were not moved or deleted properly for OU qtypes. #3478
2012-03-30 10:29:30 +01:00
Rossiani Wijaya
f9f281b8fe
MDL-30843 and MDL-30842 - accessibility compliance: Add <label> for form input text and select tag
2012-03-30 16:26:58 +08:00
Petr Skoda
9aa09d8fed
MDL-32251 more E_STRCT fixes
2012-03-29 16:29:29 +02:00
Petr Skoda
caee6e6c26
MDL-32251 E_STRICT fixes part 3
2012-03-29 15:24:30 +02:00
Tim Hunt
87b564df81
MDL-32246 question export: should cope with unrecognised qtypes.
...
If a question is of an unrecognised type, then we just omit it from the export.
2012-03-29 14:14:32 +01:00
Tim Hunt
76cf77e4d3
MDL-32240 quiz editing: check permissions questions are added.
...
We also check permissions when removing questions from the quiz, so that
we do not let users make mistakes they cannot immediately undo.
2012-03-29 14:14:12 +01:00
Tim Hunt
51c5e6057c
MDL-32239 question bank: wrong cap checks editing/viewing quesitions
...
None of these problems affect the default roles. They only occur when
the permissions have been edited to allow restricted subsets of the
question capabilities.
In some cases, things that the restriced subset of capabilities should
have allowed were blocked by errors. In other cases, users were allowed
to do more than they should bave been due to failures to check the
right capabilities in the right places.
For full details, see the bug report.
Two of the bugs were previously reported separately as MDL-26395 and
MDL-27232.
2012-03-29 14:14:10 +01:00
