mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
81,244 Commits 36 Branches 519 Tags
Commit Graph

81244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
5ae35b9dee MDL-56654 blogs: Display RSS link in the page 2016-11-03 09:22:51 +08:00
Dan Poltawski
577bd70d38 weekly release 3.2dev 2016-10-27 12:19:27 +01:00
Dan Poltawski
2062b6de90 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-10-27 12:19:25 +01:00
Dan Poltawski
1810eb1bf8 Revert "Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle" 
This reverts commit aaa2788e42361b5e3032feacd9c0534fe47cb69c, reversing
changes made to 80b74762c9dad6c5127115f7146cfdf46ad70ab4.
 2016-10-27 09:59:38 +01:00
Eloy Lafuente (stronk7)
6a17bdec92 Merge branch 'MDL-56594-master' of git://github.com/damyon/moodle 2016-10-27 10:47:51 +02:00
Andrew Nicols
77cfc19a85 Merge branch 'MDL-56015-master-fix1' of http://github.com/damyon/moodle 2016-10-27 15:12:49 +08:00
Andrew Nicols
ce434c7664 Merge branch 'wip-mdl-55074-fix2' of https://github.com/rajeshtaneja/moodle 2016-10-27 12:16:43 +08:00
Rajesh Taneja
0fa66b5383
MDL-55074 behat: Remove js tag as the feature can run without it 2016-10-27 12:11:45 +08:00
Damyon Wiese
58473a6776 MDL-56015 theme_boost: change theme preview screenshot 2016-10-27 09:20:35 +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
2300b95dbf Merge branch 'MDL-56184-master-master' of git://github.com/damyon/moodle 2016-10-26 12:11:56 +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
Eloy Lafuente (stronk7)
c64230234f Merge branch 'MDL-56090-master-fix' of github.com:andrewnicols/moodle 2016-10-26 10:38:36 +02: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
Andrew Nicols
ebc746dcc2 MDL-56090 message: Make key in union unique 
This also fixes the unit test to use the correct indices.
 2016-10-26 15:43:56 +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
Frédéric Massart
a4a6d85b5b MDL-56184 theme_boost: Constrain inline form elements to form width 2016-10-26 15:06:59 +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
Damyon Wiese
9de8c56136 MDL-56594 theme_boost: The template for checkboxes has a nesting error 
This throws and exception which is caught - and the renderer fall back to the
legacy HTML for the element.
 2016-10-26 08:19:41 +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
AMOS bot
2c07cc5cf8 Automatically generated installer lang files 2016-10-26 00:04:31 +08:00