a35dea73e7
Merge branch 'MDL-43796_31_blindmarking' of https://github.com/SWiT/moodle into MOODLE_31_STABLE
2016-11-02 12:29:04 +08:00
7fa03088be
Merge branch 'MDL-54112-31' of https://github.com/hcpss-banderson/moodle into MOODLE_31_STABLE
2016-11-01 21:31:04 +00:00
a20a0a48f0
Merge branch 'MDL-56542-31-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE
2016-10-31 15:14:02 +00:00
e50b26fa7c
MDL-54112 mod_assign: Add scale null grade filter
2016-10-27 10:33:47 -04:00
bf639be2ef
Merge branch 'MDL-56448-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE
2016-10-26 17:06:21 +02:00
f093a38342
MDL-56448 mustache: fix json errors in example context
2016-10-26 12:37:40 +01:00
9f809b1818
MDL-56542 lang: Merge English strings from the en_fix language pack
2016-10-25 20:26:36 +02:00
6c91de2362
Merge branch 'mdl56466-moodle31' of https://github.com/tlock/moodle into MOODLE_31_STABLE
2016-10-24 15:24:08 +08:00
a0f41c8b2d
Merge branch 'MDL-56062-31' of https://github.com/lucisgit/moodle into MOODLE_31_STABLE
2016-10-18 12:06:58 +01:00
096ea34f43
Merge branch 'MDL-56345-31' of https://github.com/lucisgit/moodle into MOODLE_31_STABLE
2016-10-18 09:38:41 +02:00
fe9831dd7d
MDL-56466 assign: fix database error with team submissions
...
This fixes the error when viewing the Grading summary with Blind Marking and Team submission is enabled:
ERROR: Incorrect number of query parameters. Expected 32, got 31.
2016-10-18 12:09:16 +10:30
2e22fc8a24
Merge branch 'MDL-56022_m31v3' of https://github.com/sbourget/moodle into MOODLE_31_STABLE
2016-10-18 00:07:30 +02:00
8fbdc47ab8
MDL-56022 Assign: Make folders structure in the downloaded zip optional
...
Special thanks to Matt McDermott for the contributing the Javascript
code to fix this issue.
2016-10-17 16:26:12 -04:00
66add1538d
Merge branch 'MDL-56300_31' of git://github.com/reskit/moodle into MOODLE_31_STABLE
2016-10-17 18:51:17 +02:00
33b8704892
MDL-43796 assign: Reset revealidentities on restore
...
Set revealidentities to 0 when restoring with blindmarking and no user data
2016-10-14 14:11:05 -04:00
70363d7394
MDL-55630 mod_assign: Exclude users courses from user details
...
Exclude users' enrolled courses for performance reason.
A new 'includeenrolments' parameter was added
to mod_assign::list_particpants.
2016-10-14 09:28:29 -04:00
4bb8469038
MDL-56300 mod_assign: Filtering students throws a javascript error
2016-10-14 09:27:30 +02:00
73792e3ff2
MDL-56345 assignfeedback_editpdf: Use correct strings for tool alt text
2016-10-13 10:07:57 +01:00
76e4c52a2f
MDL-56062 mod_assign: Use $gradeitem->get_decimals() for grade display
2016-10-12 20:47:01 +01:00
139dda66cc
Merge branch 'MDL-45969-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE
2016-10-05 09:43:05 +08:00
8796156112
Merge branch 'MDL-56198_31' of git://github.com/timhunt/moodle into MOODLE_31_STABLE
2016-10-04 09:05:26 +08:00
75092504a1
Merge branch 'MDL-55421-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE
2016-10-03 19:48:28 +08:00
72a08226d6
Merge branch 'MDL-55222-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE
2016-10-03 13:02:28 +08:00
e7d8a6079b
MDL-56198 assignment: improve grading info responsiveness
2016-09-30 15:02:13 +01:00
0d5d8ee56a
MDL-45969 editpdf: The logic for showing a previous attempt is wrong
...
It originally was only ever going to show static pdfs for older versions,
but this doesn't make sense in the UI for 3.1.
2016-09-30 13:15:59 +08:00
1c4e222256
MDL-55421 js: add some global ignores to js files
...
This is to prevent linting to be extremely noisy about rollup related
problems.
Should not affect built files.
2016-09-29 16:42:54 +01:00
23460f7fdb
MDL-55222 webservice: Apply external_format_string in course names
2016-09-26 12:42:20 +01:00
ff45fa7435
MDL-55472 assign: Show userlist on extension form error page
2016-09-25 11:32:13 +10:00
f1cfb0d949
Merge branch 'MDL-55944_31' of https://github.com/mr-russ/moodle into MOODLE_31_STABLE
2016-09-19 11:28:40 +01:00
e4439947ac
MDL-55944 testing: Reduce sleep usage.
...
Remove sleep() and replace with waiting for a second to roll over,
this results in a simpler call the guarantee time() has moved forward
2016-09-14 09:50:32 +10:00
0489c3c878
MDL-55505 mod_assign: Editing previous attempt works correctly.
...
Editing a previous attempt keeps the current feedback and grades
as it should and does not override them.
2016-09-08 20:32:25 +08:00
51dd539322
Merge branch 'MDL-54113-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE
2016-09-05 07:53:07 +01:00
b514df00e1
Merge branch 'MDL-54873-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE
2016-08-30 12:52:48 +08:00
ebd8ffb4e1
MDL-54873 assign: Seed recordid to print_recent_activity
2016-08-30 11:57:42 +08:00
cb55cd8574
MDL-54873 assign: Add recordid fetching participants
...
get_submission_info_for_participants is primarily used by externallib.php
2016-08-30 11:49:29 +08:00
4693e0ca86
MDL-54873 assign: Fetch mapping id for blind marking in cron
2016-08-30 11:49:29 +08:00
91840654b1
MDL-54873 assign: Fetch mapping id for blind marking grading
...
This change modifies the grading table to pre-seed record ids where they
already exist.
Where they do not exist, they are still fetched.
2016-08-30 11:49:29 +08:00
4472485ebf
Merge branch 'wip-MDL-55708-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE
2016-08-29 11:19:08 +08:00
c59eddd327
MDL-55708 mod_assign: display formatted acitvity names
2016-08-25 09:53:51 +08:00
1fc7e6b184
MDL-55668 assign: Don't link to user profile if blind marking is enabled
2016-08-24 11:39:48 +01:00
b6e3abd875
MDL-54113 assign: Open files in new window
...
Open files in a new window when viewing to ensure that the form change
checker does not warn about the page reloading.
2016-08-24 11:34:21 +08:00
30fdcea14c
Merge branch 'MDL-55520-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE
2016-08-15 11:02:35 +08:00
e5775ef5b2
MDL-55520 assign: Behat test for rescaling max grades bug
...
Verify the max grade is not silently changed back to 100 when you visit
and save the assignment settings form.
2016-08-11 15:14:38 +08:00
77d2baacb1
Merge branch 'MDL-55225-31' of git://github.com/dpalou/moodle into MOODLE_31_STABLE
2016-08-09 09:21:23 +01:00
8ac6adeaf8
Merge branch 'MDL-55322-31' of https://github.com/snake/moodle into MOODLE_31_STABLE
2016-08-03 00:14:41 +02:00
3b753dc7ca
MDL-55376 assign: trailing whitespace
2016-08-01 16:07:58 +01:00
79315c0306
Merge branch 'MDL-55376-31' of git://github.com/cameron1729/moodle into MOODLE_31_STABLE
2016-08-01 16:06:58 +01:00
32bc32736b
Merge branch 'MDL-55374-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE
2016-08-01 13:50:40 +01:00
9e6ed38418
MDL-55322 assignfeedback_editpdf: Prevent scroll when moving comments
...
Prevent the default scroll behaviour when using gestures to move
comments on the mobile site.
2016-08-01 09:48:20 +08:00
04ad26aa2a
MDL-55376 mod_assign: Fix bug stopping admin from editing submissions
2016-07-29 19:08:58 +08:00
David Monllao