moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 11:56:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79694 commits 37 branches 544 tags 1.3 GiB
Commit graph

79694 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
351e06e424 Merge branch 'MDL-54980-master' of git://github.com/jleyva/moodle 2016-07-04 14:09:43 +01:00
Dan Poltawski
a335305f46 Merge branch 'MDL-50758' of https://github.com/creator23/moodle 2016-07-04 14:08:39 +01:00
Dan Poltawski
6e57e78652 Merge branch 'MDL-55032-master' of git://github.com/marinaglancy/moodle 2016-07-04 13:28:48 +01:00
Dan Poltawski
0cf471fbdd Merge branch 'MDL-55041_master' of https://github.com/marxjohnson/moodle 2016-07-04 12:45:55 +01:00
Dan Poltawski
2e6f52212f Merge branch 'MDL-41945-master' of git://github.com/cameron1729/moodle 2016-07-04 12:39:35 +01:00
Marina Glancy
ed63718caa MDL-55069 core: escape special characters in email headers 2016-07-04 12:27:58 +01:00
Dan Poltawski
50d64a6efa Merge branch 'MDL-54794_master' of https://github.com/dg711/moodle 2016-07-04 10:52:56 +01:00
Juan Leyva
7ef49bd393 MDL-54951 webservice: Return intro text files in modules 2016-07-04 09:24:28 +01:00
Juan Leyva
ae584b3b5e MDL-54951 webservice: Utility methods for generating a list of files 
It includes a new external_files structure and a get_area_files method
in external_util
 2016-07-04 09:24:27 +01:00
Dani Palou
5609da91fa MDL-55113 assign: Use PARAM_RAW in onlinetext text 2016-07-04 09:53:36 +02:00
Andrew Nicols
e1ca4da750 MDL-55114 chat: Remove commented-out variables 2016-07-04 15:29:04 +08:00
Jun Pataleta
ca7e2fc21f MDL-55112 mod_forum: Query all forum fields to avoid debug messages 2016-07-04 15:22:56 +08:00
Andrew Nicols
bfccdb9600 Merge branch 'MDL-54953-master' of git://github.com/marinaglancy/moodle 2016-07-04 15:11:14 +08:00
Barbara Ramiro
40be0da500 MDL-54165 mod_assign: Layout icons for the new grading interface 2016-07-04 07:00:11 +00:00
Andrew Nicols
ab698201d7 Merge branch 'MDL-55049-master' of git://github.com/jleyva/moodle 2016-07-04 14:16:54 +08:00
Andrew Nicols
91dc1e8795 Merge branch 'MDL-55053-master' of git://github.com/merrill-oakland/moodle 2016-07-04 14:04:23 +08:00
Andrew Nicols
0f6f3ccc3c Merge branch 'MDL-55057_scorm_apostrophe' of git://github.com/davosmith/moodle 2016-07-04 12:59:09 +08:00
Andrew Nicols
2110dead4f Merge branch 'wip-mdl-48114' of https://github.com/rajeshtaneja/moodle 2016-07-04 12:18:34 +08:00
Andrew Nicols
97e0cc8dbe Merge branch 'MDL-55050-master' of git://github.com/danpoltawski/moodle 2016-07-04 12:16:31 +08:00
Andrew Nicols
91e46852fc Merge branch 'MDL-54877-master-clean-on-output' of git://github.com/junpataleta/moodle 2016-07-04 11:52:05 +08:00
Cameron Ball
c89d23ee6d
MDL-41945 mod_assign: Properly check if submission is empty 
Previous empty submission checks required the submission to
be saved to the database. This patch adds a new method to
submission plugins that lets them report whether the submission
is empty before it is saved.
 2016-07-04 10:55:06 +08:00
Andrew Nicols
4ffe12b0f8 Merge branch 'MDL-55020-master-pluginzip' of git://github.com/mudrd8mz/moodle 2016-07-04 10:54:59 +08:00
Cameron Ball
16b36d376a
MDL-41945 mod_assign: Check if submission has been modified 
This patch adds a check that stops a user submitting an assignment
if someone else has modified it in the meantime.
 2016-07-04 10:51:57 +08:00
Andrew Nicols
c3d8f27a95 Merge branch 'MDL-54968-master' of git://github.com/marinaglancy/moodle 2016-07-04 10:21:06 +08:00
Andrew Nicols
b4d0244b7c Merge branch 'MDL-53019' of git://github.com/stronk7/moodle 2016-07-04 09:07:39 +08:00
Eloy Lafuente (stronk7)
1de0b34bed Merge branch 'MDL-54947' of https://github.com/mr-russ/moodle 2016-07-04 01:05:12 +02:00
Stephen Bourget
1a99786ff8 MDL-48944 mod_survey: Add activity completion on submission 2016-07-03 15:34:11 -04:00
Devang Gaur
7dc0db7195 MDL-54794 user: added Users to globalsearch 2016-07-02 01:12:36 +05:30
AMOS bot
6e9f743b13 Automatically generated installer lang files 2016-07-02 00:04:54 +08:00
Mark Johnson
4d9036d6eb MDL-55041 roles: Fix JSON parsing in permission manager 2016-07-01 14:54:01 +01:00
Juan Leyva
ff092320a7 MDL-54867 webservice: Document webservice/upload.php deprecation 
The 'private' file area is not supported anymore, only 'draft' is
supported right now.
 2016-07-01 13:13:54 +01:00
Loc Nguyen
ddc9cff68b MDL-54934 workshop: indicate current phase 
Indicate phase in page titles, current phase in userplan table
so that it's accessible to me through my screen reader
 2016-07-01 19:08:53 +07:00
Eloy Lafuente (stronk7)
9f29c65180 MDL-53019 travis: adjust runs to use PHP 5.6 2016-07-01 13:58:18 +02:00
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
Eric Merrill
55b62370aa MDL-55082 search: Update core areas to return results in time ASC order 2016-06-30 11:11:35 -04: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