18857 Commits

Author SHA1 Message Date
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
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
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
Amy Groshek
c178ba7275 MDL-57785 scorm: Prevents SCORM nav refresh when nav not shown.
This improvement prevents refresh of SCORM 1.2 navigation menu
when the navigation menu is not displayed.
2017-01-27 09:11:16 -06:00
Jun Pataleta
1da58a1a75 MDL-57660 mod_forum: Preserve forum ID selection after form submission 2017-01-27 10:09:37 +08:00
Dan Marsden
e62e8545dc MDL-56808 scorm: remove some eval function that aren't needed. 2017-01-26 09:56:29 +13:00
Andrew Nicols
e0e5407e77 MDL-57550 mod_forum: Set dates to initial checkbox state 2017-01-25 14:04:47 +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
9f43d5052a Merge branch 'MDL-57639-master' of git://github.com/andrewnicols/moodle 2017-01-24 10:11:30 +00:00
Dan Poltawski
8120cbd939 Merge branch 'MDL-50539-master' of git://github.com/jleyva/moodle 2017-01-24 09:15:59 +00:00
Dan Poltawski
48034807ee Merge branch 'MDL-50545-master' of git://github.com/jleyva/moodle 2017-01-24 09:15:50 +00:00
Dan Poltawski
79b717ec04 Merge branch 'MDL-56449_assign_groups' of git://github.com/davosmith/moodle 2017-01-24 09:01:59 +00:00
Andrew Nicols
34dc92849f Merge branch 'MDL-57550-master' of git://github.com/danpoltawski/moodle 2017-01-24 14:57:53 +08:00
Andrew Nicols
d68d5ce337 Merge branch 'MDL-50547-master' of git://github.com/jleyva/moodle 2017-01-24 13:26:47 +08:00
Andrew Nicols
214eef2e1a Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle 2017-01-24 08:47:54 +08:00
Dan Marsden
225965bd4f MDL-46782 mod_scorm: fix completion test, remove redundant test. 2017-01-24 13:05:50 +13:00
Dan Poltawski
4bd0a8a64a Merge branch 'wip-MDL-57511-master' of git://github.com/Beedell/moodle 2017-01-23 15:39:55 +00:00
Dan Poltawski
d602810fd5 Merge branch 'mdl57668-master' of https://github.com/tlock/moodle 2017-01-23 12:05:32 +00:00
Dan Poltawski
ee2af37e84 Merge branch 'MDL-57677-master-usermodified' of git://github.com/mudrd8mz/moodle 2017-01-23 09:48:11 +00:00
Dan Poltawski
1847d4c5ea MDL-57550 forum: fix template validation issues
* Add some missing example contexts
* Stop using obsolete cell attributes
2017-01-23 09:45:11 +00:00
Dan Poltawski
56882be67e MDL-57550 forum: remove legacy js file 2017-01-23 09:42:58 +00:00
Dan Poltawski
22526ad9ed MDL-57550 forum: remove legacy forum.js uses
The search form options can be achieved in jquery rather than using
global js function/vars.

forum_get_subscribe_link legacylink had not been useful for some time
2017-01-23 09:42:29 +00:00
Dan Poltawski
c7f9bbf6c1 Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle 2017-01-23 09:28:32 +00:00
Pau Ferrer Ocaña
ef75a648c9 MDL-57737 glossary: Add entry description accepts HTML 2017-01-20 12:57:36 +01:00