16273 Commits

Author SHA1 Message Date
Andrew Nicols
2da076e6bc Merge branch 'MDL-45324_master' of https://github.com/markn86/moodle 2014-12-18 14:07:46 +08:00
David Monllao
2d7b234362 Merge branch 'MDL-48235-master-fixes' of git://github.com/xow/moodle 2014-12-18 12:35:55 +08:00
Zachary Durber
a68b8d8d16 MDL-47442 mod_assign: Notify student when quick-grading grade 2014-12-18 12:10:01 +08:00
John Okely
3a5581c1ad MDL-48235 mod_assign: Fix grade of 0 not showing on feedback page in oracle 2014-12-18 10:23:03 +08:00
Mark Nelson
8dc1f5ff71 MDL-45324 mod_assign: always notify students when requested 2014-12-16 23:41:00 -08:00
Dan Poltawski
861265b43a Merge branch 'MDL-43462_landscape_pdf' of git://github.com/davosmith/moodle 2014-12-16 19:20:22 +00:00
Dan Poltawski
f5360dd16b Merge branch 'MDL-43902-master' of git://github.com/FMCorz/moodle 2014-12-16 18:52:40 +00:00
Dan Poltawski
b721d502e4 Merge branch 'MDL-46442-master' of git://github.com/zbdd/moodle 2014-12-16 13:52:52 +00:00
Eloy Lafuente (stronk7)
2da9d573c3 Merge branch 'MDL-47694-master' of git://github.com/zbdd/moodle 2014-12-16 11:18:08 +01:00
Zachary Durber
a4b10a5244 MDL-46442 mod_assign: Notify users when grades are changed 2014-12-16 14:49:52 +08:00
David Monllao
e064c37550 Merge branch 'MDL-48164-master' of git://github.com/andrewnicols/moodle 2014-12-16 12:02:29 +08:00
Andrew Nicols
c9fa2dee2a MDL-48164 mod_forum: Add additional headers to prevent OOF replies
This adds the X-Auto-Response-Suppress header to outbound messages.
2014-12-16 09:34:12 +08:00
Eloy Lafuente (stronk7)
bd5745341e Merge branch 'MDL-48473' of git://github.com/jmvedrine/moodle 2014-12-16 01:12:56 +01:00
Davo Smith
50c12f01bc MDL-43462 assignfeedback_editpdf: fix display of landscape PDFs
The size of the drawing canvas is now set from the size of the generated page image, with automatic
scrolling if it is too wide to display
Absolutely-positioned nodes (comments + stamps) are repositioned as the drawing canvas is scrolled
2014-12-15 22:01:26 +00:00
Dan Poltawski
dda9997250 Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle 2014-12-15 16:10:15 +00:00
Dan Poltawski
3a299d82e0 Merge branch 'MDL-45324' of git://github.com/jonof/moodle 2014-12-15 14:59:34 +00:00
Dan Poltawski
78677d5ec7 Merge branch 'MDL-47475-master' of git://github.com/andrewnicols/moodle 2014-12-15 12:20:41 +00:00
Dan Poltawski
2d562cfc6d Merge branch 'MDL-36673' of git://github.com/jmvedrine/moodle 2014-12-15 11:54:06 +00:00
David Monllao
edf938687f Merge branch 'MDL-48235-assign-reopen-until-pass' of git://github.com/mpetrowi/moodle 2014-12-15 17:30:40 +08:00
Andrew Nicols
9b65a08095 MDL-47475 mod_assign: Copy files to other group members for editpdf 2014-12-15 08:50:31 +08:00
David Monllao
2dda9417dd MDL-38128 mod_assign: Counts and groups unit tests 2014-12-12 15:10:23 +08:00
David Monllao
bc006a666c MDL-38128 mod_assign: Fixing count teams and submissions with status
We should restrict the groups to the activity active group. Also
improving performance caching get_submission_group() results.
2014-12-12 13:14:53 +08:00
David Monllao
184f3b6814 MDL-38128 mod_assign: Adding group selector to grading summary page
Thanks to Pau Ferrer Ocaña and Avi Levy for
their work on this issue.
2014-12-12 13:14:53 +08:00
Jean-Michel Vedrine
b63c745ec6 MDL-48473 mod_lesson: test fill in the blank question 2014-12-11 21:44:43 +01:00
Jean-Michel Vedrine
cb9af73037 MDL-48473 mod_lesson: fill in the blank shortanswer option 2014-12-11 21:12:43 +01:00
Jonathon Fowler
70cfc878b9 MDL-45324 assign: notify when workflow is Off, or if state is Released
When marking workflow is enabled, students will be notified only when
the workflow state transitions to 'Released'. Until that happens,
sending of messages will be held and the 'Notify students' grading
form option will be locked.

Additionally, the batch set marking workflow state facility gains
the 'Notify students' option.

Credit to Steve Upton and David Balch for the basis of this patch.
2014-12-10 22:29:08 +10:00
Dan Poltawski
971f1c28a8 Merge branch 'MDL-45430-master' of git://github.com/ankitagarwal/moodle 2014-12-09 21:22:03 +00:00
Dan Poltawski
23da79a464 MDL-45679 mod_lesson: do not overqualify styles 2014-12-09 12:34:54 +00:00
Dan Poltawski
9478d117fc Merge branch 'MDL-45679' of git://github.com/jmvedrine/moodle 2014-12-09 12:05:29 +00:00
Zachary Durber
8c1050f87d MDL-47694 mod_assign: Grades require a grade to show as graded
Special thanks to Howard Miller.
2014-12-09 15:55:29 +08:00
Frederic Massart
ba55be9151 MDL-43902 output: Final deprecation of classes r0/r1 in table rows 2014-12-09 14:52:30 +08:00
Sam Hemelryk
d5265ac28e Merge branch 'master_MDL-46172' of https://github.com/greg-or/moodle-mod_assign 2014-12-09 15:38:40 +13:00
Sam Hemelryk
440d861ccb Merge branch 'wip-mdl-48426' of https://github.com/rajeshtaneja/moodle 2014-12-09 12:13:26 +13:00
Dan Poltawski
065fa16e75 Merge branch 'MDL-48410' of git://github.com/timhunt/moodle 2014-12-08 15:19:11 +00:00
David Monllao
cbebd40dfb MDL-47246 mod_forum: Limit last post restriction to Q and A 2014-12-08 14:51:36 +08:00
Gregory Faller
b288570463 MDL-46172 mod/assign: Stop suspended users getting assign group emails 2014-12-06 08:24:08 +10:30
Joseph Rezeau
4627726954 MDL-36673 mod_lesson: slideshow mode not working 2014-12-05 18:42:03 +01:00
Jean-Michel Vedrine
cfcfd7045f MDL-45679 mod_lesson: Essay grading page has no mark for essay status 2014-12-05 15:02:32 +01:00
Tim Hunt
8fec847ca7 MDL-48410 behat, quiz: step for efficiently adding questions 2014-12-05 12:22:28 +00:00
Ankit Agarwal
978fa4627d MDL-45430 mod_book: Automate MDLQA-2428
This test verifies that an admin can generate and view all the book log entries
2014-12-05 09:23:03 +05:30
Andrew Nicols
06e23acc88 MDL-48309 mod_forum: Do not escape ampersands in plain text email 2014-12-04 12:14:32 +00:00
Eloy Lafuente (stronk7)
38ea5e0a39 MDL-21724 course: change remaining tests to new "Save and display" 2014-12-04 12:14:31 +00:00
Sam Hemelryk
101348192b Merge branch 'MDL46116_IMSCP_container_items.updates_2014-11-11' of https://github.com/Dave-B/moodle
Conflicts:
	mod/imscp/module.js
2014-12-04 12:14:26 +00:00
Dan Poltawski
2852a9a0aa Merge branch 'MDL-34627_master' of https://github.com/dmonllao/moodle 2014-12-04 12:04:10 +00:00
Dan Poltawski
67a51a5bed Merge branch 'MDL-48342' of git://github.com/jmvedrine/moodle 2014-12-04 11:37:52 +00:00
Matt Petro
e77bacab4f MDL-48235 mod_assign: Fix reopen until pass behavior 2014-12-02 14:01:22 -05:00
David Balch
c57617dac1 MDL-46116 mod_imscp: Fix some jshint issues. 2014-12-02 10:33:11 +00:00
Rajesh Taneja
146dbacc45 MDL-48426 behat: Wait for redirection after save
After saving wiki comment, page is redirected
Make sure to wait for redirection after save
to avoid random fails
2014-12-01 11:24:04 +08:00
Charles Fulton
f885712200 MDL-34627 feedback: Convert default format value during restore 2014-12-01 10:53:15 +08:00
Sam Hemelryk
0893f8d399 Merge branch 'wip-MDL-48377-master' of git://github.com/marinaglancy/moodle 2014-12-01 14:02:08 +13:00