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
7eafebbcf7
Merge branch 'MDL-53366-master' of github.com:ankitagarwal/moodle
2016-10-26 14:15:49 +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
David Monllao
ee61e3ef83
Merge branch 'wip-mdl-55074-fix' of https://github.com/rajeshtaneja/moodle
2016-10-26 10:31:09 +08:00
Damyon Wiese
181179de54
MDL-55074 message: Display modal window in message, BS2 compatible
2016-10-26 10:24:20 +08:00
Damyon Wiese
33cb7031de
MDL-55074 behat: Fix zoom in/out dom insertion
2016-10-26 10:18:52 +08:00
Rajesh Taneja
eb1335c63c
MDL-55074 behat: Click on the internal div to ensure driver don't click at wrong node
2016-10-26 10:15:59 +08:00
Rajesh Taneja
7f8c9bb852
MDL-55074 behat: Use full navigation path
2016-10-26 10:15:18 +08:00
Andrew Nicols
71c47e774f
Merge branch 'wip-mdl-56532-fix' of https://github.com/rajeshtaneja/moodle
2016-10-26 10:12:25 +08:00
Rajesh Taneja
0c4c697dac
MDL-56532 behat: Fixed language string
2016-10-26 10:11:17 +08:00
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
f34d743dd4
Merge branch 'wip-mdl-56532' of https://github.com/rajeshtaneja/moodle
2016-10-26 08:27:14 +08: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
Rajesh Taneja
a4da15d472
MDL-56532 behat: Fixed language string
2016-10-26 08:14:58 +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
a360594259
Merge branch 'MDL-56136' of git://github.com/timhunt/moodle
2016-10-25 20:44:42 +01: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)
717845b52d
Merge branch 'MDL-54833-master-workshopuserplan' of git://github.com/mudrd8mz/moodle
2016-10-25 20:46:30 +02: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
Eloy Lafuente (stronk7)
c52cc59877
Merge branch 'MDL-54781_master' of git://github.com/markn86/moodle
2016-10-25 19:37:11 +02:00
Eloy Lafuente (stronk7)
bab82353f6
Merge branch 'MDL-56444' of https://github.com/mr-russ/moodle
2016-10-25 18:56:00 +02:00
Dan Poltawski
98363b9d52
MDL-56017 filter_mathjax: bump version
2016-10-25 10:38:03 +01:00
Dan Poltawski
64ce747448
Merge branch 'MDL-56017-master' of git://github.com/lameze/moodle
2016-10-25 10:36:51 +01:00
David Monllao
26aa08b2f8
Merge branch 'MDL-56307-master' of git://github.com/jleyva/moodle
2016-10-25 17:33:08 +08:00
Dan Poltawski
274c5837e7
Merge branch 'MDL-56536-master' of git://github.com/jleyva/moodle
2016-10-25 10:12:54 +01:00
Juan Leyva
25adfbaa4a
MDL-56307 course: Support new returned data in WS
2016-10-25 10:10:55 +01:00
Juan Leyva
65b2669d98
MDL-56307 course: Return time updated and times updated
2016-10-25 10:10:55 +01: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
02a73d767c
MDL-56307 course: New course_check_module_updates_since method
2016-10-25 10:10:52 +01:00
Juan Leyva
1896b8009a
MDL-56307 course: API changes to support retrieve by time
2016-10-25 10:10:52 +01:00
Dan Poltawski
ad07960d89
Merge branch 'wip-MDL-56395-master' of https://github.com/Beedell/moodle
2016-10-25 09:30:46 +01:00
Dan Poltawski
b580f39556
Merge branch 'MDL-56403_master' of git://github.com/markn86/moodle
2016-10-25 09:27:42 +01:00
Dan Poltawski
737e3c3b67
Merge branch 'MDL-56487-master' of git://github.com/andrewnicols/moodle
2016-10-25 08:42:58 +01:00
David Monllao
ab9ca549e7
Merge branch 'wip-mdl-56347' of https://github.com/rajeshtaneja/moodle
2016-10-25 15:20:06 +08:00
Andrew Nicols
9c792b9861
Merge branch 'MDL-55922' of https://github.com/mr-russ/moodle
2016-10-25 15:11:43 +08:00
Dan Poltawski
c435523ac5
Merge branch 'MDL-56468-master' of git://github.com/andrewnicols/moodle
2016-10-25 08:11:05 +01:00
David Monllao
bf91437d25
Merge branch 'wip-mdl-55074' of https://github.com/rajeshtaneja/moodle
2016-10-25 15:09:24 +08:00
David Monllao
1d58c301c7
Merge branch 'MDL-56156-master' of git://github.com/damyon/moodle
2016-10-25 15:05:17 +08:00
Andrew Nicols
b146ff9451
MDL-56004 theme_bootstrapbase: Rebuild less
2016-10-25 14:24:32 +08:00
Andrew Nicols
2979c25683
Merge branch 'MDL-56004-master' of https://github.com/damyon/moodle
2016-10-25 14:13:19 +08:00
David Monllao
5c39800880
Merge branch 'wip-mdl-53048' of https://github.com/rajeshtaneja/moodle
2016-10-25 14:00:29 +08:00