Commit graph

79694 commits

Author SHA1 Message Date
Dan Poltawski
41c18b9681 Merge branch 'MDL-54104-master' of git://github.com/jleyva/moodle 2016-06-30 09:24:57 +01:00
Dan Poltawski
ab8ef75406 Merge branch 'MDL-55022-master' of git://github.com/junpataleta/moodle 2016-06-30 09:24:56 +01:00
Dan Poltawski
941b725693 Merge branch 'MDL-55027_master' of git://github.com/markn86/moodle 2016-06-30 09:24:56 +01:00
Dan Poltawski
5fd469e921 Merge branch 'MDL-54993' of https://github.com/sk-unikent/moodle 2016-06-30 09:24:56 +01:00
Dan Poltawski
bb2c042b96 Merge branch 'MDL-32135_m32v2' of https://github.com/sbourget/moodle 2016-06-30 09:24:55 +01:00
Dan Poltawski
be7d86e8ce Merge branch 'MDL-54865-master' of git://github.com/ryanwyllie/moodle 2016-06-30 09:24:55 +01:00
Dan Poltawski
5f4d957c21 MDL-54889 jshint: stop using for everything but shifter
Now jshint has been replaced by eslint.
2016-06-30 09:14:57 +01:00
Jun Pataleta
5c1b749d55 MDL-54877 mod_lti: Clean LTI tool type name and description on output
* Use clean_param() for name and description when displaying the tool type.
    Basically in the following functions:
    - serialise_tool_type()
    - lti_get_configured_types()
* Changed name and description's type from PARAM_TEXT to PARAM_RAW
    in tool update parameters.
* Changed name and description's type from PARAM_TEXT to PARAM_RAW
   in mod_lti_external::tool_type_return_structure()
2016-06-30 15:55:43 +08:00
Russell Smith
1b0b082a08 MDL-54947 database: Update PostgreSQL binary handling.
PostgreSQL 9.1 allows hex formating for binary which is handled better
by pg_query_params().

Getting bytea isn't required on connection, it can be used as pg_field_type()
when binary needs to be checked.
2016-06-30 12:58:53 +10:00
Davo Smith
3bc7382d10 MDL-55057 mod_scorm: fix handling of SCO identifiers with apostrophes 2016-06-29 08:44:24 +01:00
Dan Poltawski
77369c8171 Merge branch 'MDL-54868-master' of git://github.com/cameron1729/moodle 2016-06-29 15:05:26 +08:00
Dan Poltawski
ce63e9b2d7 Merge branch 'MDL-55002-master-enfix' of git://github.com/mudrd8mz/moodle 2016-06-29 15:05:25 +08:00
Andrew Nicols
ea5241410d Merge branch 'MDL-54991-master' of git://github.com/crazyserver/moodle 2016-06-29 15:05:24 +08:00
Andrew Nicols
df4b55e05b Merge branch 'MDL-54909-master' of git://github.com/crazyserver/moodle 2016-06-29 15:05:23 +08:00
Andrew Nicols
628c52e465 Merge branch 'MDL-54601-master' of git://github.com/jleyva/moodle 2016-06-29 15:05:22 +08:00
Andrew Nicols
3654734601 Merge branch 'MDL-54910_m32v2' of https://github.com/sbourget/moodle 2016-06-29 15:05:20 +08:00
Andrew Nicols
be88488274 Merge branch 'MDL-54911_m32v3' of https://github.com/sbourget/moodle 2016-06-29 15:05:19 +08:00
Andrew Nicols
53190b8077 MDL-54755 core: Correct behat language 2016-06-29 15:05:18 +08:00
Andrew Nicols
ffcbabcdd0 Merge branch 'MDL-54755_master' of https://github.com/StudiUM/moodle 2016-06-29 15:05:17 +08:00
Andrew Nicols
e1ac41ecc4 Merge branch 'MDL-54935_m32v1' of git://github.com/sbourget/moodle 2016-06-29 15:05:16 +08:00
Andrew Nicols
e683c0837c Merge branch 'MDL-54964-master' of git://github.com/jleyva/moodle 2016-06-29 15:05:15 +08:00
Andrew Nicols
f9cabe8f99 Merge branch 'wip-mdl-54974' of https://github.com/rajeshtaneja/moodle 2016-06-29 15:05:13 +08:00
Eric Merrill
a02fe723dd MDL-55053 search: Display search areas in alphabetical order 2016-06-28 17:19:09 -04:00
Eric Merrill
4e2b5191d4 MDL-54926 search: Reduce over-escaping in results 2016-06-28 16:33:29 -04:00
Dan Poltawski
a382101c6e MDL-55050 grunt: make eslint only build changed files on watch
Previously a watch change was causing eslint to be re-run on every file.
2016-06-28 18:21:29 +01:00
Juan Leyva
7a8744dba7 MDL-55049 webservice: Scan for viruses in webservice/upload.php 2016-06-28 16:14:16 +01:00
Cameron Ball
94ada0eaf7
MDL-54868 webservice_xmlrpc: Don't escape non-ascii characters 2016-06-28 14:41:20 +08:00
David Mudrák
46994de566 MDL-55002 lang: Fix behat scenarios using modified strings 2016-06-27 22:57:34 +02:00
Eloy Lafuente (stronk7)
22a0896767 Merge branch 'MDL-55028-master' of git://github.com/junpataleta/moodle 2016-06-27 22:13:48 +02:00
Helen Foster
25558b808e MDL-55002 lang: Merge English strings from the en_fix language pack 2016-06-27 22:03:40 +02:00
Eloy Lafuente (stronk7)
d4ca1215bb Merge branch 'MDL-54599-31' of git://github.com/vadimonus/moodle 2016-06-27 20:38:18 +02:00
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
Juan Leyva
5b76f88cb5 MDL-54602 webservice: Remove core_grades_update_grades from mobile 2016-06-27 08:44:11 +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