moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77055 commits 37 branches 540 tags 1.3 GiB
Commit graph

1287 commits

Author SHA1 Message Date
Tony Butler
5047b0ea8f MDL-49075 mod_assign: Add assertions to marking workflow unit test 
Make sure grades aren't pushed to gradebook for marking workflow
states other than 'released'.
 2015-02-26 11:52:46 +00:00
Tony Butler
251d85c013 MDL-49075 mod_assign: Keep unreleased assign grades out of gradebook 2015-02-26 11:52:46 +00:00
Dan Poltawski
4a3b900698 Merge branch 'MDL-49241-master-enfix' of git://github.com/mudrd8mz/moodle 2015-02-24 16:50:12 +00:00
Dan Poltawski
73d8a50d73 Merge branch 'master-18177' of https://github.com/timpricecatalyst/moodle-1 2015-02-24 11:18:37 +00:00
Helen Foster
428330da1c MDL-49241 lang: Merge English strings from the en_fix language pack 2015-02-24 11:15:15 +01:00
Zachary Durber
3547f186a8 MDL-35392 mod_assign: Push feedback to gradebook when releasing grades 
When bulk changing workflow status a mismatch in variable
names meant that feedback wasn't being sent to the gradebook.
 2015-02-23 09:14:05 +08:00
Tim Price
e1de40f7f7 MDL-18177 backup: adding PHPdocs blocks 2015-02-20 11:45:23 +11:00
Tim Price
d7891c83dd MDL-18177 backup: addressing coding standards 2015-02-20 11:45:23 +11:00
Matt Sammarco
868b086c4a MDL-18177 backup: Add backup option to include groups and groupings 2015-02-20 11:45:22 +11:00
Rajesh Taneja
6628ea3f0c MDL-47172 print_overview: Fixed behat for overview changes 2015-02-18 11:37:50 +08:00
David Monllao
02838257f3 Merge branch 'MDL-48884_master' of git://github.com/markn86/moodle 2015-02-17 14:43:49 +08:00
David Monllao
608132d7e4 MDL-47172 print_overview: Fixing indentation 2015-02-16 09:38:05 +08:00
Ankit Agarwal
81251186e7 MDL-47172 print_overview: Add more unit tests 2015-02-13 11:12:13 +05:30
Ankit Agarwal
a7366bc858 MDL-47172 print_overview: Show assignments only when needed 
The intended behaviour is not to display this notification when:-
1) The assignment is closed.
2) User is a student and has a valid submission in place.
3) User is a teacher and there is nothing to grade.

Beisdes the above changes the patch also includes minor other fixes such as:-
1) Fixed phpdocs
2) Fixed inconsistent return value.
3) Fixed unit tests that had arguments in wrong order.
 2015-02-13 11:12:12 +05:30
Mark Nelson
0b1df17129 MDL-48884 mod_assign: prevented setting gradebook feedback unnecessarily 2015-02-02 23:34:54 -08:00
Andrew Nicols
6ef9a63bcd Merge branch 'MDL-48608_master' of git://github.com/markn86/moodle 2015-02-03 12:30:29 +08:00
Mark Nelson
d838640e4c MDL-48608 mod_assign: correctly display grades for group assignments 2015-02-02 20:13:24 -08:00
Zachary Durber
75d08f0291 MDL-31036 mod_assign: Don't strip quickgrading feedback of special chars 2015-01-30 14:43:35 +08:00
Eloy Lafuente (stronk7)
8181ab5865 Merge branch 'MDL-48620-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-min.js
 2015-01-28 01:02:54 +01:00
Mark Nelson
d2e1c5f5fc MDL-40285 mod_assign: added extra group submissions behat scenario 
Thanks a lot to Jody Steele for providing the basis for the scenario.
 2015-01-27 00:36:49 -08:00
Mark Nelson
e43f1d514c MDL-40285 mod_assign: show details for all default group members 2015-01-27 00:36:49 -08:00
Andrew Nicols
557f44d970 MDL-48620 JavaScript: Updated shifted files to comply with coding style 2015-01-23 14:51:24 +08:00
Andrew Nicols
2a43613b73 Merge branch 'master_MDL-48418' of https://github.com/greg-or/moodle-mod_assign 2015-01-15 08:35:02 +00:00
Eloy Lafuente (stronk7)
ccb722b76c Merge branch 'MDL-48574_workflow_state_updated_batch_single' of https://github.com/Dave-B/moodle 2015-01-15 08:35:01 +00:00
Eloy Lafuente (stronk7)
639910a75d Merge branch 'MDL-41166-master' of git://github.com/danpoltawski/moodle 2015-01-15 08:35:01 +00:00
Gregory Faller
b351e4460a MDL-48418 mod/assign: Fix text in 'late submission' row 2015-01-12 09:00:44 +10:30
David Balch
73f419ea43 MDL-48574 assign: Test workflow_state_updated fired on batch and single. 2015-01-09 15:18:05 +00:00
Eloy Lafuente (stronk7)
ae3663a082 Merge branch 'MDL-48748-master-enfix' of git://github.com/mudrd8mz/moodle 2015-01-07 17:15:52 +01:00
David Balch
5bd9cdec1d MDL-48574 assign: Fire workflow_state_updated event on batch and single. 
This change adds the workflow_state_updated event when changing workflow
state using the single grading page and the quick grading mechanisms.
Previously, it only fired for batch updates using
process_set_batch_marking_workflow_state().
 2015-01-07 13:57:03 +00: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
Dan Poltawski
418bd23ffb MDL-41166 assign: don't display portfolio button when no permissions 
Thanks to Katja Krüger for the basis of the patch.
 2014-12-30 16:46:53 +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 b8572fa904, reversing
changes made to 172d7f16ce.
 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