Commit graph

1646 commits

Author SHA1 Message Date
Simey Lameze
426bb5ae0f MDL-56753 mod_assign: fix groups and submitted counting on grading summary
This also fixes a coding error that was displayed when a group was not part of
assignment grouping.
2016-11-10 10:58:29 +08:00
Andrew Nicols
743f9c8c42 Merge branch 'wip-mdl-56840' of https://github.com/rajeshtaneja/moodle 2016-11-10 09:38:26 +08:00
Juan Leyva
6406431537 MDL-56839 upgrade.txt: Fix incorrect information in lib/upgrade.txt 2016-11-09 21:00:33 +00:00
Andrew Nicols
a2567336df Merge branch 'MDL-56755-m' of https://github.com/micaherne/moodle 2016-11-09 15:42:32 +08:00
Rajesh Taneja
d514d25e0a
MDL-56630 behat: Click on link in specificed block/region 2016-11-09 13:56:49 +08:00
Rajesh Taneja
26ca972e9e
MDL-56840 behat: Wait till pdf conversion progress is finished 2016-11-09 13:39:00 +08:00
David Monllao
6e986b2919 Merge branch 'mdl-54852-master' of https://github.com/Dagefoerde/moodle 2016-11-09 13:07:26 +08:00
Michael Aherne
db8514bcff MDL-56755 assign: Improve documentation of assign::get_grade_item() 2016-11-08 08:58:31 +00:00
David Monllao
d72c9774ae Merge branch 'wip-mdl-56630' of git://github.com/rajeshtaneja/moodle 2016-11-08 14:47:25 +08:00
Rajesh Taneja
dc90838aaa
MDL-56630 behat: Click on link in specificed block/region 2016-11-08 14:45:43 +08:00
Rajesh Taneja
eaefd5bc57
MDL-55215 behat: autocomplete field requires javascript 2016-11-08 14:21:52 +08:00
Ilya Tregubov
f67f5f0245 MDL-29795 assign: add missing sortorder column for overrides when backing up a course 2016-11-08 13:23:22 +11:00
Jan Dageförde
f928c24dcc MDL-54852 assignment: Suppress "leave page" warning after save
If the user navigates away from the grading page immediately
after saving the grading form, the browser warning can be
safely omitted, as there are no unsaved changes. This is achieved
by calling `reset_form_dirty_state()` of the core_formchangechecker
YUI module, which is responsible for the warning.
2016-11-07 10:35:06 +01:00
David Monllao
b667a67c47 MDL-29795 mod_assign: Remove empty line 2016-11-07 09:22:02 +08:00
David Monllao
cf4019cf40 Merge branch 'MDL-29795_master' of https://github.com/dmonllao/moodle 2016-11-07 09:20:59 +08:00
David Monllao
325ac748b2 MDL-29795 behat: Narrow Edit link scope 2016-11-07 09:19:41 +08:00
David Monllao
a5f53db190 Merge branch 'MDL-43796_master_blindmarking' of https://github.com/SWiT/moodle 2016-11-02 12:28:43 +08:00
David Monllao
f5d9072e51 Merge branch 'MDL-56462-master' of git://github.com/damyon/moodle 2016-11-02 09:14:09 +08:00
Dan Poltawski
b7959d831d Merge branch 'MDL-54112-master' of https://github.com/hcpss-banderson/moodle 2016-11-01 21:31:04 +00:00
Eloy Lafuente (stronk7)
a1f6a27c80 Merge branch 'MDL-47162' of git://github.com/merrill-oakland/moodle 2016-10-31 22:45:37 +01:00
Dan Poltawski
f2263f7c06 Merge branch 'MDL-56542-master-enfix' of git://github.com/mudrd8mz/moodle 2016-10-31 15:15:09 +00:00
Andrew Nicols
711e2ab184 Merge branch 'MDL-56583-master' of git://github.com/crazyserver/moodle 2016-10-31 13:42:46 +08:00
Pau Ferrer Ocaña
1f84c2c5ea MDL-56638 assign: Don't check sesskey using submit_grading_form from WS 2016-10-28 13:44:19 +02:00
Damyon Wiese
58488d0ff0 MDL-56462 boost: Fix assign grading options form
Classes attribute was not being honoured by all form element templates.
Formchangechecker was only looking for the ignoredirty class on the element,
in boost it is on the container.
Assign had specific styles to hide the submit buttons that were not matching in boost.
2016-10-28 12:24:50 +08:00
Eric Merrill
0e8b51607b MDL-47162 core_message: Cleanup of messaging course ids code 2016-10-27 18:12:42 +02:00
Amanda Doughty
cc350fd9c8 MDL-47162 core_message: Add course id to message eventdata 2016-10-27 18:11:27 +02:00
Brendan Anderson
c28c76450b MDL-54112 mod_assign: Add scale null grade filter 2016-10-27 09:58:56 -04:00
Pau Ferrer Ocaña
59111fa937 MDL-56583 assign: Add info about the user submission capability 2016-10-27 15:40:03 +02:00
Kenneth Hendricks
e47c002c75 MDL-29795 assign: Tweak user-info section in grader view
- also mirror due date removal in boost template
2016-10-27 17:09:58 +11:00
Kenneth Hendricks
84a303b5d2 MDL-29795 assign: Fix mustache template 2016-10-27 15:52:28 +11:00
Kenneth Hendricks
eeaefbb850 MDL-29795 assign: Add 'Duplicate override' breadcrumb 2016-10-27 14:10:43 +11:00
Kenneth Hendricks
a13f1f4996 MDL-29795 assign: Only display date columns if overrides 2016-10-27 14:10:35 +11:00
Kenneth Hendricks
34fac159fb MDL-29795 assign: Add course to user profile link 2016-10-27 11:38:40 +11:00
Kenneth Hendricks
f73c5b519c MDL-29795 assign: Add missing inactiveoverridehelp lang string 2016-10-27 10:39:49 +11:00
Eloy Lafuente (stronk7)
6f01090159 Merge branch 'MDL-56448-master' of git://github.com/danpoltawski/moodle 2016-10-26 16:11:44 +02:00
Dan Poltawski
f07cb88c57 MDL-56448 mustache: fix json errors in example context 2016-10-26 12:35:45 +01:00
Damyon Wiese
33cb7031de
MDL-55074 behat: Fix zoom in/out dom insertion 2016-10-26 10:18:52 +08:00
Helen Foster
c9636ddd51 MDL-56542 lang: Merge English strings from the en_fix language pack 2016-10-25 20:12:52 +02:00
David Monllao
26aa08b2f8 Merge branch 'MDL-56307-master' of git://github.com/jleyva/moodle 2016-10-25 17:33:08 +08:00
Juan Leyva
65b2669d98 MDL-56307 course: Return time updated and times updated 2016-10-25 10:10:55 +01:00
Juan Leyva
02a73d767c MDL-56307 course: New course_check_module_updates_since method 2016-10-25 10:10:52 +01:00
Dan Poltawski
76a6dc685d Merge branch 'MDL-56534-master' of git://github.com/crazyserver/moodle 2016-10-25 06:08:48 +01:00
Dan Poltawski
b5c5d741c4 Merge branch 'MDL-56538-master' of git://github.com/crazyserver/moodle 2016-10-24 15:50:55 +01:00
Pau Ferrer Ocaña
8845688ce4 MDL-56534 assign: Add grading status on get_submissions WS 2016-10-24 13:24:18 +02:00
Juan Leyva
a18cb9d84f MDL-29795 assign: Apply overrides to get_assignments
This commit also fix a problem in the previous commit
2016-10-24 11:24:40 +01:00
Damyon Wiese
6b8e798db1 MDL-29795 assign: Apply overrides before saving a submission
From the webservice.
2016-10-24 11:04:10 +01:00
Ilya Tregubov
d685b95935 MDL-29795 mod_assign: Add user/group override assignment module 2016-10-24 11:03:49 +01:00
David Monllao
3ea1fa18cc Merge branch 'mdl56466-master' of https://github.com/tlock/moodle 2016-10-24 15:23:51 +08:00
David Monllao
c10cd185a9 Merge branch 'MDL-55981-master' of git://github.com/andrewnicols/moodle 2016-10-24 13:20:42 +08:00
Pau Ferrer Ocaña
896b6e3cb0 MDL-56538 assign: Fix new grading interface UI popouts 2016-10-21 12:29:20 +02:00