Commit graph

79305 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
59f22d4b19 MDL-53019 environment: 3.2 requirements added
Changes:
 - PHP 5.6.5 required
2016-07-01 13:44:36 +02:00
Eloy Lafuente (stronk7)
a763bb0553 MDL-54994 badges: Count correctly the number of external badges shown 2016-07-01 13:40:47 +02:00
Jun Pataleta
9f83ce7e0c MDL-54976 mod_scorm: Add validation for availability dates 2016-07-01 14:50:20 +08:00
Jake Dallimore
9e12b0faf7 MDL-54795 mod_assign: Fix notifications JS error in grading interface 2016-07-01 13:49:02 +08:00
Dani Palou
3ce71f4eef MDL-54928 notifications: Retrieve username from DB if empty 2016-07-01 07:45:21 +02:00
Marina Glancy
799e001c15 MDL-55032 tool_lp: check access when showing link to competencies
Also if course competencies page is accessed without capabilities do
redirect before starting output.
2016-07-01 13:42:27 +08:00
Andrew Nicols
ac8d6cff54 weekly release 3.2dev 2016-07-01 10:20:17 +08:00
Andrew Nicols
762499bcd4 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-07-01 10:20:11 +08:00
David Mudrák
2785fd193d MDL-55020 admin: Fix renaming of the plugin package root folder
There was a problem with core\update\code_manager::unzip_plugin_file()
if it was used to extract a plugin package into a non-empty target
directory and the plugin package root folder was being renamed at the
same time.

The problem was caused by the underlying helper method
rename_extracted_rootdir() that worked only for ZIPs extracted to an
empty temporary location. When the plugin was extracted to the actual
dirroot with other existing plugin folders present, the method failed
badly.

The solution in the patch is to always extract the ZIP into a temporary
empty location, perform the eventual root renaming there, and only then
move the extracted contents to the final destination. Additionally we
are changing the behaviour of the rename_extracted_rootdir() method so
that now it throws exception if the plugin package contains multiple
root folders (it should not happen in normal situations as such a plugin
would not pass the pre-install validation).

Unit tests did not catch this bug before because in the tests, the
target directory had been empty. Now we are adding a new directory
"aaa_another" to the target location to test in more realistic
environment. Tests for the new behaviour of the renaming method are
added, too.

p.s. I noticed that moodle_exception class was not imported into the
namespace and this is fixed now too (and covered with unit tests).
2016-07-01 01:13:21 +02:00
Anant
4358ee3892 MDL-50758 qtype_multichoice: Displays multiple correct answers 2016-06-30 10:40:38 -07:00
Juan Leyva
b8b1be1554 MDL-49244 course: Clean parameters in core_course_get_categories 2016-06-30 13:26:54 +01:00
Dan Poltawski
1fe7dfd9f0 MDL-32135 mod_choice: fix behat tests 2016-06-30 09:24:59 +01:00
Stephen Bourget
7c2041b64d MDL-32135 mod_choice: update behat tests 2016-06-30 09:24:59 +01:00
Andrew Nicols
48d1322527 Merge branch 'MDL-54610_master' of https://github.com/snake/moodle 2016-06-30 09:24:58 +01:00
Eloy Lafuente (stronk7)
47d986828e Merge branch 'wip-MDL-47113-master' of git://github.com/abgreeve/moodle 2016-06-30 09:24:58 +01:00
Eloy Lafuente (stronk7)
4a365babb6 Merge branch 'MDL-54855-master' of git://github.com/crazyserver/moodle 2016-06-30 09:24:57 +01:00
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
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