82903 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
Dan Poltawski
518f42f5f9 Merge branch 'wip-mdl-55476' of https://github.com/rajeshtaneja/moodle 2017-02-14 08:40:07 +00: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
Rajesh Taneja
30536aaadb
MDL-55476 auth: Fixed missing double quote in template 2017-02-14 16:19:20 +08:00
Marina Glancy
4b6728e431 MDL-4782 course: substitute YUI with AMD and rest.php with calling WS 2017-02-14 15:57:33 +08:00
Marina Glancy
4529327a22 MDL-4782 course: new WS for section and module editing 2017-02-14 15:57:33 +08:00
Marina Glancy
28ac3a54b9 MDL-4782 availability: new template for course display 2017-02-14 15:57:33 +08:00
Marina Glancy
084c2ef1ef MDL-4782 course: swap availability info and description 2017-02-14 15:57:32 +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
Eloy Lafuente (stronk7)
a2c0fff9d1 Merge branch 'MDL-57687-master' of git://github.com/danpoltawski/moodle 2017-02-13 19:14:22 +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
Eloy Lafuente (stronk7)
11db8fe2b9 Merge branch 'MDL-57896-master-clicfg' of git://github.com/mudrd8mz/moodle 2017-02-13 17:41:02 +01:00
Dan Poltawski
cb00816610 Merge branch 'MDL-56841' of https://github.com/andrewhancox/moodle 2017-02-13 16:22:34 +00:00
B Krishnan Iyer
5c3e1eedb7 MDL-57354 output: Render continue button as a primary button. 2017-02-13 15:50:52 +00:00
Dan Poltawski
7322592606 MDL-55476 block_login: fix whitespace 2017-02-13 15:32:36 +00:00
Dan Poltawski
69723d002b Merge branch 'MDL-57752_tracksessionip' of git://github.com/davosmith/moodle 2017-02-13 13:53:10 +00:00
Dan Poltawski
f5af2e6866 Merge branch 'MDL-55476-master' of git://github.com/jadet23/moodle 2017-02-13 13:41:13 +00:00
Dan Poltawski
b747a90082 Merge branch 'MDL-57768-webservice-config-error' of https://github.com/ilya-catalyst/moodle 2017-02-13 13:28:37 +00:00
David Monllao
43e890aabe Merge branch 'MDL-57697-master' of git://github.com/danpoltawski/moodle 2017-02-13 13:19:39 +01:00
David Monllao
815ce88f44 Merge branch 'MDL-57766-master' of git://github.com/damyon/moodle 2017-02-13 10:12:14 +01:00
Davo Smith
a2f1c5c39a MDL-57752 session: fix check_security() session termination 2017-02-13 07:54:02 +00:00
Marina Glancy
a572272768 MDL-50770 blocks: remove orphaned block positions 2017-02-13 15:18:51 +08:00
Marina Glancy
34c9d28e62 MDL-50770 blocks: copy sitewide blocks positions when cloning dashboards 2017-02-13 15:17:09 +08:00
Ilya Tregubov
1138af352a MDL-57768 webservice: Delete manual setting of config in test 2017-02-10 11:49:09 +11:00
David Mudrák
dfefcef2f1 MDL-57896 admin: Introduce the new admin/cli/cfg.php utility 2017-02-09 12:51:19 +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
David Monllao
7a3b115d37 weekly release 3.3dev 2017-02-09 08:00:01 +01:00
David Monllao
0c991a2e06 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-02-09 08:00:00 +01:00
Ryan Wyllie
e12d9f494c MDL-57370 message: add unread count to conversation tests 2017-02-09 03:39:14 +00:00
Ryan Wyllie
c9b82e402e MDL-57370 message: improve message union sql 2017-02-09 03:39:09 +00: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
Dan Poltawski
e1a38878c1 MDL-57687 js: Remove M.util.init_toggle_class_on_click 2017-02-08 11:09:54 +00:00
Dan Poltawski
a06677a3b5 Merge branch 'MDL-57370-master-int-fix-1' of git://github.com/ryanwyllie/moodle 2017-02-08 09:14:07 +00:00
Ryan Wyllie
42e2f6c0e9 MDL-57370 message: fix duplicate ids 2017-02-08 07:40:07 +00:00
Marina Glancy
63c102e095 MDL-57316 media: create different instances for different pages 2017-02-08 10:17:43 +08:00
Rajesh Taneja
808cfcc372
MDL-56954 behat: Fixed string to pass behat
colon is not concatenated to Search courses string
2017-02-08 09:50:02 +08:00
AMOS bot
0c66451c51 Automatically generated installer lang files 2017-02-08 00:08:49 +08:00
Dani Palou
16840c7126 MDL-57890 ws: Return cmid in all get_by_courses WebServices 2017-02-07 14:07:51 +01:00
Dan Poltawski
cf8c463de6 Merge branch 'MDL-57009-master' of git://github.com/damyon/moodle 2017-02-07 12:32:34 +00:00
Dan Poltawski
125fa38af3 Merge branch 'MDL-57370-master' of git://github.com/ryanwyllie/moodle 2017-02-07 10:35:13 +00:00
Damyon Wiese
3d6ae65b61 MDL-57009 javascript: Reject on all errors
Not all error paths were resulting in a reject() call to fail a promise.
2017-02-07 15:36:48 +08:00
Damyon Wiese
f3cd5c5b7b MDL-57009 javascript: Always use when.apply
Or it does not really wait for the promises.
2017-02-07 15:03:43 +08:00