mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-02 15:02:41 +02:00
Code Issues Projects Releases Wiki Activity
71,795 Commits 36 Branches 528 Tags
b79dca85b7
Commit Graph

1108 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
ae3663a082 Merge branch 'MDL-48748-master-enfix' of git://github.com/mudrd8mz/moodle 2015-01-07 17:15:52 +01:00
Mark Nelson
3f94c97a99 MDL-46498 mod_assign: fixed failing behat test due to GS 2015-01-06 20:48:35 -08:00
Andrew Nicols
9a99c21caf Merge branch 'master_MDL-48428' of https://github.com/greg-or/moodle-mod_assign 2015-01-07 10:23:57 +08:00
David Monllao
b301753ba9 Merge branch 'MDL-48549_master' of git://github.com/markn86/moodle 2015-01-07 09:37:35 +08:00
Helen Foster
b7853012b8 MDL-48748 lang: Merge English strings from the en_fix language pack 2015-01-06 21:53:17 +01:00
Dan Poltawski
ccd8992b29 Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle 2015-01-06 11:11:42 +00:00
Dan Poltawski
4aef356fd2 Merge branch 'MDL-46498_master' of https://github.com/markn86/moodle 2015-01-05 17:47:52 +00:00
Andrew Nicols
f06fc2b5c4 MDL-48104 mod_assign: Strip out use of eval() for string parsing 
I've also replaced other  occurrences of M.str with the correct use of
M.util.get_string() instead.
 2015-01-05 17:20:41 +00:00
Mark Nelson
5758de531c MDL-48549 mod_assign: added upgrade to clean the tables 2014-12-26 19:01:36 -08:00
Mark Nelson
26ac0abc22 MDL-48549 mod_assign: delete entries from the flags/mapping tables 2014-12-26 18:53:14 -08:00
Mark Nelson
d4aa23d09e MDL-46498 mod_assign: added behat tests 2014-12-26 17:48:06 -08:00
Mark Nelson
bd3ee80716 MDL-46498 mod_assign: display correct grading status 2014-12-23 23:46:22 -08:00
Mark Nelson
c588fdac36 MDL-48534 mod_assign: display correct workflow state and marker 2014-12-23 22:37:25 -08:00
Dan Poltawski
cb878d027b Revert "Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle" 
This reverts commit b8572fa90435390fc18c2fe537403f7931d966aa, reversing
changes made to 172d7f16cecc7c666352086d40f4d5e84c714d32.
 2014-12-23 10:46:39 +00:00
Dan Poltawski
b8572fa904 Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle 2014-12-22 13:52:36 +00:00
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
acb525551f MDL-48534 mod_assign: display correct workflow state and marker 2014-12-17 00:06:49 -08:00
Mark Nelson
8dc1f5ff71 MDL-45324 mod_assign: always notify students when requested 2014-12-16 23:41:00 -08:00
Gregory Faller
24937b2c1e MDL-48428 mod/assign: Allow Grant extension option in offline assignment 2014-12-17 14:26:25 +10:30
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
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
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
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
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
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
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
Gregory Faller
b288570463 MDL-46172 mod/assign: Stop suspended users getting assign group emails 2014-12-06 08:24:08 +10:30
Eloy Lafuente (stronk7)
38ea5e0a39 MDL-21724 course: change remaining tests to new "Save and display" 2014-12-04 12:14:31 +00:00
Matt Petro
e77bacab4f MDL-48235 mod_assign: Fix reopen until pass behavior 2014-12-02 14:01:22 -05:00
Damyon Wiese
3e116130b0 Revert "Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle" 
This reverts commit 861a0fd92a9a8ae3f970707a8e39a4ba96fbdaba.

This reverts commit f376c2ffd7d8304bafff851ead3ed10dee34c805, reversing
changes made to abe9be7240d7bda36bd3831b3638795466987745.
 2014-11-28 15:07:31 +08:00
David Monllao
861a0fd92a MDL-38128 mod_assign: Changes in grading summary page using team submissions 
If there is an active group and (groupmode != NOGROUPS)
the displayed info is related with that single group.
 2014-11-27 18:08:43 +08:00
Ashley Holman
e629bd3ff3 MDL-46356 assign: remove unnecessary get_area_files call 2014-11-25 14:27:17 +00:00
Dan Poltawski
f376c2ffd7 Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle 2014-11-25 11:07:50 +00:00
David Monllao
ec802d8ef6 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-11-25 10:44:36 +08:00
Sam Hemelryk
9e921abaff Merge branch 'm29_MDL-48265' of https://github.com/totara/moodle 2014-11-25 09:42:46 +13:00
Dan Poltawski
e1a826e205 Merge branch 'MDL-48180-master' of git://github.com/FMCorz/moodle 2014-11-24 11:53:53 +00:00
Sam Hemelryk
11b5e41b0c NOBUG: fixed commit message typo 2014-11-20 16:47:33 +13:00
Sam Hemelryk
2949dedcda MDL-43628 mod_assign: fixed formatting of statement 2014-11-20 10:18:28 +13:00