Commit graph

84018 commits

Author SHA1 Message Date
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
David Monllao
4163871cea Merge branch 'MDL-57795-master' of https://github.com/snake/moodle 2017-02-20 10:28:16 +01:00
David Monllao
742043f3b7 Merge branch 'MDL-57801-master' of https://github.com/lucisgit/moodle 2017-02-20 10:10:01 +01:00
David Monllao
2e57a90e0e Merge branch 'MDL-57859-master' of git://github.com/merrill-oakland/moodle 2017-02-20 09:42:25 +01:00
David Monllao
cb0f30cf77 Merge branch 'MDL-58014_master' of git://github.com/markn86/moodle 2017-02-20 09:32:11 +01:00
David Monllao
6c6492a284 Merge branch 'MDL-56679-master' of git://github.com/junpataleta/moodle 2017-02-20 09:20:11 +01:00
David Monllao
49b8fa7fce Merge branch 'MDL-57274-master' of https://github.com/snake/moodle 2017-02-20 09:07:18 +01:00
David Monllao
6b9d6d2eab Merge branch 'MDL-50729-master' of git://github.com/ankitagarwal/moodle 2017-02-20 08:26:39 +01:00
Mark Nelson
29c3b0b4d2 MDL-58014 core_message: fixed unread message count 2017-02-20 13:29:13 +08:00
Marina Glancy
0c30e89f34 MDL-55547 tool_monitor: fix exceptions when course was deleted
Delete subscriptions when course is deleted
2017-02-20 12:11:29 +08:00
Marina Glancy
92253b15b7 MDL-40838 backup: restore enrolment methods without users 2017-02-20 12:08:35 +08:00
Jake Dallimore
a448a38b1d MDL-57274 upgrade: fix curl security notices during upgrade/install
Handles the case where $CFG->curlsecurityxxx vars don't yet exist
during install or upgrade by treating not set the same as empty.
2017-02-20 08:55:57 +08: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
Dan Poltawski
c7abec68a6 Merge branch 'MDL-57967_master' of git://github.com/markn86/moodle 2017-02-19 19:44:51 +00:00
Matteo Scaramuccia
cdf8238b14 MDL-57379 Files: Improved file argument evaluation.
get_file_argument() is responsible to extract the relative path
of the file to be served by a specific Moodle component
like a theme or a module.
Some modules like scorm and imscp require slasharguments support
and they force it when creating the URLs to serve their files.
It should honor the slasharguments setting but this could break
those instances where existing hard-coded links still make usage of
the "old" format, the one when slasharguments is set to No i.e. '?file='.

Its logic has been improved by looking at when the URL is related to
serving a plug-in file in a "forced" slasharguments way of serving it
i.e. using '/pluginfile.php/' and not '/pluginfile.php?'.
2017-02-19 16:39:04 +01:00
Dan Poltawski
ddc1306c97 MDL-57557 calendar: remove YUI module 2017-02-17 14:05:30 +00:00
Dan Poltawski
6e24853aa1 MDL-57557 calendar: convert from yui module to bootstrap popovers 2017-02-17 14:05:29 +00:00
Dan Poltawski
facf039a00 MDL-57557 boost: allow any type of popover 2017-02-17 14:05:29 +00:00
Tony Butler
efa7d24168 MDL-57801 core_filestorage: Delete temp file if disk space runs out 2017-02-16 12:41:06 +00:00
Tony Butler
961323a05f MDL-57801 core_filestorage: Verify hash of temp file before committing
This addresses an edge scenario on NFS filesystems with no space
remaining, where subsequent uploads fail silently while zero byte files
are saved to the pool (and for some reason the filesize check passes).
2017-02-16 12:38:58 +00: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
Gergely Kún
2a00bd159d MDL-56679 core: Initialise $SESSION if necessary 2017-02-16 16:17:14 +08:00
Dan Poltawski
9ec952f237 weekly release 3.3dev 2017-02-16 08:14:32 +00:00
Dan Poltawski
3129b28a28 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-02-16 08:14:28 +00:00
Dan Poltawski
1fff8332cf Merge branch 'wip-MDL-4782-fix' of https://github.com/marinaglancy/moodle 2017-02-16 07:51:02 +00:00
Ankit Agarwal
d58adec8de MDL-57619 behat: Final deprecation of old behat steps 2017-02-16 11:54:10 +05:30
Mark Nelson
f512355b31 MDL-57967 core_message: do not process conversations from deleted users 2017-02-16 13:01:06 +08:00
Marina Glancy
024d120ffc MDL-4782 install: add major db change version 2017-02-16 09:28:29 +08: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
Eloy Lafuente (stronk7)
2ea3a89aa2 Merge branch 'wip-mdl-57030-fix' of https://github.com/rajeshtaneja/moodle 2017-02-15 10:38:08 +01:00
Eloy Lafuente (stronk7)
c362c351de Merge branch 'MDL-57896-master-clicfg' of git://github.com/mudrd8mz/moodle 2017-02-15 10:33:36 +01:00
David Mudrák
00eeb686bf MDL-57896 admin: Prevent cfg.php from trying to change hard-set value
Credit goes to Andrew Nicols for spotting and suggesting this check.
2017-02-15 09:23:02 +01:00
Rajesh Taneja
52d1697c12
MDL-57030 behat: Save run status after execution 2017-02-15 10:16:09 +08:00
Eloy Lafuente (stronk7)
bad6e880b2 Merge branch 'MDL-53991_m33v4' of https://github.com/sbourget/moodle 2017-02-14 18:12:39 +01:00
Eloy Lafuente (stronk7)
afd3eb9e11 Merge branch 'wip-mdl-57030' of https://github.com/rajeshtaneja/moodle 2017-02-14 16:30:39 +01:00
David Monllao
ab1058247c MDL-56122 editpdf: Fix ghostscript checking 2017-02-14 13:45:21 +01:00
Dan Poltawski
c3998beb3f Merge branch 'MDL-57810-nginx-buffers' of https://github.com/brendanheywood/moodle 2017-02-14 11:20:37 +00:00
Dan Poltawski
898f227f40 Merge branch 'MDL-46375-master' of git://github.com/andrewnicols/moodle 2017-02-14 10:34:39 +00: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
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