Dani Palou [Fri, 28 Oct 2016 10:40:18 +0000 (12:40 +0200)]
MDL-56637 ws: Add core_user_update_user_preferences to Mobile service
Dan Poltawski [Thu, 27 Oct 2016 11:19:27 +0000 (12:19 +0100)]
weekly release 3.2dev
Dan Poltawski [Thu, 27 Oct 2016 11:19:25 +0000 (12:19 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 27 Oct 2016 08:59:38 +0000 (09:59 +0100)]
Revert "Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle"
This reverts commit
aaa2788e42361b5e3032feacd9c0534fe47cb69c, reversing
changes made to
80b74762c9dad6c5127115f7146cfdf46ad70ab4.
Eloy Lafuente (stronk7) [Thu, 27 Oct 2016 08:47:51 +0000 (10:47 +0200)]
Merge branch 'MDL-56594-master' of git://github.com/damyon/moodle
Andrew Nicols [Thu, 27 Oct 2016 07:12:49 +0000 (15:12 +0800)]
Merge branch 'MDL-56015-master-fix1' of github.com/damyon/moodle
Andrew Nicols [Thu, 27 Oct 2016 04:16:43 +0000 (12:16 +0800)]
Merge branch 'wip-mdl-55074-fix2' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Thu, 27 Oct 2016 04:11:11 +0000 (12:11 +0800)]
MDL-55074 behat: Remove js tag as the feature can run without it
Damyon Wiese [Thu, 27 Oct 2016 01:20:35 +0000 (09:20 +0800)]
MDL-56015 theme_boost: change theme preview screenshot
Eloy Lafuente (stronk7) [Wed, 26 Oct 2016 14:11:44 +0000 (16:11 +0200)]
Merge branch 'MDL-56448-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Thu, 13 Oct 2016 16:58:30 +0000 (17:58 +0100)]
MDL-56448 mustache: fix json errors in example context
Dan Poltawski [Wed, 26 Oct 2016 11:11:56 +0000 (12:11 +0100)]
Merge branch 'MDL-56184-master-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 26 Oct 2016 08:56:18 +0000 (09:56 +0100)]
MDL-56334 tests: add some trivial cases to domain tests
This gets us to 100% code coverage.
Dan Poltawski [Wed, 26 Oct 2016 08:57:50 +0000 (09:57 +0100)]
Merge branch 'MDL-56334-master-v2' of git://github.com/snake/moodle
Eloy Lafuente (stronk7) [Wed, 26 Oct 2016 08:38:36 +0000 (10:38 +0200)]
Merge branch 'MDL-56090-master-fix' of github.com:andrewnicols/moodle
Adrian Greeve [Mon, 10 Oct 2016 04:54:05 +0000 (12:54 +0800)]
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.
Jake Dallimore [Mon, 10 Oct 2016 03:31:53 +0000 (11:31 +0800)]
MDL-56334 libraries: Add new internet protocol library to core
New library providing utilities for IP addresses, DNS and other
internet-protocol-related information.
Andrew Nicols [Wed, 26 Oct 2016 07:43:54 +0000 (15:43 +0800)]
MDL-56090 message: Make key in union unique
This also fixes the unit test to use the correct indices.
David Monllao [Wed, 26 Oct 2016 07:11:27 +0000 (15:11 +0800)]
Merge branch 'MDL-53048-master-fix' of git://github.com/andrewnicols/moodle
Frédéric Massart [Wed, 26 Oct 2016 07:06:59 +0000 (15:06 +0800)]
MDL-56184 theme_boost: Constrain inline form elements to form width
Andrew Nicols [Wed, 26 Oct 2016 06:15:49 +0000 (14:15 +0800)]
Merge branch 'MDL-53366-master' of github.com:ankitagarwal/moodle
Andrew Nicols [Wed, 26 Oct 2016 05:33:08 +0000 (13:33 +0800)]
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.
Ankit Agarwal [Wed, 26 Oct 2016 04:17:27 +0000 (09:47 +0530)]
MDL-53366 antivirus_clamav: Remove Quarantine directory setting
David Monllao [Wed, 26 Oct 2016 02:31:09 +0000 (10:31 +0800)]
Merge branch 'wip-mdl-55074-fix' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Wed, 26 Oct 2016 02:24:20 +0000 (10:24 +0800)]
MDL-55074 message: Display modal window in message, BS2 compatible
Damyon Wiese [Wed, 26 Oct 2016 02:18:52 +0000 (10:18 +0800)]
MDL-55074 behat: Fix zoom in/out dom insertion
Rajesh Taneja [Wed, 26 Oct 2016 02:15:59 +0000 (10:15 +0800)]
MDL-55074 behat: Click on the internal div to ensure driver don't click at wrong node
Rajesh Taneja [Wed, 26 Oct 2016 02:15:18 +0000 (10:15 +0800)]
MDL-55074 behat: Use full navigation path
Andrew Nicols [Wed, 26 Oct 2016 02:12:25 +0000 (10:12 +0800)]
Merge branch 'wip-mdl-56532-fix' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Wed, 26 Oct 2016 02:11:17 +0000 (10:11 +0800)]
MDL-56532 behat: Fixed language string
Andrew Nicols [Wed, 26 Oct 2016 01:48:25 +0000 (09:48 +0800)]
Merge branch 'MDL-29110-master' of git://github.com/lameze/moodle
Simey Lameze [Wed, 26 Oct 2016 01:34:44 +0000 (09:34 +0800)]
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.
Eloy Lafuente (stronk7) [Wed, 26 Oct 2016 00:16:10 +0000 (02:16 +0200)]
Merge branch 'MDL-56354' of https://github.com/mr-russ/moodle
Andrew Nicols [Wed, 26 Oct 2016 00:27:14 +0000 (08:27 +0800)]
Merge branch 'wip-mdl-56532' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 26 Oct 2016 00:23:20 +0000 (08:23 +0800)]
MDL-50888 antivirus: Add note to upgrade.txt
Damyon Wiese [Wed, 26 Oct 2016 00:19:41 +0000 (08:19 +0800)]
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.
Andrew Nicols [Wed, 26 Oct 2016 00:19:23 +0000 (08:19 +0800)]
Merge branch 'MDL-50888-master' of https://github.com/lucisgit/moodle
Rajesh Taneja [Wed, 26 Oct 2016 00:14:58 +0000 (08:14 +0800)]
MDL-56532 behat: Fixed language string
Russell Smith [Tue, 11 Oct 2016 05:33:26 +0000 (16:33 +1100)]
MDL-56354 unittests: Put debug messages in the failure notice.
Dan Poltawski [Tue, 25 Oct 2016 19:44:42 +0000 (20:44 +0100)]
Merge branch 'MDL-56136' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 25 Oct 2016 19:18:35 +0000 (20:18 +0100)]
MDL-46942 events: fix naming of other param
originalcourseid matches coding style
Dan Poltawski [Tue, 25 Oct 2016 19:15:55 +0000 (20:15 +0100)]
Merge branch 'MDL-46942-added-original-course' of https://github.com/jmalmsten-panopto/moodle
Eloy Lafuente (stronk7) [Tue, 25 Oct 2016 18:46:30 +0000 (20:46 +0200)]
Merge branch 'MDL-54833-master-workshopuserplan' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 25 Oct 2016 18:23:12 +0000 (20:23 +0200)]
Merge branch 'MDL-56250-32-formvalidation' of https://github.com/roperto/moodle
Eloy Lafuente (stronk7) [Tue, 25 Oct 2016 18:00:00 +0000 (20:00 +0200)]
Merge branch 'master' of https://github.com/yuriy-os/moodle
Dan Poltawski [Tue, 25 Oct 2016 18:05:00 +0000 (19:05 +0100)]
Merge branch 'MDL-53366-master' of https://github.com/lucisgit/moodle
Dan Poltawski [Tue, 25 Oct 2016 17:40:06 +0000 (18:40 +0100)]
Merge branch 'MDL-55143' of https://github.com/mr-russ/moodle
Eloy Lafuente (stronk7) [Tue, 25 Oct 2016 17:37:11 +0000 (19:37 +0200)]
Merge branch 'MDL-54781_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 25 Oct 2016 16:56:00 +0000 (18:56 +0200)]
Merge branch 'MDL-56444' of https://github.com/mr-russ/moodle
AMOS bot [Tue, 25 Oct 2016 16:04:31 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Tue, 25 Oct 2016 09:38:03 +0000 (10:38 +0100)]
MDL-56017 filter_mathjax: bump version
Dan Poltawski [Tue, 25 Oct 2016 09:36:51 +0000 (10:36 +0100)]
Merge branch 'MDL-56017-master' of git://github.com/lameze/moodle
David Monllao [Tue, 25 Oct 2016 09:33:08 +0000 (17:33 +0800)]
Merge branch 'MDL-56307-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 25 Oct 2016 09:12:54 +0000 (10:12 +0100)]
Merge branch 'MDL-56536-master' of git://github.com/jleyva/moodle
Juan Leyva [Thu, 20 Oct 2016 19:08:57 +0000 (20:08 +0100)]
MDL-56307 course: Support new returned data in WS
Juan Leyva [Thu, 20 Oct 2016 19:08:32 +0000 (20:08 +0100)]
MDL-56307 course: Return time updated and times updated
Russell Smith [Tue, 18 Oct 2016 01:25:21 +0000 (12:25 +1100)]
MDL-56307 course: Refactor file_storage
Juan Leyva [Fri, 7 Oct 2016 11:33:53 +0000 (12:33 +0100)]
MDL-56307 course: New Web Service core_course_check_module_updates
Juan Leyva [Tue, 11 Oct 2016 12:48:24 +0000 (13:48 +0100)]
MDL-56307 course: New course_check_module_updates_since method
Juan Leyva [Thu, 6 Oct 2016 21:46:08 +0000 (22:46 +0100)]
MDL-56307 course: API changes to support retrieve by time
Dan Poltawski [Tue, 25 Oct 2016 08:30:46 +0000 (09:30 +0100)]
Merge branch 'wip-MDL-56395-master' of https://github.com/Beedell/moodle
Dan Poltawski [Tue, 25 Oct 2016 08:27:42 +0000 (09:27 +0100)]
Merge branch 'MDL-56403_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 25 Oct 2016 07:42:58 +0000 (08:42 +0100)]
Merge branch 'MDL-56487-master' of git://github.com/andrewnicols/moodle
David Monllao [Tue, 25 Oct 2016 07:20:06 +0000 (15:20 +0800)]
Merge branch 'wip-mdl-56347' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Tue, 25 Oct 2016 07:11:43 +0000 (15:11 +0800)]
Merge branch 'MDL-55922' of https://github.com/mr-russ/moodle
Dan Poltawski [Tue, 25 Oct 2016 07:11:05 +0000 (08:11 +0100)]
Merge branch 'MDL-56468-master' of git://github.com/andrewnicols/moodle
David Monllao [Tue, 25 Oct 2016 07:09:24 +0000 (15:09 +0800)]
Merge branch 'wip-mdl-55074' of https://github.com/rajeshtaneja/moodle
David Monllao [Tue, 25 Oct 2016 07:05:17 +0000 (15:05 +0800)]
Merge branch 'MDL-56156-master' of git://github.com/damyon/moodle
Andrew Nicols [Tue, 25 Oct 2016 06:24:32 +0000 (14:24 +0800)]
MDL-56004 theme_bootstrapbase: Rebuild less
Andrew Nicols [Tue, 25 Oct 2016 06:13:19 +0000 (14:13 +0800)]
Merge branch 'MDL-56004-master' of https://github.com/damyon/moodle
David Monllao [Tue, 25 Oct 2016 06:00:29 +0000 (14:00 +0800)]
Merge branch 'wip-mdl-53048' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 25 Oct 2016 05:56:44 +0000 (06:56 +0100)]
Merge branch 'MDL-56442-master' of https://github.com/StudiUM/moodle
Rajesh Taneja [Tue, 25 Oct 2016 05:48:51 +0000 (13:48 +0800)]
MDL-55074 behat: Fixed new theme related changes
Dan Poltawski [Tue, 25 Oct 2016 05:45:15 +0000 (06:45 +0100)]
Merge branch 'MDL-56552_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 25 Oct 2016 05:38:13 +0000 (06:38 +0100)]
Merge branch 'MDL-55902-master' of git://github.com/junpataleta/moodle
Damyon Wiese [Mon, 10 Oct 2016 08:47:16 +0000 (16:47 +0800)]
MDL-56004 theme: upgrade.txt note about bootstrap compatibility
Damyon Wiese [Mon, 10 Oct 2016 05:19:18 +0000 (13:19 +0800)]
MDL-56004 theme: Add some BS2 compatibility to BS4.
This is for user-created texts (e.g. the people have used the generico filter to inject BS2 markup into user tests).
It is also for existing old HTML that we have not had time to upgrade yet.
Damyon Wiese [Mon, 10 Oct 2016 04:00:25 +0000 (12:00 +0800)]
MDL-56004 theme: Add some BS4 compatibility to BS2
David Monllao [Tue, 25 Oct 2016 05:29:03 +0000 (13:29 +0800)]
Merge branch 'wip-mdl-55981' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Tue, 25 Oct 2016 05:23:36 +0000 (13:23 +0800)]
MDL-53048 behat: Fixed unmasked password field to select
Rajesh Taneja [Tue, 25 Oct 2016 05:19:32 +0000 (13:19 +0800)]
MDL-55981 behat: Fixed groups seen by user
Dan Poltawski [Tue, 25 Oct 2016 05:08:48 +0000 (06:08 +0100)]
Merge branch 'MDL-56534-master' of git://github.com/crazyserver/moodle
David Monllao [Tue, 25 Oct 2016 04:43:36 +0000 (12:43 +0800)]
Merge branch 'MDL-56532-master' of git://github.com/andrewnicols/moodle
David Monllao [Tue, 25 Oct 2016 04:37:44 +0000 (12:37 +0800)]
Merge branch 'MDL-56516-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 25 Oct 2016 04:15:34 +0000 (12:15 +0800)]
MDL-56532 tool_usertours: Correct langstring uses for top/bottom
David Monllao [Tue, 25 Oct 2016 03:51:21 +0000 (11:51 +0800)]
Merge branch 'MDL-56006-master' of git://github.com/damyon/moodle
Rajesh Taneja [Tue, 25 Oct 2016 03:13:07 +0000 (11:13 +0800)]
MDL-56006 behat: Load proper context by helper
Andrew Nicols [Tue, 25 Oct 2016 02:37:36 +0000 (10:37 +0800)]
Merge branch 'MDL-56015-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 25 Oct 2016 00:30:59 +0000 (08:30 +0800)]
MDL-56006 blocks: Fix installation with no required blocks
Boost requires no blocks which was causing a failure on installation.
Rajesh Taneja [Mon, 24 Oct 2016 05:18:35 +0000 (13:18 +0800)]
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
Damyon Wiese [Thu, 6 Oct 2016 08:36:49 +0000 (16:36 +0800)]
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).
Damyon Wiese [Thu, 20 Oct 2016 03:43:35 +0000 (11:43 +0800)]
MDL-56015 theme_boost: Clean up pix folder
Add real screenshot of new theme and delete unused images and icons.
Andrew Nicols [Tue, 25 Oct 2016 00:53:34 +0000 (08:53 +0800)]
MDL-56516 tool_usertous: Remove eroneous test
Andrew Nicols [Tue, 25 Oct 2016 00:39:36 +0000 (08:39 +0800)]
MDL-56516 tool_usertours: Adjust tour query for MySQL
Eloy Lafuente (stronk7) [Mon, 24 Oct 2016 18:30:11 +0000 (20:30 +0200)]
Merge branch 'MDL-48350-M32' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 24 Oct 2016 18:05:03 +0000 (20:05 +0200)]
Merge branch 'MDL-56532-master' of git://github.com/andrewnicols/moodle
jmalmsten-panopto [Mon, 24 Oct 2016 16:01:34 +0000 (09:01 -0700)]
MDL-46942 core_backup: added original course id to restore event
Dan Poltawski [Mon, 24 Oct 2016 14:50:55 +0000 (15:50 +0100)]
Merge branch 'MDL-56538-master' of git://github.com/crazyserver/moodle
Dan Poltawski [Mon, 24 Oct 2016 14:43:27 +0000 (15:43 +0100)]
Merge branch 'MDL-56531-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 24 Oct 2016 13:33:53 +0000 (14:33 +0100)]
Merge branch 'wip-MDL-56439-master' of git://github.com/marinaglancy/moodle