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
David Monllao
ab1058247c
MDL-56122 editpdf: Fix ghostscript checking
2017-02-14 13:45:21 +01:00
Dani Palou
aa9059b965
MDL-57962 forum: Allow creating new discussions with groupid -1
2017-02-14 10:28:33 +01:00
David Monllao
2fe4261efd
Merge branch 'wip-MDL-4782-master-3' of https://github.com/marinaglancy/moodle
2017-02-14 10:00:32 +01:00
David Monllao
ccaf17855e
Merge branch 'MDL-56122-master' of https://github.com/lucisgit/moodle
2017-02-14 09:53:22 +01:00
Marina Glancy
3f9503468f
MDL-4782 course: Behat tests for stealth mode support
2017-02-14 16:38:08 +08:00
Marina Glancy
8341055eb4
MDL-4782 course: Allow activities in the "stealth" mode
...
Add field 'visibleoncoursepage' to the course_modules table
Add site-wide setting for turning on stealth mode availability
Add callback for "stealth" mode support in the course formats
Change display of modules/sections availability on the course page
2017-02-14 16:38:05 +08: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)
846d899329
Merge branch 'MDL-57868-master' of git://github.com/jleyva/moodle
2017-02-13 23:37:39 +01: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
Eloy Lafuente (stronk7)
8b1af72760
Merge branch 'MDL-57890-master' of git://github.com/dpalou/moodle
2017-02-13 17:53:37 +01:00
Dan Poltawski
cb00816610
Merge branch 'MDL-56841' of https://github.com/andrewhancox/moodle
2017-02-13 16:22:34 +00:00
David Monllao
43e890aabe
Merge branch 'MDL-57697-master' of git://github.com/danpoltawski/moodle
2017-02-13 13:19:39 +01: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
David Monllao
375b9ce0e7
Merge branch 'wip-MDL-57316-master' of git://github.com/marinaglancy/moodle
2017-02-08 13:11:28 +01:00
Dan Poltawski
3f037586ae
MDL-57697 survery: migrate validation script from yui2
...
Just a modernisation of the existing yui2 code to AMD/jQuery and away from alert();
2017-02-08 11:22:11 +00:00
Dani Palou
16840c7126
MDL-57890 ws: Return cmid in all get_by_courses WebServices
2017-02-07 14:07:51 +01:00
John Okely
1abd43763c
MDL-57316 media: Setup media plugins in media_manager::instance()
2017-02-07 09:16:01 +08:00
Eloy Lafuente (stronk7)
470ae44956
Merge branch 'wip-mdl-57851' of https://github.com/rajeshtaneja/moodle
2017-02-07 01:26:03 +01:00
Dan Poltawski
808d652e81
Merge branch 'MDL-57660-master' of git://github.com/junpataleta/moodle
2017-02-06 13:46:50 +00:00
Juan Leyva
79cc1c4ff6
MDL-57868 mod_feedback: Fix incorrect query parameters order
...
get_records_menu call get_records using the same params ordering, it is
causing a duplicated value error for the first column
2017-02-06 11:31:56 +01:00
Rajesh Taneja
a30e1c3192
MDL-57851 behat: Add some more wait for scenario to pass
...
On slow machine with phnatomjs profile
this scenario keeps failing. Add some more
wait to ensure the page is stable and next
step can be executed
2017-02-03 12:53:24 +08:00
Andrew Hancox
26ca6df76a
MDL-56841 mod_folder: Display edit and download buttons inline
2017-02-02 15:15:30 +00:00
Eloy Lafuente (stronk7)
326cd6f661
Merge branch 'MDL-57592-master' of https://github.com/mwehr/moodle
2017-02-01 13:01:27 +08:00
Dan Poltawski
7a6b7f0b75
Merge branch 'MDL-57586-master' of https://github.com/nashtechdev01/moodle
2017-02-01 13:01:25 +08:00
Juan Leyva
af0e70b60a
MDL-57633 mod_lesson: New WS mod_lesson_get_lessons_by_courses
2017-01-31 17:01:49 +01:00
Juan Leyva
4a3391b694
MDL-57633 mod_lesson: Move to function the lesson availability checks
...
This commit is just about moving code and updating the lesson class to
manage the context and cm.
2017-01-31 17:01:48 +01:00
Andrew Nicols
7a2121d7f2
Merge branch 'wip-MDL-57785-master' of git://github.com/amygroshek/moodle
2017-01-31 12:19:13 +08:00
Andrew Nicols
ca12fb5458
Merge branch 'master_MDL-56808' of git://github.com/danmarsden/moodle
2017-01-31 12:10:48 +08:00