moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84030 commits 37 branches 540 tags 1.3 GiB
Commit graph

1758 commits

Author SHA1 Message Date
Dan Poltawski
5fd24a89a6 Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle 2017-03-21 11:28:13 +00:00
Dan Poltawski
7bb2eafe9c Merge branch 'MDL-58262-master' of git://github.com/merrill-oakland/moodle 2017-03-20 15:19:55 +00:00
Dan Poltawski
7d77fb1421 Merge branch 'MDL-58255-master' of git://github.com/junpataleta/moodle 2017-03-20 13:08:54 +00:00
Andrew Nicols
2154c9824d Merge branch 'MDL-40759-master' of git://github.com/damyon/moodle 2017-03-20 13:57:38 +08:00
Pavel Sokolov
32ad5c86ae MDL-57858 mod_assign: fix submissions count for assign with scales 2017-03-17 18:28:43 +03:00
Pavel Sokolov
bfca67f045 MDL-58166 mod_assign: markingworkflow breaks assign for non-graders 2017-03-17 17:46:09 +03:00
Tony Butler
05aa787bde MDL-56324 assignfeedback_editpdf: Revert erroneous commits 
This reverts commits 88d309d and 3cd718e.
 2017-03-17 11:01:41 +00:00
Damyon Wiese
b9b409cfc3 MDL-40759 icons: Peer review fixes (all minor) 2017-03-17 15:52:46 +08:00
Damyon Wiese
3e6adcd69c MDL-40759 icons: Rename activity_icon 
image_icon is a better name because there are some valid uses for these other than for activity icons.

E.g. Old JS code that is not worth re-writing.
 2017-03-17 15:52:18 +08:00
Damyon Wiese
8857c715d1 MDL-40759 icons: Behat fixes for font-awesome 2017-03-17 15:52:18 +08:00
Damyon Wiese
663640f5b3 MDL-40759 icons: convert uses of pix_url to pix_icon 
Also change filepicker to use scaled svgs instead of sets of custom pngs. The svgs are taken from font-awesome.
 2017-03-17 15:52:17 +08:00
Jun Pataleta
f3ec5411b0 MDL-58255 mod_assign: Fix usage of assign object for overrides 
* Fix the parameters being passed for the assign constructor.
* Use assign::get_instance() instead of assign::get_context() to fetch
the assignment instance's properties.
 2017-03-17 09:33:00 +08:00
Eric Merrill
28cdba9dcf MDL-58262 assign: Use unique sql parameter 2017-03-14 15:09:27 -04:00
Dan Poltawski
732bd13171 Merge branch 'MDL-55528-master' of git://github.com/andrewnicols/moodle 2017-03-14 12:07:33 +00:00
Andrew Nicols
34f5a23e6a MDL-55956 mod_assign: Do not use API constant in upgrade 2017-03-10 18:04:50 +00:00
Jun Pataleta
5f399bcf55 MDL-55956 mod_assign: Set priorities of old assign event overrides 2017-03-10 18:04:48 +00:00
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