2045 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
51181541ab Merge branch 'MDL-62279-master' of git://github.com/damyon/moodle 2018-09-25 23:25:10 +02:00
Eloy Lafuente (stronk7)
fc008d6769 MDL-57610 assignfeedback_editpdf: add missing UK to install.xml 2018-09-25 15:21:42 +02:00
Adam Olley
1afbb97b6b MDL-57610 assignfeedback_editpdf: integration cleanup
* Add a note to upgrade.php to notify devs/admins of the new setting.
* Replace update_record with set_field.
* Add missing phpdoc.
2018-09-25 09:54:39 +09:30
Adam Olley
bc32547da9 MDL-57610 assignfeedback_editpdf: Add test coverage for conversion task
Without this, we have no coverage of the convert_submissions task. This test
validates it both works normally, and that it also skips queued items that have
exceeded the conversion attempt limit introduced in this improvement.
2018-09-18 14:14:24 +09:30
Adam Olley
b722a457ad MDL-57610 assignfeedback_editpdf: remove queued jobs that keep failing
Without this, its possible to get a document in the editpdf conversion queue
that keeps failing - and in some cases completely crashing the PHP script
despite exception handling - which ends up blocking the processing of the queue
entirely.

This change allows for a configurable number of attempts the conversion
task will perform before removing the item from the queue.
2018-09-17 09:30:43 +09:30
David Monllao
ffc4cc9a25 Merge branch 'MDL-62944' of https://github.com/NeillM/moodle 2018-09-04 12:15:36 +02:00
David Monllao
adb8eb9c9c Merge branch 'MDL-55993-master' of https://github.com/albertolarah/moodle 2018-09-04 10:51:28 +02:00
David Monllao
dfc6f782e1 Merge branch 'MDL-38301-master' of git://github.com/junpataleta/moodle 2018-09-03 12:44:50 +02:00
Alberto Lara Hernández
96a037f755 MDL-55993 mod_assign: web services don´t set a URL. 2018-09-03 12:18:41 +02:00
Neill Magill
bbf1fde412 MDL-62944 activities: Activities should not require capability
Activities should not require the user manipulating them to have
calendar capabilities for their events to be added to the Moodle
calendar
2018-08-31 10:15:37 +01:00
Neill Magill
196aa50489 MDL-62944 activities: Test adding activities with no calendar capability 2018-08-31 10:15:36 +01:00
Eloy Lafuente (stronk7)
cf76059eda Merge branch 'MDL-62535-master' of git://github.com/abgreeve/moodle 2018-08-30 01:19:57 +02:00
Andrew Nicols
75ad50cba0 Merge branch 'MDL-62782-master' of git://github.com/damyon/moodle 2018-08-28 07:06:22 +08:00
Andrew Nicols
fdab90a7d4 Merge branch 'MDL-53024-master' of git://github.com/damyon/moodle 2018-08-27 15:45:57 +08:00
Zig Tan
8f7d07fa7d MDL-38301 mod_assign: Fix date validation logic & message consistency 2018-08-27 15:26:22 +08:00
Damyon Wiese
334db37769 MDL-53024 assign: Remove incorrect logic in query
We are simplifying this query so it will return grades if the attempt matches
the submission attempt, or there is no submission. The case where there is a grade
but no submission can happen only for group assignments.
2018-08-22 12:59:10 +08:00
Víctor Déniz Falcón
02fda279ed MDL-57281 behat: deprecated step definition I navigate to node in
Definition step deprecated and affected tests modified.
2018-08-20 12:53:26 +01:00
Adrian Greeve
620dbfbe89 MDL-62535 mod_assign: Update to providers to include adv grading. 2018-08-20 11:32:01 +08:00
Eloy Lafuente (stronk7)
9c1c0de78c Merge branch 'MDL-61650-master' of git://github.com/damyon/moodle 2018-08-14 16:49:44 +02:00
Andrew Nicols
bc51085174 Merge branch 'MDL-62643-master' of git://github.com/damyon/moodle 2018-08-14 09:04:17 +08:00
Eloy Lafuente (stronk7)
521ebb76b0 Merge branch 'MDL-61870-master' of git://github.com/damyon/moodle 2018-08-07 23:48:31 +02:00
Damyon Wiese
8cee90e3bf MDL-61650 assign: More consistent empty text
Consistently check for empty submissions with count_words(trim($text)).
2018-08-03 16:52:31 +08:00
Damyon Wiese
cc9384f121 MDL-62279 assign: Properly set the defaults
Before an assignment has been created, we need to use the site defaults,
not the per instance defaults for the settings.
2018-08-03 15:03:53 +08:00
Damyon Wiese
192e48bb90 MDL-61870 mod_assign: Conditionally backup groups
When group info is not backed up, do not backup assignment submissions or overrides that related to a specific group.
We are already correctly not restoring them, but it is more robust not to include them in the backup file at all.
2018-08-02 12:55:13 +08:00
Zig Tan
8ea4df50c9 MDL-61870 mod_assign: Fix/clean up imported group override duedates
Applying patch supplied from Damyon Wiese to address the root-cause
of this issue in the backup/restore logic.
2018-08-02 12:55:13 +08:00
Zig Tan
6bcc6f877a MDL-61870 mod_assign: Fix/clean up imported group override duedates
- Prevent group override duedate events from being imported when groups are excluded
- Clean up any existing group override duedate events when editing assignment in upgradelib.php
- Updated lib.php unit tests
2018-08-02 12:55:12 +08:00
David Monllao
f3e240e7e0 Merge branch 'MDL-59611-master' of git://github.com/damyon/moodle 2018-07-31 13:30:41 +02:00
Jun Pataleta
77b6d458e5 Merge branch 'MDL-58768-master-2' of git://github.com/rezaies/moodle 2018-07-31 16:18:44 +08:00
Adrian Greeve
5454e72c21 MDL-55188 events: First deprecation of eventslib.php 2018-07-30 09:23:54 +08:00
Shamim Rezaie
fda4374a67 MDL-58768 mod_assign: Added userid param to calendar callbacks
The mod_assign_core_calendar_is_event_visible and mod_assign_core_calendar_provide_event_action
functions now accept a new parameter ($userid) so they are not always dependet to the logged in user.
2018-07-28 07:51:33 +10:00
Shamim Rezaie
faa5d173cc MDL-58768 mod_assign: Add $user param to assign::can_grade 2018-07-28 07:51:32 +10:00
Tony Butler
9ed5b0c1f6 MDL-59611 mod_assign: Move help icons for subplugin types out of labels 2018-07-25 12:23:08 +08:00
Mihail Geshoski
10bd37fabd MDL-54742 general: Remove strings deprecated in 3.2 2018-07-23 14:25:14 +08:00
Neill Magill
650779d609 MDL-49025 assign: Submissions of an empty directory should not save
Before this change if only a folder was submitted the submission_is_empty
check would return true. This meant that the draft area would be saved.
The is_empty check would then be called which would return false. This
caused the submission form to indicate to the user that the submission
had failed.

Now is_empty and submission_is_empty should both return false if only
folders are submitted.
2018-07-13 14:03:42 +01:00
Neill Magill
3ebfab9810 MDL-49025 assign: Test than an empty directory will not submit 2018-07-13 14:03:41 +01:00
David Monllao
58b987282e Merge branch 'MDL-42818-master' of git://github.com/zig-moodle/moodle 2018-07-10 11:31:24 +02:00
David Monllao
cbc67cba73 Merge branch 'MDL-62533-master' of git://github.com/zig-moodle/moodle 2018-07-10 07:37:19 +02:00
Jake Dallimore
793fe5fc4c Merge branch 'MDL-62772-master_always_show_disclosure' of https://github.com/jmcgettrick/moodle 2018-07-10 08:59:34 +08:00
David Monllao
381bb72153 Merge branch 'MDL-62831-master' of git://github.com/damyon/moodle 2018-07-09 13:36:05 +02:00
John McGettrick
9481cc0e06 MDL-62772 mod_assign: Show disclosure for all submitters 2018-07-09 09:26:38 +01:00
Damyon Wiese
166fa40a98 MDL-62782 assign: viewgrades allows files
Grade viewer role should be able to see feedback files for an assignment submission.
2018-07-04 14:17:28 +08:00
Damyon Wiese
e655cbb857 MDL-62831 mod_assign: Download as folders help
The help string for the download as folders setting should not mention the number of files
submitted by the student. It is not related to that, it is only dependant on the value of this setting.
2018-07-04 12:20:24 +08:00
Jake Dallimore
bbaab1bae7 Merge branch 'MDL-44081-master' of git://github.com/zig-moodle/moodle 2018-07-04 10:50:25 +08:00
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