Commit graph

22878 commits

Author SHA1 Message Date
Andrew Nicols
dc213b45ec MDL-50888 antivirus: Add note to upgrade.txt 2016-10-26 08:23:20 +08:00
Andrew Nicols
8d3c33c693 Merge branch 'MDL-50888-master' of https://github.com/lucisgit/moodle 2016-10-26 08:19:23 +08:00
Russell Smith
ef15173794 MDL-56354 unittests: Put debug messages in the failure notice. 2016-10-26 08:39:10 +11:00
Dan Poltawski
7af5ad97c1 MDL-46942 events: fix naming of other param
originalcourseid matches coding style
2016-10-25 20:18:35 +01:00
Dan Poltawski
7e670910ed Merge branch 'MDL-46942-added-original-course' of https://github.com/jmalmsten-panopto/moodle 2016-10-25 20:15:55 +01:00
Eloy Lafuente (stronk7)
0d80f6984b Merge branch 'MDL-56250-32-formvalidation' of https://github.com/roperto/moodle 2016-10-25 20:23:12 +02:00
Eloy Lafuente (stronk7)
f07a1ae8a3 Merge branch 'master' of https://github.com/yuriy-os/moodle 2016-10-25 20:11:27 +02:00
Dan Poltawski
607bdc3829 Merge branch 'MDL-53366-master' of https://github.com/lucisgit/moodle 2016-10-25 19:05:00 +01:00
Dan Poltawski
d5e902d3ab Merge branch 'MDL-55143' of https://github.com/mr-russ/moodle 2016-10-25 18:40:06 +01:00
David Monllao
26aa08b2f8 Merge branch 'MDL-56307-master' of git://github.com/jleyva/moodle 2016-10-25 17:33:08 +08:00
Russell Smith
cebce76f61 MDL-56307 course: Refactor file_storage 2016-10-25 10:10:53 +01:00
Juan Leyva
26659f626a MDL-56307 course: New Web Service core_course_check_module_updates 2016-10-25 10:10:53 +01:00
Juan Leyva
1896b8009a MDL-56307 course: API changes to support retrieve by time 2016-10-25 10:10:52 +01:00
John Okely
23146bad48 MDL-55841 core: Allow copy box to be used multiple times in one template 2016-10-25 16:13:01 +08:00
David Monllao
bf91437d25 Merge branch 'wip-mdl-55074' of https://github.com/rajeshtaneja/moodle 2016-10-25 15:09:24 +08:00
Andrew Nicols
2979c25683 Merge branch 'MDL-56004-master' of https://github.com/damyon/moodle 2016-10-25 14:13:19 +08:00
Dan Poltawski
3b89ce210d Merge branch 'MDL-56442-master' of https://github.com/StudiUM/moodle 2016-10-25 06:56:44 +01:00
Rajesh Taneja
c99dffb69c
MDL-55074 behat: Fixed new theme related changes 2016-10-25 13:48:51 +08:00
Dan Poltawski
1a2497c3c2 Merge branch 'MDL-55902-master' of git://github.com/junpataleta/moodle 2016-10-25 06:38:13 +01:00
Damyon Wiese
fb045b4e15 MDL-56004 theme: upgrade.txt note about bootstrap compatibility 2016-10-25 13:36:29 +08:00
Dan Poltawski
76a6dc685d Merge branch 'MDL-56534-master' of git://github.com/crazyserver/moodle 2016-10-25 06:08:48 +01:00
Rajesh Taneja
d87dac7e70 MDL-56006 behat: Load proper context by helper 2016-10-25 11:21:53 +08:00
Russell Smith
261bfabc6f MDL-54916 filestorage: Only write empty zip on change.
In some cases we may inspect an empty zip file. If we do open
an empty zip file, check that it changed before we attempt to write
it to disk.  It may be the case that we were reading the file from
a location that we don't have write access to.
2016-10-25 14:10:36 +11:00
Damyon Wiese
848db61636 MDL-56006 blocks: Fix installation with no required blocks
Boost requires no blocks which was causing a failure on installation.
2016-10-25 10:15:20 +08:00
Rajesh Taneja
4422ffc55e MDL-56006 behat: Get proper feature and context for default theme
No matter which theme is default theme, overridden
context and blacklisted features should be respected
2016-10-25 10:15:20 +08:00
Damyon Wiese
e56b58e3c9 MDL-56006 theme: Set Boost as the default theme
Units tests have been adjusted e.g. 'boost' instead of 'clean' in pix urls.

Some places I didn't update the test to reflect the boost markup and reset
the theme to clean. This is because the test was not testing the markup - but the
functionality (e.g. looking for specific structures to indicate an error in a form element).
2016-10-25 10:15:20 +08:00
jmalmsten-panopto
3480411e0d MDL-46942 core_backup: added original course id to restore event 2016-10-24 09:01:34 -07:00
Pau Ferrer Ocaña
8845688ce4 MDL-56534 assign: Add grading status on get_submissions WS 2016-10-24 13:24:18 +02:00
David Monllao
c10cd185a9 Merge branch 'MDL-55981-master' of git://github.com/andrewnicols/moodle 2016-10-24 13:20:42 +08:00
David Monllao
48f43096e0 Merge branch 'MDL-55074-master' of git://github.com/damyon/moodle 2016-10-24 12:33:51 +08:00
David Monllao
aaa2788e42 Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle 2016-10-24 11:56:06 +08:00
Andrew Nicols
c823bfee62 MDL-56129 core: Set a timeout on the session cookie
This is primarily because iOS has changed something under the hood which
means that only session cookies which have an expiry are passed around the
OS.

In order to make media playable outside of the browser (e.g. a video), we
must set a session cookie timeout.

Since the session timeout is configurable, this patch sets the cookie
timeout to the session timeout plus a period of one week.

This ensures that videos continue to work, and that the expired session
message is shown on the login page, but without requiring excessively long
session times.
2016-10-24 11:47:06 +08:00
David Monllao
80b74762c9 DML-53048 forms: Remove conflict resultion remaining bit
Change wrong alternative references as well.
2016-10-24 11:16:53 +08:00
David Monllao
8f68e0343a Merge branch 'MDL-53048-master' of git://github.com/andrewnicols/moodle 2016-10-24 11:12:25 +08:00
Luke Carrier
14d6c1cf79 MDL-55902 my: Add additional information to dashboard reset events
* Add $private and $pagetype information to the 'other' parameter of
the dashboard(s) reset events.
2016-10-24 11:03:10 +08:00
Andrew Nicols
ab00bf59a5 Merge branch 'MDL-56341-master' of git://github.com/damyon/moodle 2016-10-24 10:11:20 +08:00
Damyon Wiese
8387614051 MDL-55074 theme_boost: Undefined variable in perf footer 2016-10-24 10:03:04 +08:00
Andrew Nicols
ca25005c69 MDL-53048 form: Rewrite passwordunmask
This version:
* should work with the Behat Goutte driver
* should not suffer from password autofill anxiety
* should allow unmasking (and masking) of a password
* should allow editing of passwords in either masked, or unmasked form

AMOS BEGIN
 MOV [revealpassword,core_form],[passwordunmaskrevealhint,core_form]
AMOS END
2016-10-24 09:24:39 +08:00
Andrew Nicols
ac157b0bbe MDL-53048 forms: Deprecate prevent_form_autofill_password 2016-10-24 08:19:44 +08:00
Yuriy Osychenko
6e7f41715f MDL-53098 lib: Mark form as submitted in confirmation dialog.
If the quiz attempt use popup window with Javascript security it will
show to the user misleading message that he is going to lose entered
data.
To avoid this we should mark form as submitted to turn off browser`s
pop-up window when user confirms finishing attempt.
Also we need to check if core_formchangechecker is present on a page.
2016-10-24 00:39:28 +03:00
Ruslan Kabalin
19f8cd61b0 MDL-53366 antivirus_clamav: Remove "Quarantine directory" setting. 2016-10-21 11:49:44 +01:00
Ruslan Kabalin
f8927a7cde MDL-50888 antivirus: Unit test refactoring.
Remove all cleanup and exception test references. We expect plugin just to
respond with scanning result constant and notice where applicable.

Add tests for \core\antivirus\manager.
2016-10-21 11:48:49 +01:00
Ruslan Kabalin
4cc1b5bc0c MDL-50888 antivirus: Move post-scan logic to manager.
In the initial implementation, infected file cleanup and exception throwing
was done at the plugin level. This is somewhat incorrect from plugin
responsibility perspective. The patch moves cleanup and exception logic to
the manager. Antivirus plugin responsibility is limited to perform scanning
and respond with one of the result statuses defined in the
\core\antivirus\scanner.
2016-10-21 11:48:49 +01:00
Ruslan Kabalin
83a43b88fe MDL-50888 antivirus_clamav: Unit tests refactoring.
Due to configurable nature of scanning method selection, unit test needs to
be updated to always point to commadline method. There is no need to write
separate tests for socket scanning method, as the scanning method needs to
be mocked anyway (i.e. will be identical to commandline scanning from test
perspective).
2016-10-21 11:48:48 +01:00
Ruslan Kabalin
7be0d4292a MDL-50888 antivirus_clamav: Implement scan using Unix domain sockets.
This is a faster way of scanning files than using command line exec call,
but only available on unix-like systems.
2016-10-21 11:48:48 +01:00
Damyon Wiese
ba5c5083c5 MDL-55074 theme_boost: Behat fixes for latest theme changes
Fix I edit profile steps
Apply fixed header in css
Remove transitions from menus for behat
Be more specific about some "I follow" steps
Navigation path changes
"Current course" node removed from nav tree
Adapt tests because there are no default blocks
Force some space between action menu items
2016-10-21 16:06:54 +08:00
Frédéric Massart
c9c1e4baf6 MDL-56272 theme_boost: Differentiate between freeze and hardFreeze 2016-10-21 12:41:33 +08:00
Damyon Wiese
245d354c6c MDL-55074 theme_boost: Unit test fixes for all these changes 2016-10-21 12:40:06 +08:00
Damyon Wiese
c6d9d29da1 MDL-55074 theme_boost: Improve the display of the menus in the footer 2016-10-21 12:40:06 +08:00
Damyon Wiese
d430a7c336 MDL-55074 navigation: Menu and nav changes
"Grades" belongs in the navigation block, not the settings block.
Course / Activity menus should not include a link to the full settings page list, if it is the same as the menu.
Competencies belongs in the navigation block not the settings block.
2016-10-21 12:40:05 +08:00