3678 Commits

Author SHA1 Message Date
Tim Hunt
2ce6a9c64f Merge branch 'MDL-47494-ddimageortext' into MDL-47494 2015-09-18 07:51:36 +01:00
Tim Hunt
55d4613f22 Merge branch 'MDL-47494-ddwtos' into MDL-47494 2015-09-18 07:51:34 +01:00
Tim Hunt
1fc5d49cc2 Merge branch 'MDL-47494-gapselect' into MDL-47494 2015-09-18 07:51:33 +01:00
Andrew Davis
6537778044 MDL-49973 changed continue to delete on delete confirmations 2015-09-14 17:40:34 +08:00
Tim Hunt
53eee12a7a MDL-51147 qtype_match: stats should cope even if Q edited badly
The numbers become pretty meaningless, but we need to avoid fatal
errors.
2015-09-09 16:48:27 +01:00
Tim Hunt
6b3bd52fae MDL-51090 question manual grading: fixing for testing issues 2015-09-02 15:09:34 +08:00
David Monllao
f242c83c77 Merge branch 'MDL-51090' of git://github.com/timhunt/moodle 2015-09-02 09:47:34 +08:00
Tim Hunt
b2694c0219 MDL-51090 question: further refinements to validating manual grades 2015-09-01 23:05:37 +01:00
David Monllao
9f6a55f7ea Merge branch 'MDL-51179-master' of git://github.com/damyon/moodle
Conflicts:
	lib/upgrade.txt
2015-09-01 15:57:21 +08:00
Damyon Wiese
988592c556 MDL-51179 Atto: Extend autosave fix to cover text changes
Added new functions to editor api - set/get_text so the
original form text can be determined from an editor.

When calling use_editor() you should first call set_text() with
the text that will be inserted in the form element.

There is also a new scheduled task for cleaning Atto autosave drafts.
2015-09-01 12:23:00 +08:00
Tim Hunt
aa8092c60f MDL-47494 gapselect: Clarify comment. 2015-08-26 23:14:16 +01:00
Tim Hunt
99348b2319 MDL-47494 ddmarker: Fix unit tests for 3.0 compatibility. 2015-08-21 12:35:58 +01:00
Tim Hunt
4a53044a10 MDL-47494 ddimageortext: Fix unit tests for 3.0 compatibility. 2015-08-21 12:35:36 +01:00
Tim Hunt
976d30839d MDL-47494 ddwtos: Fix unit tests for 3.0 compatibility. 2015-08-21 12:35:01 +01:00
Tim Hunt
b0380cd884 MDL-47494 gapselect: Fix unit tests for 3.0 compatibility. 2015-08-21 12:32:55 +01:00
Nelson Moller
52b08f5fce MDL-51090: mod_quiz grading validation of an essay question
An invalid format is casted to 0 (if a string) or to some truncated value in other cases (ex: 10..5).
2015-08-20 19:58:49 +01:00
Eloy Lafuente (stronk7)
30deee105c Merge branch 'MDL-50642' of https://github.com/ecampbell/moodle 2015-08-11 22:32:11 +02:00
Eoin Campbell
dcd4464ea3 MDL-50642 qformat_xml: fix import of tags in Cloze questions 2015-08-05 19:11:11 +01:00
Tim Hunt
1f17e41e9a MDL-50893 questions: cannot create a question with name 0 2015-07-28 18:18:17 +01:00
Dan Poltawski
5852140e65 Merge branch 'MDL-50799-master' of git://github.com/merrill-oakland/moodle 2015-07-13 16:08:23 +01:00
Dan Poltawski
5fceb11e6c Merge branch 'MDL-50806-master' of git://github.com/merrill-oakland/moodle 2015-07-13 13:42:53 +01:00
Dan Poltawski
218936aecc Merge branch 'MDL-50798-master' of git://github.com/merrill-oakland/moodle 2015-07-13 13:35:14 +01:00
Adam Riddell
faf01a4f82 MDL-50800 question: Add missing make_answer method
question/type/calculatedmulti/questiontype.php:
        - Add public make_answer method so that apply_attempt_state
          method in qtype_multichoice_base does not cause a fatal
          error when attempting to call make_answer.
2015-07-13 09:54:15 +10:00
Eloy Lafuente (stronk7)
188458a604 MDL-50049 deprecation: Extra minor fixes.
- complete and cleanup upgrade.txt
- replace remaining uses in comments.
- fix some incorrect bulk-replacement in previous commit.
2015-07-10 01:59:31 +02:00
Eric Merrill
cef7621e30 MDL-50806 questions: Allow more memory when doing a question import 2015-07-09 12:27:32 -04:00
Eric Merrill
a8524f3354 MDL-50799 question: Improve Show all text to be more accurate 2015-07-08 17:17:02 -04:00
Eric Merrill
c7092fe489 MDL-50798 question: Raise time limit when rendering questions
Rendering a large number of questions may be quite slow, so we want to
raise the limit.

We don’t call raise() in the loop because the quiz buffer captures this
function for a AJAX script, and we should only call raise if we expect
a corresponding output to the users browser. This helps to prevent
unexpected load balancer disconnects. See core_php_time_limit::raise()
for more details.
2015-07-08 15:49:10 -04:00
Andrew Nicols
d04e408e38 Merge branch 'php7_reserved_words' of git://github.com/tlevi/moodle 2015-06-18 07:10:38 +02:00
M Kassaei
ef0a59ab7c MDL-47494 ddimageortext: Fix drag and drop on Android touch devices. #85108
The initial suggestion for how to do this fix came from Davo Smith.
2015-06-16 18:38:56 +01:00
M Kassaei
3f6905b410 MDL-47494 ddwtos: Fix drag and drop on Android touch devices. #85101
The initial suggestion for how to do this fix came from Davo Smith.
2015-06-16 18:25:53 +01:00
M Kassaei
e76deaac51 MDL-47494 ddmarker: Fix drag and drop on Android touch devices. #85111
The original idea for this fix came from Davo Smith.
2015-06-16 18:20:40 +01:00
Dan Poltawski
28887344d6 Merge branch 'MDL-49368' of git://github.com/timhunt/moodle 2015-06-15 12:14:35 +01:00
Tony Levi
303936aa57 MDL-50453 core: Replace reserved word usage in progress\null (PHP7) 2015-06-15 12:21:27 +09:30
Eloy Lafuente (stronk7)
f0fa70d0df Merge branch 'MDL-29771' of git://github.com/timhunt/moodle 2015-06-01 16:13:18 +02:00
Tim Hunt
3af05ae35b MDL-29771 interactive behaviour: better state text in try again state
Before it just said 'Not complete'. It is more helpful to show the number
of tries remaining in this state as well.
2015-05-31 21:09:55 +01:00
Tim Hunt
312dce0ebc MDL-50341 quiz statistics: non-attempted questions broke first-try stats
For behaviours that allow multiple tries, and when the teacher had chosen to
generate statistics for the first tries only, and when a student had not
attempted one question, then an error occurred. It should have been classified
as no response.
2015-05-31 13:36:53 +01:00
Tim Hunt
e7df2335b6 MDL-50373 questions: random Qs must not pick deleted or sub- questions
This was a regression caused by MDL-6340. I missed the necessary
    AND parent = 0 AND hidden = 0
in one query of the question table.
2015-05-27 20:32:47 +01:00
Tim Hunt
ce95661817 MDL-49368 qtypes match & multichice: cope with editing after attempt
Teachers should not radically edit a question after it has been
attempted. However, if they do, we should handle it gracefully, rather
than triggering PHP errors.
2015-05-21 18:17:14 +01:00
Tim Hunt
8f21a4fb12 MDL-47494 ddimageortext: Fix editing form javascript. 2015-05-21 15:59:03 +01:00
Tim Hunt
be1ce906b5 MDL-47494 ddimageortext: Fix behat failures. 2015-05-21 15:58:55 +01:00
Tim Hunt
16f1bcee3d MDL-47494 ddmarker: Fix editing form javascript. 2015-05-21 15:57:11 +01:00
Tim Hunt
9deb358dda MDL-47494 ddmarker: Fix behat failures. 2015-05-21 15:57:10 +01:00
Tim Hunt
8ffe874059 MDL-47494 ddwtos: Fix behat failures. 2015-05-21 15:54:54 +01:00
Skylar Kelty
5b8e7b9564 MDL-50280 WebCT import scripts don't always clean up 2015-05-18 15:25:18 +01:00
Eloy Lafuente (stronk7)
b758ab3053 MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts 2015-05-12 00:21:05 +02:00
Tim Hunt
56f6628e9c MDL-47494 ddimageortext: Bump version for 1.8 release. 2015-05-11 07:38:24 +01:00
Tim Hunt
2a1af96b26 MDL-47494 ddmarker: Fix Behat tests for 2.9. 2015-05-08 16:41:45 +01:00
Tim Hunt
9b74b3b540 MDL-47494 ddimageortext: Fix Behat tests for 2.9. 2015-05-08 16:41:25 +01:00
Tim Hunt
bea20e16c9 MDL-47494 ddwtos: Fix Behat tests for 2.9. 2015-05-08 16:40:57 +01:00
Tim Hunt
2bf2e46ce3 MDL-47494 ddimageortext: ddimageortext: statistics failed when drag items were grouped #51569
The error in classify_response caused a fatal error in the quiz
statistics report.

Correctly testing this required some updates to the unit tests to
correctly replicate what happens when a question is attempted.
2015-05-08 12:21:36 +01:00