Commit graph

2552 commits

Author SHA1 Message Date
David Monllao
2af5c8e7ef Merge branch 'MDL-60014-master-catcherror-nopermission-annotatepdfcron' of https://github.com/Eva-Dv/moodle 2018-07-03 23:33:01 +02:00
David Monllao
772ae9d4fd Merge branch 'MDL-62691-master' of git://github.com/bmbrands/moodle 2018-07-03 23:33:00 +02:00
Jake Dallimore
25a592ff5f Merge branch 'MDL-62715-master' of git://github.com/andrewnicols/moodle 2018-07-03 08:49:35 +08:00
Helen Foster
9722f6a25e MDL-62763 lang: Merge English strings from the en_fix language pack
Significant string changes:

* various strings in tool_dataprivacy and tool_policy - 'Data Protection
  Officer' changed to 'privacy officer'
* idnumbermod_help,core - mentioning resource and custom reporting
2018-07-02 11:15:26 +02:00
Zig Tan
a8f7818beb MDL-62533 assign: Show assign hidden status on grading summary page 2018-06-29 09:37:57 +08:00
Zig Tan
bc87f6a2e3 MDL-44081 assign: Fix Grader annotation button accessibility ordering 2018-06-29 09:26:58 +08:00
Eva Davitasvili
88c77c8ea3 MDL-60014 assign: Annotate PDF - catch no permission error 2018-06-25 14:11:24 -04:00
Adrian Greeve
11d828ef6f MDL-62755 mod_assign: Update to unit tests.
Overrides are now checked to be exported properly.
2018-06-25 09:49:13 +08:00
Adrian Greeve
ea24047619 MDL-62755 mod_assign: Fix override export problem.
The cutoffdate and allowsubmissionsfromdate were not
being exported.
2018-06-25 09:49:13 +08:00
Andrew Nicols
de06b63344 MDL-62715 mod_assign: Bump submissions back when grading in tests 2018-06-21 08:40:39 +08:00
David Monllao
62dc3fde0a Merge branch 'MDL-61482-master' of git://github.com/zig-moodle/moodle 2018-06-20 13:29:17 +02:00
Zig Tan
8be71d396b MDL-61482 mod_assign: Clean html in offline grading CSV 2018-06-19 23:19:13 +08:00
Bas Brands
c8c595e6d0 MDL-62691 Theme boost: editpdf hide dropdown close btn 2018-06-19 16:57:10 +02:00
Zig Tan
fcb7d2a976 MDL-42818 assign: Add grading UI indicator about followup submission 2018-06-19 14:06:17 +08:00
Damyon Wiese
994d0da35e MDL-60950 assign: Update incompatible unit test
Maintain compatibility with unit test changes after MDL-55609.
2018-06-19 10:56:53 +08:00
Damyon Wiese
c957707106 MDL-60950 assign: Rename class
testable_assign was renamed to mod_assign_testable_assign
2018-06-19 10:53:51 +08:00
Damyon Wiese
07d237840e MDL-60950 assign: Robust filtering of grading table
For assignments with gradetype set to none, we need special handling when generating the query to filter submissions that need grading.
2018-06-19 10:09:42 +08:00
Damyon Wiese
a5ff898f90 MDL-60950 assign: Test for the requires grading filter
This test covers when the requires grading filter is applied, but the
assignment has no grade and the feedbackcomments plugin is disabled.
2018-06-19 10:09:42 +08:00
Damyon Wiese
43c8e1f596 MDL-62643 assign: Skip empty online text files
Online text assignment submissions with no text entered into the editor should not
create a blank html document for providing feedback.
2018-06-15 14:07:08 +08:00
David Monllao
bcb4a27dd6 Merge branch 'MDL-55609-master' of git://github.com/andrewnicols/moodle 2018-06-12 10:07:35 +02:00
Jun Pataleta
43cc39bbc2 Merge branch 'MDL-62225-master' of https://github.com/lucisgit/moodle 2018-06-06 11:16:31 +02:00
Orzu Ionut
403f553623 MDL-61670 assign: show uploaded files timestamp
Amended to fix commit message. Rename variable to lower.
2018-06-06 11:16:22 +02:00
David Monllao
b321d231ff Merge branch 'MDL-42366-master' of https://github.com/lucisgit/moodle 2018-06-04 13:17:07 +02:00
Andrew Nicols
b762445485 MDL-55609 mod_assign: Deprecate base_test 2018-06-01 07:31:50 +08:00
Andrew Nicols
a6b8fc7830 MDL-55609 assignfeedback_comments: Remove shared setUp 2018-06-01 07:30:32 +08:00
Andrew Nicols
a41bf00517 MDL-55609 mod_assign: Move fixture to folder 2018-06-01 07:30:32 +08:00
Andrew Nicols
757d5b7cdc MDL-55609 mod_assign: Remove shared setUp for all tests 2018-06-01 07:30:32 +08:00
Tony Butler
8e64242131 MDL-62225 assignfeedback_editpdf: Add alt text for nav button shortcuts 2018-05-30 15:58:18 +01:00
Tony Butler
166ac972c3 MDL-42366 assignfeedback_editpdf: Improve meaningfulness of cursor image
Various improvements to make the cursor image more accurately reflect
the currently selected editing tool or action:
 * Replace crosshair with default cursor for read-only student view
 * Use currently selected stamp image as cursor when using stamp tool
 * Use text cursor for text higlighter tool and improve its accuracy
 * Use default cursor for select tool (as indicated by its button icon)
2018-05-30 14:50:34 +01:00
Eloy Lafuente (stronk7)
00977e984e MDL-62478 upgrade: add 3.5.0 separation line to all upgrade scripts 2018-05-28 13:15:48 +02:00
Marina Glancy
3960ad53a7 MDL-62430 privacy: validate context when deleting all user data 2018-05-14 18:13:27 +08:00
Eloy Lafuente (stronk7)
4f510bea17 Merge branch 'MDL-62384-master' of git://github.com/andrewnicols/moodle 2018-05-11 18:12:45 +02:00
Adrian Greeve
8a5b84cf8b MDL-62384 mod_assign: Update to sql query for performance. 2018-05-11 09:15:27 +08:00
David Monllao
1f000f071e Merge branch 'MDL-62366-master' of git://github.com/zig-moodle/moodle 2018-05-10 18:13:44 +02:00
Adam Olley
efc508c39c MDL-62210 mod_assign: limit file lookup to the target assign 2018-05-10 11:21:44 +08:00
Brendan Cox
1be5d6f4fe MDL-62210 mod_assign: improved validation in portfolio caller class 2018-05-10 11:21:44 +08:00
Andrew Nicols
06ede94f07 Merge branch 'wip-MDL-62351-master' of git://github.com/marinaglancy/moodle 2018-05-10 09:17:28 +08:00
Zig Tan
0139b8828f MDL-62366 mod_assign: Followup fix for attemptnumber in exported JSON 2018-05-10 09:16:41 +08:00
Marina Glancy
468c8d39c3 MDL-62351 privacy: check that subsystem/plugintype exist 2018-05-09 17:37:31 +08:00
Eloy Lafuente (stronk7)
57ea6753d3 MDL-62361 versions: bump all versions and requires near release
version = 2018051400 release version
requires= 2018050800 current beta+ (week4roll1) version
2018-05-09 02:46:30 +02:00
Jun Pataleta
c166b700d8 Merge branch 'MDL-61194-master' of git://git.cameron1729.xyz/moodle 2018-05-03 17:07:57 +08:00
Cameron Ball
23fe1e2bed
MDL-61194 assignfeedback_editpdf: Check if we can convert online text
This patch adds a check to make sure there is a converter available that
will be able to handle html->pdf conversion before adding onlinetext
submissions to the list of files to combine.
2018-05-03 16:44:27 +08:00
Adrian Greeve
bfb57d2c16 MDL-61308 assignsubmission_comments: Unit test ordering fix. 2018-05-01 12:21:47 +02:00
Andrew Nicols
3d110a5f6f MDL-61308 mod_assign: Whitespace fix 2018-04-30 09:27:12 +08:00
Adrian Greeve
f8650bb7a3 MDL-61308 assign_feedback: Privacy code for user rights. 2018-04-26 14:17:55 +08:00
Adrian Greeve
5843543338 MDL-61308 assign_submission: Privacy code for user rights. 2018-04-26 14:17:55 +08:00
Adrian Greeve
5c41cd77f8 MDL-61308 mod_assign: Adding privacy classes. 2018-04-26 14:17:55 +08:00
Jake Dallimore
4af7042e6e Merge branch 'MDL-59691-master' of https://github.com/lucisgit/moodle 2018-04-11 16:01:03 +08:00
Eloy Lafuente (stronk7)
bd0391d284 Merge branch 'wip-MDL-58697-master-assigngrading' of git://github.com/adamann2/moodle 2018-04-10 15:53:37 +02:00
Tony Butler
60e9f9083e MDL-59691 assignfeedback_editpdf: Allow comment placement to all edges
Plus a couple of extra usability improvements:
- Collapse comment during move to allow precise placement
- Change cursor style to indicate that dragging is possible
2018-04-09 16:55:36 +01:00