15638 Commits

Author SHA1 Message Date
Andrew Nicols
49566c8a67 MDL-1626 mod_forum: Make cron handle discussion subscriptions 2014-06-24 12:16:34 +08:00
Andrew Nicols
e3bbfb52c4 MDL-1626 mod_forum: Add functions to change user discussion subscription state 2014-06-24 12:16:34 +08:00
Andrew Nicols
59075a4349 MDL-1626 mod_forum: Move subscription management to a separate class 2014-06-24 12:16:33 +08:00
Andrew Nicols
361a41d355 MDL-1626 mod_forum: Create new discussion subscription tracking table 2014-06-24 12:16:33 +08:00
Andrew Nicols
dc0464801d MDL-1626 mod_forum: Add behat tests for existing functionality 2014-06-24 12:16:33 +08:00
Andrew Nicols
a7a849038a MDL-1626 mod_forum: Add unit tests for forum cron mail behaviour 2014-06-24 12:16:33 +08:00
Damyon Wiese
44a0b1e700 Merge branch 'MDL-46056-master' of git://github.com/mudrd8mz/moodle 2014-06-24 11:34:23 +08:00
Eloy Lafuente (stronk7)
70465e7cb5 Merge branch 'MDL-45764_generalTool' of https://github.com/moodlerooms/moodle 2014-06-24 00:01:51 +02:00
Damyon Wiese
2dffa24f10 Merge branch 'MDL-45580-master' of git://github.com/FMCorz/moodle 2014-06-23 15:17:45 +08:00
Frederic Massart
b4148e4688 MDL-45580 assignfeedback_editpdf: Save readonly version in backup 2014-06-23 14:46:18 +08:00
Frederic Massart
7dbbb848c6 MDL-45580 assignfeedback_editpdf: Delete draft content on new submission 2014-06-23 14:17:24 +08:00
Frederic Massart
098f7dd438 MDL-45580 assignfeedback_editpdf: Store a readonly version of the PDF 2014-06-23 14:16:49 +08:00
Damyon Wiese
2404605ad4 Merge branch 'MDL-35453' of git://github.com/timhunt/moodle 2014-06-23 12:29:36 +08:00
Damyon Wiese
69377ddfab Merge branch 'MDL-46086' of git://github.com/timhunt/moodle 2014-06-23 12:26:00 +08:00
Damyon Wiese
a51201a433 Merge branch 'MDL-43835' of https://github.com/mr-russ/moodle 2014-06-23 12:20:04 +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
David Mudrák
56c8eaf5d2 MDL-46056 Remove invalid string definition from the workshop module
The correct version of the string is defined above.
2014-06-19 00:43:47 +02:00
Russell Smith
d2c58b95bb MDL-43835 phpunit: Correct unit tests.
When different ID's are set for each sequence a number
of unit test failures appear.  They have been corrected
to allow unit tests to pass with the new generator in place.
2014-06-17 19:08:01 +10:00
Damyon Wiese
e192e37f51 MDL-45582 EditPDF: whitespace fix 2014-06-17 10:27:19 +08:00
Damyon Wiese
177cc379ed MDL-45582 Editpdf: Prevent debugging when there is no pdf 2014-06-17 10:21:14 +08:00
Damyon Wiese
fac23f93ec Merge branch 'master_MDL-45582' of git://github.com/greg-or/moodle-mod_assign 2014-06-17 10:20:39 +08:00
Eloy Lafuente (stronk7)
01dca76248 Merge branch 'MDL-45970' of git://github.com/timhunt/moodle 2014-06-17 01:15:21 +02:00
Eloy Lafuente (stronk7)
cf7ac0aebf Merge branch 'wip-mdl-45719-master' of https://github.com/deraadt/moodle 2014-06-17 00:58:50 +02:00
Eloy Lafuente (stronk7)
8888451ed5 Merge branch 'MDL-45870-master' of git://github.com/FMCorz/moodle 2014-06-17 00:51:26 +02:00
Marina Glancy
db8071a7f9 Merge branch 'MDL-45940-master' of git://github.com/damyon/moodle 2014-06-16 17:28:15 +08:00
Marina Glancy
c126413655 Merge branch 'MDL-45901_Quiz_master' of git://github.com/nadavkav/moodle 2014-06-16 17:27:20 +08:00
Gregory Faller
028c9d20b9 MDL-45582: Apply grades and feedback to entire group does not work with Annotate PDF feature 2014-06-16 18:09:21 +09:30
Damyon Wiese
a3d7a82b64 Merge branch 'MDL-42531-alt' of https://github.com/jonof/moodle 2014-06-16 16:26:06 +08:00
Damyon Wiese
de06ce7ed3 MDL-45940 Assign: Improved access check
Call can_edit() instead of repeating a (slightly wrong) access check.
2014-06-16 16:20:11 +08:00
Damyon Wiese
b3f297df31 Merge branch 'MDL-31998_master' of git://github.com/grabs/moodle 2014-06-16 12:04:02 +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
Andreas Grabs
16ee970c94 MDL-31998 mod_feedback - Feedback depend questions bug 2014-06-13 01:45:23 +02: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
Damyon Wiese
c48c9bf02f MDL-42835 Scorm: Fix for JS error because no nodes are selected in the toc. 2014-06-12 13:57:34 +08: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
Frederic Massart
13a13c1178 MDL-45870 mod_assign: Behat test covering some outcome usage 2014-06-11 10:33:57 +08: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
850833378d Merge branch 'MDL-45761-master' of https://github.com/merrill-oakland/moodle 2014-06-10 14:01:23 +08:00
Damyon Wiese
dc92753a3a Merge branch 'MDL-45767_returnInstanceid' of https://github.com/moodlerooms/moodle 2014-06-10 13:34:01 +08:00
Damyon Wiese
5262686e5f Merge branch 'MDL-45729-master' of http://github.com/damyon/moodle 2014-06-10 13:28:04 +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
Jonathon Fowler
c462c35b95 MDL-42531 assign: refactor batch operations to use forms properly
Avoids a lot of ugly optional_param() use. Also fixes the
non-functional cancel buttons.
2014-06-10 14:06:41 +10:00
Damyon Wiese
5ba4ca894a MDL-45729 assign: Fix for assign unit tests
Check the user in the params, not the $USER
2014-06-10 11:39:20 +08:00
Michael de Raadt
d7f87343ce MDL-45719 mod_lti - Pass language strings to inline JS to allow for escaping 2014-06-10 11:35:48 +08:00
Eloy Lafuente (stronk7)
3150271c22 Merge branch 'MDL-45789_master' of https://github.com/markn86/moodle 2014-06-10 01:16:27 +02:00
Eloy Lafuente (stronk7)
d1b183b94b Merge branch 'MDL-45804_master' of https://github.com/markn86/moodle 2014-06-10 01:14:21 +02: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