mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-16 13:40:15 +01:00
Code Issues Projects Releases Wiki Activity
83,193 Commits 36 Branches 527 Tags
Commit Graph

18912 Commits

Author SHA1 Message Date
Andrew Nicols
9c2ca40041 Merge branch 'MDL-57643-master' of git://github.com/jleyva/moodle 2017-03-16 07:58:08 +08:00
Juan Leyva
630f0e3bce MDL-57643 mod_lesson: New WS mod_lesson_get_access_information 2017-03-15 11:35:27 +01:00
Juan Leyva
37029e468f MDL-57643 mod_lesson: Refactor, move php code to locallib 2017-03-15 11:35:25 +01:00
Juan Leyva
1f7734931f MDL-50538 mod_feedback: New WS mod_feedback_get_feedbacks_by_courses 2017-03-14 15:54:26 +01: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
224853595c Merge branch 'MDL-58217-master' of git://github.com/jleyva/moodle 2017-03-14 11:27:22 +01:00
Eloy Lafuente (stronk7)
501ed0c46d Merge branch 'MDL-57915-master' of git://github.com/jleyva/moodle 2017-03-14 11:26:55 +01:00
Juan Leyva
9fac7c8640 MDL-57915 mod_data: New Web Service mod_data_view_database 2017-03-13 19:21:08 +01:00
Juan Leyva
023ffa656d MDL-57915 mod_data: Move view completion and event code to function 2017-03-13 19:21:07 +01: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
ef607980cf Merge branch 'MDL-57914-master' of git://github.com/jleyva/moodle 2017-03-10 18:04:45 +00:00
Eloy Lafuente (stronk7)
4e0cad1cbd Merge branch 'MDL-58123-master' of git://github.com/junpataleta/moodle 2017-03-10 18:03:53 +00:00
Juan Leyva
1abfa3a95e MDL-58217 mod_feedback: Add data generators for items 2017-03-10 10:51:51 +01:00
Juan Leyva
5bbada53e3 MDL-58217 mod_feedback: API changes to allow generators 
We include a new function set_date at item level so we can add the data
instead using the forms.
 2017-03-10 10:51:32 +01: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
David Monllao
2aa1855205 Merge branch 'wip-mdl-58091' of https://github.com/rajeshtaneja/moodle 2017-03-07 13:15:55 +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
Jun Pataleta
efe2497623 MDL-55956 mod: New function *_get_group_override_priorities() 
New module functions quiz_get_group_override_priorities() and
lesson_get_group_override_priorities() to calculate the priorities
of group overrides for a quiz/lesson activity.
 2017-03-06 16:10:54 +08:00
Juan Leyva
f97305b025 MDL-57914 mod_data: Refactor get_databases_by_courses 
- Use a exporter
- Return more fields for users with the view entry capability enabled
 2017-03-02 22:57:05 +01:00
Ankit Agarwal
4d76de6fbf MDL-55859 assign_editpdf: cleanup htmlfile in case of errors 2017-03-02 21:23:02 +05:30
Jun Pataleta
2b9d97406f MDL-58123 mod_lesson: Fix lesson table name in refresh_events DB query 2017-03-02 10:54:49 +08:00
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
Rajesh Taneja
da52592a7b
MDL-58091 behat: Added missing @_file_upload tag 2017-02-28 11:21:13 +08:00
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
Eloy Lafuente (stronk7)
edc44ac356 Merge branch 'MDL-57633-master' of git://github.com/jleyva/moodle 2017-02-21 23:45:14 +01:00
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
Dan Poltawski
f1b1c85b63 Merge branch 'MDL-57962-master' of git://github.com/dpalou/moodle 2017-02-20 11:19:16 +00: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
c181f152d7 MDL-57697 survey: Remove unexisting param 2017-02-15 11:02:02 +01:00
David Monllao
759a70d32e Merge branch 'MDL-57697-master' of git://github.com/danpoltawski/moodle 2017-02-15 11:00:55 +01:00
Dan Poltawski
bdad6c4a99 MDL-57697 mod_survey: clean up data passing to js 
Get rid of the ugly huge array passed to JS as it went over our debug
limit.

(It's a cleaner solution and we get rid of one globals hack.. I just was
avoiding doing to many changes in the original patch, because this whole
interface is not very usable and needs rethinking)
 2017-02-15 09:51:16 +00:00