Commit graph

22844 commits

Author SHA1 Message Date
Amanda Doughty
cc350fd9c8 MDL-47162 core_message: Add course id to message eventdata 2016-10-27 18:11:27 +02:00
Dan Poltawski
1810eb1bf8 Revert "Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle"
This reverts commit aaa2788e42, reversing
changes made to 80b74762c9.
2016-10-27 09:59:38 +01:00
Frédéric Massart
b24212515c MDL-55732 theme_boost: Export elements separator in groups 2016-10-27 10:54:02 +08:00
Damyon Wiese
bff9fd896a MDL-56597 theme_boost: Maintenance warning styles 2016-10-27 10:41:42 +08:00
Eloy Lafuente (stronk7)
6f01090159 Merge branch 'MDL-56448-master' of git://github.com/danpoltawski/moodle 2016-10-26 16:11:44 +02:00
Dan Poltawski
f07cb88c57 MDL-56448 mustache: fix json errors in example context 2016-10-26 12:35:45 +01:00
Dan Poltawski
add9db49f4 MDL-56334 tests: add some trivial cases to domain tests
This gets us to 100% code coverage.
2016-10-26 09:58:05 +01:00
Dan Poltawski
e376b4bd64 Merge branch 'MDL-56334-master-v2' of git://github.com/snake/moodle 2016-10-26 09:57:50 +01:00
Adrian Greeve
020c98e373 MDL-56334 libraries: Addition of domain checker.
Added a function for checking if a domain is allowed
against a list of domains that could contain wildcards.
2016-10-26 15:51:32 +08:00
Jake Dallimore
6d6e36923b MDL-56334 libraries: Add new internet protocol library to core
New library providing utilities for IP addresses, DNS and other
internet-protocol-related information.
2016-10-26 15:49:03 +08:00
David Monllao
01435b4ebd Merge branch 'MDL-53048-master-fix' of git://github.com/andrewnicols/moodle 2016-10-26 15:11:27 +08:00
Andrew Nicols
3778a9226f MDL-53048 core_form: passwordunmask must exist on page for validation
The initial approach I took was to provide a noscript area containing the
standard input element, and to move it to a hidden input element as part of
the passwordunmask setup.

This allowed behat tests to pass both with and without JS enabled (i.e.
with Goutte and real browsers), and also ensured that the real input did
not appear on screen.

However, the standard formslib validation occurs before other page JS is
run and hooks into the elements on page during its setup.
Since noscript elements are not accessible to scripts as standard elements,
the form validation would fail for _client_ side validation and work for
server-side validation.

This change creates creates the hidden input element in the template
instead, as well as the password element in the noscript tag.

Doing this means that when JS is disabled, the form has two elements of the
same name - one hidden, and the second a visible password field.
Since the latter element will always override the former one on form
submission, and the noscript variant is last, the noscript variant wins
when JS is disabled and tests continue to pass.

When JS is enabled, the noscript variant is not a valid part of the DOM
(the browser sees it as a hidden text field essentially). The password is
not automatically entered into the hidden field, so the autocomplete
prevention continues to work as expected.
2016-10-26 13:33:10 +08:00
Ankit Agarwal
ff67562eca MDL-53366 antivirus_clamav: Remove Quarantine directory setting 2016-10-26 09:47:27 +05:30
Andrew Nicols
7f650fdec8 Merge branch 'MDL-29110-master' of git://github.com/lameze/moodle 2016-10-26 09:48:25 +08:00
Simey Lameze
0ab8b33754 MDL-29110 enrol_self: improve send course welcome message setting
This commit change send course welcome message to a drop-down that now supports sending emails from:
- Course contact
- Enrolment key holder
- No reply address
Also moves part of the logic of handling send welcome email from to a new method get_welcome_email_contact() and unit test for this new method.
2016-10-26 09:38:09 +08:00
Eloy Lafuente (stronk7)
7c7928b2d8 Merge branch 'MDL-56354' of https://github.com/mr-russ/moodle 2016-10-26 03:02:53 +02:00
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