David Monllao
74d2cce2fa
Merge branch 'MDL-57576-33-updatefeedbackfile' of git://github.com/roperto/moodle
2017-02-20 12:27:26 +01:00
Jake Dallimore
5cb060b878
MDL-57795 mod_assign: fix for filters killing review pane when grading
...
Fixes a bug in which the review pane was destroyed if the user selected
a combination of filters resulting in no matched users. Now, the pane
is just hidden in such cases, and displayed again if subsequent filter
changes return one or more users.
2017-02-20 08:51:35 +08:00
Tony Butler
eb43ef6c97
MDL-57602 mod_assign: Add 'Granted extension' filter for grading UI
2017-02-16 11:23:41 +00:00
Tony Butler
696bd4d68b
MDL-57602 mod_assign: Add 'Granted extension' filter for grading table
2017-02-16 11:23:41 +00:00
David Monllao
ab1058247c
MDL-56122 editpdf: Fix ghostscript checking
2017-02-14 13:45:21 +01:00
David Monllao
ccaf17855e
Merge branch 'MDL-56122-master' of https://github.com/lucisgit/moodle
2017-02-14 09:53:22 +01:00
Damyon Wiese
dd7de4ea82
MDL-57766 assign: Put back the manual marker filter
...
I removed too much from gradingtable.php in the last patch.
2017-02-14 10:16:56 +08:00
Eloy Lafuente (stronk7)
369df31150
Merge branch 'MDL-57708-master' of git://github.com/merrill-oakland/moodle
2017-02-13 23:32:35 +01:00
Tony Butler
63a117dcb2
MDL-56122 assignfeedback_editpdf: Add test assertions for pdf generation
2017-02-13 17:27:24 +00:00
Tony Butler
fecfb4c6fb
MDL-56122 assignfeedback_editpdf: Regenerate PDF & page images if blank
2017-02-13 17:23:42 +00:00
Damyon Wiese
230ae095b4
MDL-57766 mod_assign: Marker allocation fixes
...
Marking allocation was only ever applied in the view for the grading table. It should
have been added to the list_participants function because that is used by webservices and
the new grading UI.
2017-02-09 17:06:21 +08:00
Eric Merrill
7dfc65dbf9
MDL-57708 assign: Fix display of overridden submissions
2017-02-08 14:30:56 -05:00
Eloy Lafuente (stronk7)
326cd6f661
Merge branch 'MDL-57592-master' of https://github.com/mwehr/moodle
2017-02-01 13:01:27 +08:00
wehr
f58861051f
MDL-57592 assignment: Adds filtering of assignment name in grader view
2017-01-30 18:27:22 +01:00
Mike Churchward
559cfa03f4
MDL-36233 mod_assign: fixed submission time comparison sql and test.
2017-01-30 09:06:55 +08:00
Eloy Lafuente (stronk7)
ae8e8e6aa1
Merge branch 'MDL-55915_master' of https://github.com/rezaies/moodle
2017-01-24 22:03:48 +01:00
Dan Poltawski
79b717ec04
Merge branch 'MDL-56449_assign_groups' of git://github.com/davosmith/moodle
2017-01-24 09:01:59 +00:00
Dan Poltawski
d602810fd5
Merge branch 'mdl57668-master' of https://github.com/tlock/moodle
2017-01-23 12:05:32 +00:00
Shamim Rezaie
05fdbe378a
MDL-55915 mod_assign: let fullname() know if user has viewfullnames cap
...
Instruct fullname() to format names on the assignment grading page with alternativefullnameformat when user
has moodle/site:viewfullnames capability.
2017-01-20 20:28:57 +11:00
Tim Lock
32a7986422
MDL-57668 mod_assign: Fix optional_param() form processing
2017-01-19 08:41:12 +10:30
Andrew Nicols
22f1426b44
Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle
2017-01-18 16:00:06 +08:00
Dan Poltawski
fef5718182
MDL-57604 mod_assign: fix empty case in user selector
...
Sadly the js arguments object gives an arguments.length of 1 when
no arguments are passed, so we have to explicitly check for it.
2017-01-18 07:47:00 +00:00
Eloy Lafuente (stronk7)
36102596d7
Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle
2017-01-18 01:10:45 +01:00
Eloy Lafuente (stronk7)
6214e08f6a
Merge branch 'MDL-57629-master' of git://github.com/jleyva/moodle
2017-01-17 20:55:05 +01:00
Juan Leyva
9db43c7341
MDL-57629 webservice: Fix external functions phpdoc
...
Replace external_external_function_parameters with
external_function_parameters
2017-01-11 16:56:25 +01:00
Eloy Lafuente (stronk7)
777361983c
Merge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle
2017-01-11 02:42:29 +01:00
Dan Poltawski
76bab36896
MDL-57604 mod_assign: fix incorrect user being selector from chooser
...
Previously there was a logic bug where by if some students were filtered
from the list, the label for another student could be attached to the
'filered' student.
This fix reworks the promises a bit so we render the student summary and
then build an row with the explict user id, rather than itterating through
the array later.
I also remove the storing of the initial promise in a varible because
this is an easy way to introduce a bug (not waiting for the .then()
chained promise)
2017-01-09 20:36:30 +00:00
David Mudrák
82a8d0d21d
MDL-57580 mod_assign: Fix the incorrect type of some input parameters
...
The PARAM_TEXT has been misused in certain cases here. The 'action'
parameter seems to always be alphabetic, with values like
savesubmission, editsubmission and others as handled in assign::view().
Fixing the action handling fixes the reported XSS issue. While working
on it, I spotted two more places where PARAM_TEXT does not seem
appropriate. I include changes for them too, even if they are no
strictly related to the reported bug and there are no known ways to
abuse it.
* The 'plugin' looks like PARAM_PLUGIN and is even declared as such in
some other parts of the assignment code (such as feedback forms).
* The 'workflowstate' is one of the ASSIGN_MARKING_WORKFLOW_STATE
constants and is supposed to be alpha in external function input
parameters handling, too.
2017-01-05 17:39:36 +01:00
Davo Smith
255d3aaaed
MDL-56449 mod_assign: fix formatting of group warnings
2017-01-05 15:30:09 +00:00
Daniel Thee Roperto
b51f6864c1
MDL-57576 assignment: Overwrite feedback file if it has the same name.
2017-01-05 15:33:28 +11:00
Davo Smith
e7f3fd59d4
MDL-56449 mod_assign: fuller description of group submission problems
2017-01-04 10:35:41 +00:00
Rajesh Taneja
57bee542ab
MDL-56519 behat: Fixed lint errors
2017-01-03 09:12:54 +08:00
Dan Poltawski
ae2bf1626c
Merge branch 'MDL-56810_master' of https://github.com/Syxton/moodle
2016-12-13 14:55:50 +00:00
Andrew Nicols
106c8026d1
Merge branch 'MDL-57222_master' of git://github.com/markn86/moodle
2016-12-13 10:25:30 +08:00
Matt Davidson
6be2b79b9c
MDL-56810 unoconv: task fails if user removed
...
If the user is removed from a course after a submission has been made,
the task will crash and never continue. This removes submissions from
the cron task if the user isn't enrolled in the course.
2016-12-12 08:22:51 -05:00
Mark Nelson
3b5b35a326
MDL-57222 mod_assign: show validation message on visible element
2016-12-12 11:55:18 +08:00
Henning Bostelmann
5c4bd8f4e8
MDL-56566 mod_assign: ignore "doanything" in course overview
...
Do not count site admin "doanything" capability for determining
what should be shown in the course overview for assignments.
2016-12-08 19:53:37 +00:00
Andrew Nicols
75af0aa680
Merge branch 'MDL-57266' of git://github.com/stronk7/moodle
2016-12-07 09:53:16 +08:00
Rajesh Taneja
9bad658aaf
MDL-56614 behat: Fixed steps to use new definition
2016-12-07 07:10:35 +08:00
Andrew Nicols
afecb4dfd5
Merge branch 'MDL-56346-master' of https://github.com/lucisgit/moodle
2016-12-06 14:34:06 +08:00
Andrew Nicols
5b67c9ecd1
Merge branch 'wip-MDL-56614-master-2' of https://github.com/marinaglancy/moodle
2016-12-06 13:37:33 +08:00
Marina Glancy
44f460c32a
MDL-56614 behat: rename step for navigating in the gradebook
2016-12-06 11:49:14 +08:00
Marina Glancy
e5287f9b3b
MDL-56614 behat: navigate without navigation and admin blocks
2016-12-06 11:49:14 +08:00
Eloy Lafuente (stronk7)
75c57a08fb
MDL-57266 upgrade: add 3.2.0 separation line to all upgrade scripts
2016-12-05 17:10:20 +01:00
Andrew Nicols
405666d371
Merge branch 'MDL-52840_master' of https://github.com/rezaies/moodle
2016-12-05 13:01:31 +08:00
David Monllao
f4aec377fc
Merge branch 'MDL-56682_master' of git://github.com/markn86/moodle
2016-11-30 13:56:08 +08:00
Eloy Lafuente (stronk7)
04649747a4
MDL-57197 versions: bump all versions and requires near release
...
version = 2016120500 release version
requires= 2016112900 current rc4 version
2016-11-29 22:57:05 +01:00
David Monllao
1e102ca3ca
Merge branch 'wip-mdl-57168-m1' of git://github.com/rajeshtaneja/moodle
2016-11-29 13:41:55 +08:00
Rajesh Taneja
9eb8f6ec56
MDL-57168 behat: Don't press continue as it will go to Annotate PDF
...
This might cause random failures as the draft files are being accessed by other user
2016-11-29 10:53:02 +08:00
David Monllao
dc3e3c0831
Merge branch 'MDL-57097-master' of git://github.com/lameze/moodle
2016-11-29 10:51:10 +08:00
