moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 11:26:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
100729 commits 37 branches 544 tags 1.3 GiB
Commit graph

2392 commits

Author SHA1 Message Date
Andrew Nicols
357712eabe MDL-55528 assignfeedback_editpdf: Remove unnecessary escapes 2017-03-10 10:45:47 +08:00
Andrew Nicols
3bd0d4397c MDL-55528 assignfeedback_editpdf: Add step to check all pages loaded 2017-03-10 10:45:46 +08:00
Andrew Nicols
f7a9f1dd0e MDL-55528 assignfeedback_editpdf: Update to use fileconverter_unoconv 2017-03-10 10:45:46 +08:00
Andrew Nicols
1568168717 MDL-55528 fileconverter_unoconv: Add new unoconv plugin 
AMOS BEGIN
 MOV [pathtounoconv,admin],[pathtounoconv,fileconverter_unoconv]
 MOV [pathtounoconv_help,admin],[pathtounoconv_help,fileconv_helperter_unoconv_help]
 MOV [unoconvwarning,admin],[unoconvwarning,fileconverter_unoconv]
 MOV [test_unoconv,assignfeedback_editpdf],[test_unoconv,fileconverter_unoconv]
 MOV [test_unoconvempty,assignfeedback_editpdf],[test_unoconvempty,fileconverter_unoconv]
 MOV [test_unoconvdoesnotexist,assignfeedback_editpdf],[test_unoconvdoesnotexist,fileconverter_unoconv]
 MOV [test_unoconvdownload,assignfeedback_editpdf],[test_unoconvdownload,fileconverter_unoconv]
 MOV [test_unoconvisdir,assignfeedback_editpdf],[test_unoconvisdir,fileconverter_unoconv]
 MOV [test_unoconvnotestfile,assignfeedback_editpdf],[test_unoconvnotestfile,fileconverter_unoconv]
 MOV [test_unoconvnotexecutable,assignfeedback_editpdf],[test_unoconvnotexecutable,fileconverter_unoconv]
 MOV [test_unoconvok,assignfeedback_editpdf],[test_unoconvok,fileconverter_unoconv]
 MOV [test_unoconvversionnotsupported,assignfeedback_editpdf],[test_unoconvversionnotsupported,fileconverter_unoconv]
AMOS END
 2017-03-10 10:45:46 +08:00
Eloy Lafuente (stronk7)
21521604af Merge branch 'MDL-58064-master-enfix' of git://github.com/mudrd8mz/moodle 2017-03-07 16:36:54 +01:00
Dan Poltawski
44c4f148da Merge branch 'MDL-55859-master' of git://github.com/ankitagarwal/moodle 2017-03-07 07:02:33 -03:00
Dan Poltawski
d04310cb21 Merge branch 'MDL-57362-master' of git://github.com/ankitagarwal/moodle 2017-03-07 06:47:38 -03:00
Ankit Agarwal
0884ddea86 MDL-57362 assign: Fix permission checks 2017-03-07 12:43:30 +05:30
Andrew Nicols
342af35ab8 Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle 2017-03-07 12:07:50 +08:00
Jun Pataleta
f7a9bca847 MDL-55956 mod_assign: Remove calendar events with 'open' eventtype 
Remove creation of calendar events for mod_assign with
eventtype = 'open'. Since mod_assign instance creation only creates a
calendar event for the due date, there's no point in creating an override
event for an event type that does not exist.
 2017-03-07 11:33:17 +08:00
Jun Pataleta
98239b2df8 MDL-55956 mod: Set event priority for activity overrides 
Set the event priority of the following activity overrides:
* mod_assign
* mod_lesson
* mod_quiz
Always create separate events for start and end dates of activities.
 2017-03-07 11:33:13 +08:00
Dan Poltawski
892ceeb74e Merge branch 'MDL-57362-master' of git://github.com/ankitagarwal/moodle 2017-03-06 10:27:10 -03:00
Ankit Agarwal
4d76de6fbf MDL-55859 assign_editpdf: cleanup htmlfile in case of errors 2017-03-02 21:23:02 +05:30
Eloy Lafuente (stronk7)
1e8af13516 Merge branch 'MDL-55762-master' of git://github.com/ankitagarwal/moodle 2017-02-28 20:38:56 +01:00
Ankit Agarwal
ca09e2157b MDL-57362 assignlib: Fix minor bug in phpdocs 2017-02-28 10:34:03 +05:30
Ankit Agarwal
f445fb8fa1 MDL-57362 assignlib: Check for sep groups edge case 2017-02-28 10:34:02 +05:30
Jake Dallimore
2671500dee MDL-35980 behat: fix link text in submission_comments feature 2017-02-28 10:23:21 +08:00
Helen Foster
ecfe6f58ce MDL-58064 lang: Merge English strings from the en_fix language pack 2017-02-27 10:14:34 +01:00
Ankit Agarwal
1f3556b010 MDL-55762 assignpdf: Handle errored pages better 2017-02-27 09:24:07 +05:30
Ankit Agarwal
b6d06a5f78 MDL-55762 assignpdf: Fix bug in phpdocs 2017-02-27 09:24:07 +05:30
David Monllao
b98b37c670 Merge branch 'MDL-57602-master' of https://github.com/lucisgit/moodle 2017-02-21 08:43:16 +01:00
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