3534 Commits

Author SHA1 Message Date
Damyon Wiese
2404605ad4 Merge branch 'MDL-35453' of git://github.com/timhunt/moodle 2014-06-23 12:29:36 +08:00
Tim Hunt
1c2e363c0e MDL-46086 quiz: fix unit test on Oracle 2014-06-20 22:25:21 +01:00
Tim Hunt
2ce9a94d96 MDL-35453 quiz reports: don't order by id.
We were using ORDER BY id even though there was a perfectly good
attempt column to order the attempts by one user at one quiz.

Also, Oracle was complaining:
Debug info: ORA-01799: a column may not be outer-joined to a subquery
2014-06-20 16:09:03 +01:00
Eloy Lafuente (stronk7)
01dca76248 Merge branch 'MDL-45970' of git://github.com/timhunt/moodle 2014-06-17 01:15:21 +02:00
Marina Glancy
c126413655 Merge branch 'MDL-45901_Quiz_master' of git://github.com/nadavkav/moodle 2014-06-16 17:27:20 +08:00
Damyon Wiese
1df546a77e Merge branch 'MDL-45803_master' of https://github.com/markn86/moodle 2014-06-16 11:00:26 +08:00
Nadav Kavalerchik
c9976d96a5 MDL-45901 - Quiz - Display random questions (from category) on RTL mode. 2014-06-13 12:20:23 +03:00
Tim Hunt
4175a57038 MDL-45970 quiz editing: fix display of random questions.
The pass by reference meant the function was clobbering the variable in
the calling function. Once that was change, it was not strictly
necessary to rename the variable in the function, but I did anyway for
clarity.

Thanks to Rajesh Taneja for finding the problem, and identifying which
bit of code was broken. I really just made the patch.
2014-06-12 19:45:33 +01:00
Mark Nelson
b4cfcf5e53 MDL-45803 mod_quiz: removed the quiz_fire_attempt_started function
Also commented in mod/quiz/upgrade.txt to inform developers.
2014-06-11 13:53:59 -07:00
Mark Nelson
62a3472e24 MDL-45803 mod_quiz: removed usage of the function quiz_fire_attempt_started_event 2014-06-11 13:53:03 -07:00
Marina Glancy
410bb9a92c Merge branch 'MDL-20154-master' of git://github.com/merrill-oakland/moodle 2014-06-10 15:41:53 +08:00
Damyon Wiese
2d8d99ab5b Merge branch 'MDL-45763-master' of https://github.com/merrill-oakland/moodle 2014-06-10 12:42:09 +08:00
Mark Nelson
400afba6ab MDL-45803 mod_quiz: prevented the attempt_started event from being triggered twice 2014-06-09 15:59:41 -07:00
Mark Nelson
546a2c95f4 MDL-45803 mod_quiz: added attempt snapshot for the attempt and preview started events 2014-06-09 15:59:26 -07:00
Eric Merrill
828a4e9f6e MDL-20154 quiz: Remove unused random questions
When a random question is removed from a quiz, and it is not
in use elsewhere, it should be deleted.
2014-06-05 11:06:26 -04:00
Dan Poltawski
ed3f8591ed Merge branch 'master_MDL-40371' of git://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/lib.php
2014-06-03 15:19:22 +01:00
Dan Poltawski
0eb40618ba Merge branch 'MDL-44054' of git://github.com/timhunt/moodle 2014-06-03 12:58:34 +01:00
Damyon Wiese
96c9b2feb3 Merge branch 'MDL-45630_master' of https://github.com/markn86/moodle 2014-06-03 15:00:27 +08:00
Eric Merrill
a871a7a757 MDL-45763 question Random qtype should use '0' or '1' question text.
Some time ago, it when from using '0' for no-subcategories to blank.
Change to properly define '0' or '1', update old questions, and make
sure to fix newly restored questions.
2014-06-02 15:31:23 -04:00
Mark Nelson
1ea5f1e2d3 MDL-45630 events: removed unnecessary 'the' from event descriptions 2014-05-31 15:27:11 -07:00
Tim Hunt
67014b5d23 MDL-45781 quiz autosave: detect and report when the session is lost.
and also other errors.
2014-05-30 16:26:23 +01:00
Tim Hunt
7076b30972 MDL-44054 quiz_statistics fix lang string concatenation. 2014-05-29 14:44:21 +01:00
Brian King
6a97697a2a MDL-40371 Upgrade-until-22: remove obsolete _upgrade_grades functions 2014-05-29 19:43:37 +12:00
Eloy Lafuente (stronk7)
f94891cc00 MDL-45503 upgrade: add v2.7.0 sep lines 2014-05-28 01:13:42 +02:00
Marina Glancy
4d46c88b9f Merge branch 'MDL-44333' of git://github.com/timhunt/moodle 2014-05-20 14:10:03 +08:00
Dan Poltawski
0c722830d9 Merge branch 'MDL-44449' of git://github.com/timhunt/moodle 2014-05-20 09:50:43 +08:00
Tim Hunt
35cbe84bf7 MDL-44449 quiz access rules should have a delete hook.
So they can clean up their settings when the quiz is deleted.

See
babf149c2c
for an example of using this.
2014-05-19 16:59:04 +01:00
Damyon Wiese
cc3dfc2c5f Merge branch 'MDL-43833' of git://github.com/timhunt/moodle 2014-05-19 20:11:50 +08:00
Tim Hunt
1c65d09f17 MDL-44333 quiz reports: use consitent name for user pref
The Marks for each question setting was not being saved properly as a
user preference.
2014-05-17 14:52:43 +01:00
Tim Hunt
6f988b712d MDL-45455 quiz cron must rollback transaction on error. 2014-05-15 15:09:58 +01:00
Tim Hunt
69d8094f83 MDL-43833 quiz reports: persist states settings between pages. 2014-05-15 15:09:12 +01:00
Eric Merrill
81d48fb907 MDL-45523 quiz Cleanup duplicate question instances. 2014-05-13 14:47:12 +08:00
Eric Merrill
6794a98f6c MDL-45522 quiz Check that sumgrade is valid before saving. 2014-05-13 14:35:43 +08:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
2014-05-09 02:12:28 +02:00
Marina Glancy
9a9b5257fa Merge branch 'MDL-45373-master' of git://github.com/jamiepratt/moodle 2014-05-08 15:41:20 +08:00
Andrew Nicols
02915dfc23 MDL-45357 events: Remove unnecessary the before 'id' in event descriptions 2014-05-06 16:45:05 +08:00
Andrew Nicols
4d87e5c109 MDL-45357 events: Normalise event description names 2014-05-06 16:44:04 +08:00
James Pratt
96a0b9aaaa MDL-45373 quiz response analysis : count all tries at question
don't filter repeated tries.
2014-05-06 12:26:02 +07:00
Mark Nelson
c5cfb3ca98 MDL-45357 events: changed event descriptions to ensure consistency in core 2014-05-05 00:55:50 -07:00
Marina Glancy
3409fac5ef Merge branch 'MDL-45273' of git://github.com/timhunt/moodle 2014-05-01 21:17:01 +08:00
Tim Hunt
0e8fe7de3d MDL-45273 quiz fixup settings initialisation. 2014-05-01 11:09:05 +01:00
Marina Glancy
7936ca2c54 MDL-45273 quiz: whitespace fix 2014-05-01 12:19:49 +08:00
Marina Glancy
ea50fe37c8 Merge branch 'MDL-45273' of git://github.com/timhunt/moodle 2014-05-01 12:16:48 +08:00
Damyon Wiese
46a7e1d23b Merge branch 'MDL-45321' of git://github.com/timhunt/moodle 2014-04-30 15:25:22 +08:00
Petr Skoda
b649341dab MDL-43557 add missing description to \mod_quiz\event\attempt_becameoverdue 2014-04-30 15:00:03 +08:00
Mark Nelson
02a5a4b2ff MDL-43557 events: fixed minor issues in existing events 2014-04-29 19:16:11 -07:00
Tim Hunt
3180508949 MDL-45273 quiz: Fix codechecker issues. 2014-04-29 11:57:01 +01:00
Tim Hunt
9b38aca0ce MDL-45321 quiz upgrade: make it more tolerant to old bad data. 2014-04-29 11:41:16 +01:00
Tim Hunt
8a347d8011 MDL-45273 only create the quiz settings if necessary. 2014-04-29 11:16:49 +01:00
Tim Hunt
9ec7a71661 MDL-45273 remove the need for quiz settings.php to include locallib.php. 2014-04-29 11:16:44 +01:00