Dan Poltawski [Tue, 28 Jun 2016 09:07:43 +0000 (10:07 +0100)]
Merge branch 'MDL-32135_m32v2' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 28 Jun 2016 08:36:52 +0000 (09:36 +0100)]
Merge branch 'MDL-54865-master' of git://github.com/ryanwyllie/moodle
Dan Poltawski [Tue, 28 Jun 2016 08:19:48 +0000 (09:19 +0100)]
Merge branch 'MDL-54868-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 28 Jun 2016 08:06:08 +0000 (09:06 +0100)]
Merge branch 'MDL-55002-master-enfix' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Tue, 28 Jun 2016 07:30:22 +0000 (15:30 +0800)]
Merge branch 'MDL-54991-master' of git://github.com/crazyserver/moodle
Andrew Nicols [Tue, 28 Jun 2016 07:21:19 +0000 (15:21 +0800)]
Merge branch 'MDL-54909-master' of git://github.com/crazyserver/moodle
Andrew Nicols [Tue, 28 Jun 2016 06:14:23 +0000 (14:14 +0800)]
Merge branch 'MDL-54601-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 28 Jun 2016 04:44:43 +0000 (12:44 +0800)]
Merge branch 'MDL-54910_m32v2' of https://github.com/sbourget/moodle
Andrew Nicols [Tue, 28 Jun 2016 04:32:17 +0000 (12:32 +0800)]
Merge branch 'MDL-54911_m32v3' of https://github.com/sbourget/moodle
Andrew Nicols [Tue, 28 Jun 2016 02:01:06 +0000 (10:01 +0800)]
MDL-54755 core: Correct behat language
Andrew Nicols [Tue, 28 Jun 2016 01:46:42 +0000 (09:46 +0800)]
Merge branch 'MDL-54755_master' of https://github.com/StudiUM/moodle
Andrew Nicols [Tue, 28 Jun 2016 01:26:23 +0000 (09:26 +0800)]
Merge branch 'MDL-54935_m32v1' of git://github.com/sbourget/moodle
Andrew Nicols [Tue, 28 Jun 2016 00:44:50 +0000 (08:44 +0800)]
Merge branch 'MDL-54964-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 28 Jun 2016 00:32:32 +0000 (08:32 +0800)]
Merge branch 'wip-mdl-54974' of https://github.com/rajeshtaneja/moodle
Cameron Ball [Thu, 9 Jun 2016 15:55:00 +0000 (23:55 +0800)]
MDL-54868 webservice_xmlrpc: Don't escape non-ascii characters
David Mudrák [Mon, 27 Jun 2016 20:37:08 +0000 (22:37 +0200)]
MDL-55002 lang: Fix behat scenarios using modified strings
Eloy Lafuente (stronk7) [Mon, 27 Jun 2016 20:13:48 +0000 (22:13 +0200)]
Merge branch 'MDL-55028-master' of git://github.com/junpataleta/moodle
Helen Foster [Mon, 27 Jun 2016 20:03:40 +0000 (22:03 +0200)]
MDL-55002 lang: Merge English strings from the en_fix language pack
Eloy Lafuente (stronk7) [Mon, 27 Jun 2016 18:38:18 +0000 (20:38 +0200)]
Merge branch 'MDL-54599-31' of git://github.com/vadimonus/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jun 2016 18:22:14 +0000 (20:22 +0200)]
Merge branch 'MDL-54997-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jun 2016 18:00:43 +0000 (20:00 +0200)]
Merge branch 'MDL-54707_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jun 2016 16:53:23 +0000 (18:53 +0200)]
Merge branch 'MDL-54900-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jun 2016 14:13:25 +0000 (16:13 +0200)]
Merge branch 'MDL-52887-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 27 Jun 2016 11:26:34 +0000 (13:26 +0200)]
Merge branch 'MDL-54663-master' of git://github.com/andrewnicols/moodle
Juan Leyva [Mon, 20 Jun 2016 10:30:45 +0000 (11:30 +0100)]
MDL-54964 tool_mobile: Fix tests to make it work with non-core plugins
Pau Ferrer Ocaña [Wed, 22 Jun 2016 10:40:43 +0000 (12:40 +0200)]
MDL-54991 assign: Invalid submissiongroup when not using groups
Rajesh Taneja [Tue, 21 Jun 2016 04:15:21 +0000 (12:15 +0800)]
MDL-54974 behat: Handle interupts on PHP7
As https://bugs.php.net/bug.php?id=71448 is
not going to get fixed, we need to declare tick
Jun Pataleta [Mon, 27 Jun 2016 05:29:18 +0000 (13:29 +0800)]
MDL-55028 webservice_soap: Use strlen for setting Content-Length header
Andrew Nicols [Mon, 27 Jun 2016 05:30:51 +0000 (13:30 +0800)]
Merge branch 'MDL-53111_m32v1' of https://github.com/sbourget/moodle
Andrew Nicols [Mon, 27 Jun 2016 04:53:35 +0000 (12:53 +0800)]
Merge branch 'MDL-54924-master' of git://github.com/junpataleta/moodle
Marina Glancy [Mon, 13 Jun 2016 06:12:14 +0000 (14:12 +0800)]
MDL-54900 mod_choice: correctly count number of answered users
Andrew Nicols [Mon, 27 Jun 2016 00:59:49 +0000 (08:59 +0800)]
Merge branch 'MDL-54785-master' of git://github.com/FMCorz/moodle
David Monllao [Thu, 2 Jun 2016 03:42:13 +0000 (11:42 +0800)]
MDL-54707 search: Add user context to get_areas_user_accesses
Damyon Wiese [Sat, 25 Jun 2016 13:57:58 +0000 (06:57 -0700)]
MDL-54997 competencies: Fix random unit test fail
Sorting on timecreated is not unique enough to
guarantee a predictable ordering.
Gilles-Philippe Leblanc [Mon, 30 May 2016 15:50:31 +0000 (11:50 -0400)]
MDL-54755 core: Incorrect redirection after password change
Stephen Bourget [Thu, 23 Jun 2016 21:39:48 +0000 (17:39 -0400)]
MDL-54911 mod_feedback: start date should be before the end date
Stephen Bourget [Thu, 23 Jun 2016 21:32:19 +0000 (17:32 -0400)]
MDL-54910 mod_data: Open dates should be before close dates
Stephen Bourget [Thu, 23 Jun 2016 21:21:27 +0000 (17:21 -0400)]
MDL-32135 mod_choice: Open time should be before close time
Damyon Wiese [Thu, 23 Jun 2016 14:03:50 +0000 (07:03 -0700)]
MDL-54997 competencies: Listing evidence contexts
When listing the evidence for a user competency in a course,
the query is missing evidences for sub-contexts in the course.
Pau Ferrer Ocaña [Tue, 14 Jun 2016 07:18:58 +0000 (09:18 +0200)]
MDL-54909 assign: Style editpdf background to differ from page bg
Andrew Nicols [Thu, 23 Jun 2016 06:49:30 +0000 (14:49 +0800)]
weekly release 3.2dev
Andrew Nicols [Thu, 23 Jun 2016 06:49:25 +0000 (14:49 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Frederic Massart [Thu, 23 Jun 2016 04:29:13 +0000 (12:29 +0800)]
MDL-54785 files: Deprecate the support for $usepost and related
Luca Bösch [Fri, 10 Jun 2016 10:30:28 +0000 (12:30 +0200)]
MDL-54865 grade: student name hyperlinked in gradebook user report
In the Gradebook, User report, the student's name (at the top) is a hyperlink
to that student's account. In most places where a student's name shows
(e.g. the Grader report) it is most often a hyperlink.
Frederic Massart [Tue, 7 Jun 2016 08:58:20 +0000 (16:58 +0800)]
Revert "MDL-44626 files: Show the PHP max upload size instead of 'unlimited'"
This reverts commit
6f0768618a38c11eca90a97c0dff31ec8ce434d1.
Frederic Massart [Tue, 7 Jun 2016 08:57:07 +0000 (16:57 +0800)]
Revert "Merge branch 'MDL-54110_master' of https://github.com/marxjohnson/moodle"
This reverts commit
016e0abfbc1992f01eadfdef02de6e56ffad8e9f, reversing
changes made to
58a2f0ac40f24da9c9955110902f8e14cd0d8419.
Frederic Massart [Tue, 7 Jun 2016 08:56:16 +0000 (16:56 +0800)]
Revert "MDL-54110 repositories: Whitespace, Typo + unit test fixes"
This reverts commit
7e4d43e1a263f7003207a382251de900341db92c.
Andrew Nicols [Thu, 23 Jun 2016 02:50:14 +0000 (10:50 +0800)]
Merge branch 'MDL-54948-master-fix2' of https://github.com/lameze/moodle
Simey Lameze [Thu, 23 Jun 2016 00:37:23 +0000 (08:37 +0800)]
MDL-54948 core_files: return false if theres no output from unoconv
Andrew Nicols [Wed, 22 Jun 2016 06:57:09 +0000 (14:57 +0800)]
Merge branch 'MDL-35104-master-fix' of https://github.com/cameron1729/moodle
Andrew Nicols [Wed, 22 Jun 2016 06:43:35 +0000 (14:43 +0800)]
Merge branch 'MDL-54948-master-fix' of https://github.com/lameze/moodle
Cameron Ball [Wed, 22 Jun 2016 05:59:39 +0000 (13:59 +0800)]
MDL-35104 auth: Always allow editing username for new users
Marina Glancy [Wed, 25 May 2016 13:08:13 +0000 (21:08 +0800)]
MDL-52887 mod_choice: backup allowmultiple option
Simey Lameze [Wed, 22 Jun 2016 05:36:02 +0000 (13:36 +0800)]
MDL-54948 core_upgrade: fix check_unoconv_version logic
Andrew Nicols [Fri, 27 May 2016 05:11:26 +0000 (13:11 +0800)]
MDL-54663 forum: Correct digest link to forum preferences
Andrew Nicols [Wed, 22 Jun 2016 01:10:19 +0000 (09:10 +0800)]
Merge branch 'wip-mdl-53399' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Wed, 22 Jun 2016 01:07:31 +0000 (09:07 +0800)]
MDL-53399 behat: Activity chooser link is removed.
Eloy Lafuente (stronk7) [Tue, 21 Jun 2016 23:42:15 +0000 (01:42 +0200)]
Merge branch 'wip-mdl-54589-mac' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 21 Jun 2016 21:37:59 +0000 (23:37 +0200)]
MDL-54778 form: Make it all js style (eslint) compliant
The changes in this commit should not be problematic, just:
- different whitespace.
- some docs.
- 1 variable to camelCase.
And then, less trivial, but safe enough IMO:
- a change to camelCase some identifiers and their calculation.
Eloy Lafuente (stronk7) [Tue, 21 Jun 2016 23:29:39 +0000 (01:29 +0200)]
Merge branch 'MDL-54778-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 21 Jun 2016 19:56:32 +0000 (12:56 -0700)]
Merge branch 'MDL-54983-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 21 Jun 2016 18:05:28 +0000 (11:05 -0700)]
MDL-54983 docs: Improve phpdocs for create_user_key
Also fixed the docs for get_user_key.
Eloy Lafuente (stronk7) [Tue, 21 Jun 2016 18:00:36 +0000 (20:00 +0200)]
Merge branch 'MDL-54939-master' of git://github.com/danpoltawski/moodle
AMOS bot [Tue, 21 Jun 2016 16:06:06 +0000 (00:06 +0800)]
Automatically generated installer lang files
Andrew Nicols [Tue, 21 Jun 2016 11:00:33 +0000 (19:00 +0800)]
Merge branch 'wip-mdl-54940' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Tue, 21 Jun 2016 10:53:03 +0000 (18:53 +0800)]
MDL-54940 behat: No need to press save
Previous step press save button, so no need to press again
Eloy Lafuente (stronk7) [Tue, 21 Jun 2016 09:48:10 +0000 (11:48 +0200)]
Merge branch 'MDL-54948-master' of git://github.com/lameze/moodle
Andrew Nicols [Tue, 21 Jun 2016 06:59:00 +0000 (14:59 +0800)]
MDL-51789 users: Correct deprecation version
Andrew Nicols [Tue, 21 Jun 2016 06:38:51 +0000 (14:38 +0800)]
Merge branch 'MDL-51789' of https://github.com/mr-russ/moodle
Russell Smith [Thu, 15 Oct 2015 08:34:58 +0000 (19:34 +1100)]
MDL-51789 users: Allow picture update from webservices.
useredit_update_picture as moved to user_update_picture
as it's more general. It was also moved to user/lib.php
so it can be used by both webservices and edit without more include files.
Andrew Nicols [Tue, 21 Jun 2016 06:15:41 +0000 (14:15 +0800)]
Merge branch 'MDL-54920-master' of https://github.com/sammarshallou/moodle
Andrew Nicols [Tue, 21 Jun 2016 04:09:09 +0000 (12:09 +0800)]
Merge branch 'MDL-54894-master' of git://github.com/crazyserver/moodle
Andrew Nicols [Tue, 21 Jun 2016 03:53:05 +0000 (11:53 +0800)]
Merge branch 'MDL-54940-master' of https://github.com/LukeCarrier/moodle
Andrew Nicols [Tue, 21 Jun 2016 03:31:19 +0000 (11:31 +0800)]
Merge branch 'MDL-54881' of https://github.com/mr-russ/moodle
Andrew Nicols [Tue, 21 Jun 2016 03:26:42 +0000 (11:26 +0800)]
Merge branch 'MDL-54652-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 21 Jun 2016 03:18:03 +0000 (11:18 +0800)]
Merge branch 'MDL-35104-master-2' of git://github.com/cameron1729/moodle
Cameron Ball [Tue, 31 May 2016 09:56:33 +0000 (17:56 +0800)]
MDL-35104 auth: Don't allow modification of username
Presently it is either unreliable, or not possible to change
the username of a user created with an authentication plugin.
In some cases it is even hard coded to fail. Ideally we would
sync the username, and the issue MDL-21928 exists to address
that. However, in the mean time we should not allow the
username of an external user to be modified.
Andrew Nicols [Tue, 21 Jun 2016 02:30:22 +0000 (10:30 +0800)]
Merge branch 'MDL-51505-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Tue, 21 Jun 2016 01:58:18 +0000 (09:58 +0800)]
Merge branch 'MDL-54654-master' of git://github.com/danpoltawski/moodle
Simey Lameze [Tue, 21 Jun 2016 01:38:01 +0000 (09:38 +0800)]
MDL-54948 core_upgrade: fix unoconv check on the environment page
Simey Lameze [Tue, 21 Jun 2016 01:36:44 +0000 (09:36 +0800)]
MDL-54948 core_files: make the check consistent on unoconv test page
Andrew Nicols [Tue, 21 Jun 2016 01:03:48 +0000 (09:03 +0800)]
Merge branch 'wip-MDL-53399' of https://github.com/JoeyAndres/moodle
Andrew Nicols [Tue, 21 Jun 2016 00:46:38 +0000 (08:46 +0800)]
Merge branch 'wip-MDL-53292-master' of https://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 7 Jun 2016 05:26:42 +0000 (13:26 +0800)]
MDL-54778 form: Fix lots of issues with form dependencies
The original issue here was that each loop of the named values did not
check for prototypal properties. As a result, if there were input fields
with names such as 'sort', 'valueOf', 'constructor', etc. these would
return their prototypal functions instead of a falsy value, and be treated
as though they are array - hence the 'Cannot push to Function' type error.
Following on from this I discovered that the data stores were being created
as arrays, but used as objects. This can also cause issues with some form
input names -- e.g. if they are numeric.
These two issues were resolved together by correctly storing them in
objects, and checking that those objects had real properties
(hasOwnProperty). This itself has to use the prototypal function to cater
for the potential of a field name called 'hasOwnProperty'.
I also found that the instance value stores were being initialised in the
prototype (and therefore shared), which meant that there were numerous
issues if two forms were present on the same page, or one form replaced an
existing one (e.g. forms initialised in JS).
In addition, it also became apparant that several values were being used
outside of scope, or in the wrong scope. This caused further issues when
creating multiple forms on a page.
Rajesh Taneja [Thu, 9 Jun 2016 01:48:27 +0000 (09:48 +0800)]
MDL-54589 behat: Update composer to point to new tag
Russell Smith [Mon, 20 Jun 2016 22:31:26 +0000 (08:31 +1000)]
MDL-54881 quiz: Ensure user attempts are deterministic for testing.
Eloy Lafuente (stronk7) [Mon, 20 Jun 2016 22:03:45 +0000 (00:03 +0200)]
Merge branch 'MDL-37554-master-test' of git://github.com/cameron1729/moodle
AMOS bot [Mon, 20 Jun 2016 16:05:07 +0000 (00:05 +0800)]
Automatically generated installer lang files
AMOS bot [Mon, 20 Jun 2016 16:05:06 +0000 (00:05 +0800)]
Automatically generated installer lang files
Rajesh Taneja [Wed, 15 Jun 2016 01:30:50 +0000 (09:30 +0800)]
MDL-54589 behat: Fixed failures for phantomjs standalone
Rajesh Taneja [Mon, 13 Jun 2016 22:37:12 +0000 (06:37 +0800)]
MDL-54589 behat: Don't allow floating headers for behat
Rajesh Taneja [Thu, 9 Jun 2016 00:26:50 +0000 (08:26 +0800)]
MDL-54589 behat: Added hack for some OS/browsers
Pau Ferrer Ocaña [Fri, 10 Jun 2016 14:36:00 +0000 (16:36 +0200)]
MDL-54894 comments: Get course from context if not informed
Jun Pataleta [Mon, 20 Jun 2016 05:49:52 +0000 (13:49 +0800)]
MDL-54924 tool_lp: Make the url property optional
Andrew Nicols [Mon, 20 Jun 2016 06:09:54 +0000 (14:09 +0800)]
Merge branch 'wip-MDL-54590-master-test' of git://github.com/abgreeve/moodle
Vadim Dvorovenko [Sat, 28 May 2016 16:07:16 +0000 (23:07 +0700)]
MDL-54590 Installer: Additional info about database name
Additional info that creating database name containing dots is not
supported
Andrew Nicols [Mon, 20 Jun 2016 03:09:47 +0000 (11:09 +0800)]
Merge branch 'MDL-51163-master' of git://github.com/cameron1729/moodle
Rajesh Taneja [Wed, 8 Jun 2016 05:16:43 +0000 (13:16 +0800)]
MDL-54589 group: ensure loader is available before remobing
Rajesh Taneja [Wed, 8 Jun 2016 04:23:11 +0000 (12:23 +0800)]
MDL-54589 behat: Trigger change event after selecting option
After selecting option, some browsers need
explicit change event
Luke Carrier [Sun, 19 Jun 2016 16:22:17 +0000 (17:22 +0100)]
MDL-54940 behat: use the fixed step