79254 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
f8ca380b47 Merge branch 'MDL-54997-master' of git://github.com/damyon/moodle 2016-06-27 20:22:14 +02:00
Eloy Lafuente (stronk7)
74eb5bb9fe Merge branch 'MDL-54707_master' of git://github.com/dmonllao/moodle 2016-06-27 20:00:43 +02:00
Eloy Lafuente (stronk7)
0efd933a1f Merge branch 'MDL-54900-master' of git://github.com/marinaglancy/moodle 2016-06-27 18:53:23 +02:00
AMOS bot
1ac8c71f4b Automatically generated installer lang files 2016-06-28 00:05:34 +08:00
Eloy Lafuente (stronk7)
bc413a6078 Merge branch 'MDL-52887-master' of git://github.com/marinaglancy/moodle 2016-06-27 16:13:25 +02:00
Eloy Lafuente (stronk7)
f780baf063 Merge branch 'MDL-54663-master' of git://github.com/andrewnicols/moodle 2016-06-27 13:26:34 +02:00
Juan Leyva
64d2ac2145 MDL-54964 tool_mobile: Fix tests to make it work with non-core plugins 2016-06-27 09:45:23 +01:00
Pau Ferrer Ocaña
ff6de75396 MDL-54991 assign: Invalid submissiongroup when not using groups 2016-06-27 09:24:29 +02:00
Marina Glancy
17c78cceb0 MDL-54968 user: change query for resetting dashboard
In case of inconsistent data the fatal error could have happen.
Also improve performance by joining several queries into one.
2016-06-27 15:08:24 +08:00
Rajesh Taneja
e5f2478b9f 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
2016-06-27 14:30:58 +08:00
Jun Pataleta
ead440b649 MDL-55028 webservice_soap: Use strlen for setting Content-Length header 2016-06-27 13:59:20 +08:00
Andrew Nicols
623395ff7b Merge branch 'MDL-53111_m32v1' of https://github.com/sbourget/moodle 2016-06-27 13:30:51 +08:00
Mark Nelson
a802be7e39 MDL-55027 enrol_lti: avoid invalid image URL causing an exception 2016-06-27 13:27:23 +08:00
Andrew Nicols
04b189a875 Merge branch 'MDL-54924-master' of git://github.com/junpataleta/moodle 2016-06-27 12:53:35 +08:00
Marina Glancy
540200aee5 MDL-54900 mod_choice: correctly count number of answered users 2016-06-27 12:47:49 +08:00
Jun Pataleta
eb55f72d63 MDL-55022 mod_lti: Fix undefined variable 2016-06-27 11:40:03 +08:00
Andrew Nicols
607e900e2d Merge branch 'MDL-54785-master' of git://github.com/FMCorz/moodle 2016-06-27 08:59:49 +08:00
David Monllao
25ba053ff2 MDL-54707 search: Add user context to get_areas_user_accesses 2016-06-26 21:23:16 +02:00
Damyon Wiese
e824cd502d MDL-54997 competencies: Fix random unit test fail
Sorting on timecreated is not unique enough to
guarantee a predictable ordering.
2016-06-25 08:04:15 -07:00
Juan Leyva
9df9f1f096 MDL-54104 webservice: Return section number in WS get_course_contents 2016-06-24 13:55:04 +01:00
Jake Dallimore
f56cbd3bbf MDL-54610 mod_lti: Fix cartridge support for admin tool add/edit forms 2016-06-24 14:14:28 +08:00
Gilles-Philippe Leblanc
975bd11258 MDL-54755 core: Incorrect redirection after password change 2016-06-23 21:24:29 -04:00
Stephen Bourget
443ab2cea9 MDL-54911 mod_feedback: start date should be before the end date 2016-06-23 17:39:48 -04:00
Stephen Bourget
316f20a0b6 MDL-54910 mod_data: Open dates should be before close dates 2016-06-23 17:32:19 -04:00
Stephen Bourget
5d3821ebcc MDL-32135 mod_choice: Open time should be before close time 2016-06-23 17:21:27 -04:00
Damyon Wiese
da880d320c 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.
2016-06-23 09:14:19 -07:00
Pau Ferrer Ocaña
36f1d79ea2 MDL-54909 assign: Style editpdf background to differ from page bg 2016-06-23 15:06:59 +02:00
Pau Ferrer Ocaña
796161018c MDL-54855 assign: Add missing field in get_assignments 2016-06-23 15:05:17 +02:00
Brendan Heywood
a181471f4e MDL-55001 theme_clean: Avoid redirects in home url 2016-06-23 17:27:52 +10:00
Andrew Nicols
b8474fe0c7 weekly release 3.2dev 2016-06-23 14:49:30 +08:00
Andrew Nicols
de2f6d840a Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-06-23 14:49:25 +08:00
Frederic Massart
df52c272cf
MDL-54785 files: Deprecate the support for $usepost and related 2016-06-23 12:41:03 +08:00
Luca Bösch
013abd64cd 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.
2016-06-23 04:22:10 +00:00
Frederic Massart
4f9b94fdd5
Revert "MDL-44626 files: Show the PHP max upload size instead of 'unlimited'"
This reverts commit 6f0768618a38c11eca90a97c0dff31ec8ce434d1.
2016-06-23 11:51:44 +08:00
Frederic Massart
048f8073d1
Revert "Merge branch 'MDL-54110_master' of https://github.com/marxjohnson/moodle"
This reverts commit 016e0abfbc1992f01eadfdef02de6e56ffad8e9f, reversing
changes made to 58a2f0ac40f24da9c9955110902f8e14cd0d8419.
2016-06-23 11:51:44 +08:00
Frederic Massart
796f86f753
Revert "MDL-54110 repositories: Whitespace, Typo + unit test fixes"
This reverts commit 7e4d43e1a263f7003207a382251de900341db92c.
2016-06-23 11:51:44 +08:00
Andrew Nicols
0f56ea9d2f Merge branch 'MDL-54948-master-fix2' of https://github.com/lameze/moodle 2016-06-23 10:50:14 +08:00
Simey Lameze
37eafbb6dc MDL-54948 core_files: return false if theres no output from unoconv 2016-06-23 08:37:23 +08:00
Skylar Kelty
a5deab2d72 MDL-54993 search: Provide areaid parts to template 2016-06-22 14:51:59 +01:00
Andrew Nicols
797b7efc0b Merge branch 'MDL-35104-master-fix' of https://github.com/cameron1729/moodle 2016-06-22 14:57:09 +08:00
Andrew Nicols
1331869eb2 Merge branch 'MDL-54948-master-fix' of https://github.com/lameze/moodle 2016-06-22 14:43:35 +08:00
Cameron Ball
6a80681112
MDL-35104 auth: Always allow editing username for new users 2016-06-22 13:59:39 +08:00
Marina Glancy
dcd320b5ad MDL-52887 mod_choice: backup allowmultiple option 2016-06-22 13:51:36 +08:00
Simey Lameze
84440fe3d2 MDL-54948 core_upgrade: fix check_unoconv_version logic 2016-06-22 13:44:48 +08:00
Andrew Nicols
d1a62a5046 MDL-54663 forum: Correct digest link to forum preferences 2016-06-22 13:11:23 +08:00
Marina Glancy
d74d4f4aab MDL-54953 mod_chat: remove Safari hack
This hack was introduced in MDL-16878 and is not needed in modern Safari versions
but it was reported that it can breaks chat in IE
2016-06-22 12:21:40 +08:00
Andrew Nicols
6c8e98ddd2 Merge branch 'wip-mdl-53399' of https://github.com/rajeshtaneja/moodle 2016-06-22 09:10:19 +08:00
Rajesh Taneja
f34ab57411 MDL-53399 behat: Activity chooser link is removed. 2016-06-22 09:07:31 +08:00
Eloy Lafuente (stronk7)
0f20bf7507 Merge branch 'wip-mdl-54589-mac' of https://github.com/rajeshtaneja/moodle 2016-06-22 01:42:15 +02:00
Eloy Lafuente (stronk7)
e40dd1cdcd 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.
2016-06-22 01:29:51 +02:00