Commit graph

80254 commits

Author SHA1 Message Date
Damyon Wiese
fca211bf05 MDL-55374 mod_assign: Force utf-8 for DOMDocument
This prevents charset issues on some sites.
2016-07-29 10:43:25 +08:00
Andrew Nicols
56b9e796af MDL-24343 core: Deprecate zip_files 2016-07-29 08:15:16 +08:00
AMOS bot
72da3d5ef2 Automatically generated installer lang files 2016-07-29 00:05:37 +08:00
Juan Leyva
45fec98358 MDL-55266 user: New WS core_user_get_user_preferences 2016-07-28 12:08:58 +02:00
Juan Leyva
145900708c MDL-54941 webservice: Refactor file handling in WS
This commit reduces boilerplate code.
It also forces WS returning files to always return the following
fields: filename, filepath, mimetype, filesize, timemodified and
fileurl.
2016-07-28 12:07:04 +02:00
Dani Palou
3b40103c2f MDL-55348 wiki: Convert 'section' WS params to PARAM_RAW 2016-07-28 10:35:24 +02:00
David Mudrák
aea8c5541e MDL-55360 workshop: Add tests for setting grades to pass via mod form
These scenarios should cover common cases of defining the grades to pass
pass via the workshop settings form. Note that behaviour of the fields
in terms of locale-specific decimals input (MDL-51806) is not covered
with these tests as I want to avoid installation of additional language
pack. Instead, I assume that functionality of unformat_float() is tested
separately in the core.
2016-07-28 09:54:43 +02:00
David Mudrák
3c4cc10eff MDL-55360 workshop: Emptying grades to pass should set them to zero
When editing existing workshop with a grade to pass defined, when the
field is emptied, it should be interpreted as setting it to zero. This
was not happening because unformat_float replaces the field with null,
therefore effectively unsetting it.

By casting to float, we interpret all empty values (including null) as
zeros. This behaviour is consistent with how gradebook setup UI works.
2016-07-28 09:54:43 +02:00
David Mudrák
ebf0598e21 MDL-55360 workshop: Allow creating workshops with empty grades to pass
As a regression of MDL-55360, it was not possible to create new
workshops if the field "Submission grade to pass" or "Assessment grade
to pass" was left empty. The validation failed with "You must enter a
number here".

The fields submissiongradepass and gradinggradepass are always present
as we explicitly define them in the mod form. So the isset() condition
in the validation was useless and it did not allow to submit the form
with these fields empty.

Additionally, the unformat_float() returns null only if it receives
empty value on the input. Which can't happen in our case so I am
removing this condition to improve the readability of the code.
2016-07-28 09:54:43 +02:00
David Mudrák
87b5c584fb MDL-55289 workshop: Fix files processing in example submissions
While testing the issue MDL-55289 I realized that attaching files to
workshop example submissions does not work at all and throws an error.

The reason was that in MDL-50794 (996f7e82), the variables $contentopts
and $attachmentopts were replaced with the result of the methods
submission_content_options() and submission_attachment_options().
But I forgot to perform the full refactoring in exsubmission.php too.

Attached behat test should cover both issues on this branch.
2016-07-28 09:51:16 +02:00
David Mudrák
21d49a3f93 MDL-55289 workshop: Include repository/lib.php to use its constants
As a result of MDL-41556 (146893d6), the repository/lib.php was included
in submission.php so that its constant FILE_INTERNAL could be used in
field options. Recent development in MDL-50794 (996f7e8) moved the
options declaration to standalone methods but we forgot to check they
work in exsubmission.php too.

This patch moves the repository/lib.php inclusion to where the
library is actually needed.

Additionally it unifies how options are set for overall feedback content
and overall feedback attachment fields.
2016-07-28 09:51:16 +02:00
Jun Pataleta
fe15136d37 MDL-55323 enrol_lti: Remove unused required parameter 2016-07-28 14:44:58 +08:00
Jun Pataleta
7a05bc92c9 MDL-55276 html: New down arrow entity output $OUTPUT->darrow 2016-07-28 14:43:11 +08:00
Jun Pataleta
653b8ef24b MDL-54879 mod_lti: Add fallback options for error message upon failure 2016-07-28 14:38:29 +08:00
David Monllao
d1a3ea62ef weekly release 3.2dev 2016-07-28 12:07:20 +08:00
David Mudrák
0d7c417175 MDL-55166 admin: Fix display of misleading debug warning on manage block
Blocks can declare has_config() as true without actually using the
default node in the admin tree. Typical use case is when the block
injects its settings to other parts of the admin tree and it assigns
null to its $setting node in its settings.php file.

As Janek L.B. correctly spotted, this led to false debugging message
on admin/blocks.php as the code interpreted it as missing settings.php
file.

The patch adds explicit file existence test for this rare case.
2016-07-27 23:15:48 +02:00
Mark Nielsen
123cc912ec MDL-55314 mod_lti: Several fixes to lti_load_cartridge
* Fixed XML loading when there is an error
* Fixed exception thrown by lti_load_cartridge
* By default, don't allow LTI mod generator to
  use a toolurl as that results in a cURL call.
2016-07-27 09:08:21 -07:00
Dani Palou
33ef5cdcf9 MDL-54862 quiz: Return question blocked status in WS 2016-07-27 15:38:01 +02:00
Dani Palou
38b1f8fd99 MDL-55225 assign: Format assignment submission text in WS 2016-07-27 13:30:47 +02:00
Stephen Bourget
2ff504c6b2 MDL-55140 mod_choice: Allow independent open and close dates 2016-07-27 07:18:54 -04:00
Dan Poltawski
fdf50e35b6 Merge branch 'MDL-55287_master-fix' of git://github.com/dmonllao/moodle 2016-07-27 07:58:33 +01:00
David Monllao
e240a6132d MDL-55287 search: Custom error message if solr extension is not installed
Correcting engine is not installed lang string as well.
2016-07-27 13:57:15 +08:00
David Monllao
52872f66eb Merge branch 'wip-mdl-54987' of https://github.com/rajeshtaneja/moodle 2016-07-27 13:17:33 +08:00
Mark Nelson
e1f53120dd MDL-54984 core_cache: corrected exception message 2016-07-27 11:42:47 +08:00
Rajesh Taneja
35f7cf429c
MDL-54987 behat: Fixed feedback scenarios to display chart data
Now chart data is not visible by default,
we need to click 'Show chart data' to view.
Also, extra space is not required between
% as it's done by chart library
2016-07-27 11:00:54 +08:00
Eloy Lafuente (stronk7)
bdce994c5f Merge branch 'MDL-50267-master' of git://github.com/junpataleta/moodle 2016-07-27 00:59:19 +02:00
Eloy Lafuente (stronk7)
ddf1d5c692 Merge branch 'MDL-55244-master' of git://github.com/danpoltawski/moodle 2016-07-27 00:19:40 +02:00
Eloy Lafuente (stronk7)
7b146b5005 Merge branch 'MDL-55245-master' of https://github.com/lucisgit/moodle 2016-07-26 23:44:54 +02:00
Eloy Lafuente (stronk7)
e90c60696a Merge branch 'wip-MDL-51735-master' of git://github.com/abgreeve/moodle 2016-07-26 20:15:13 +02:00
Eloy Lafuente (stronk7)
f9c46195e4 Merge branch 'MDL-54657_m32v1' of https://github.com/sbourget/moodle 2016-07-26 19:56:20 +02:00
Eloy Lafuente (stronk7)
7647f3887f Merge branch 'MDL-54801-master' of git://github.com/jleyva/moodle 2016-07-26 19:54:53 +02:00
Eloy Lafuente (stronk7)
17b2cd6839 MDL-55046 assign: document the new return values 2016-07-26 19:45:18 +02:00
Eloy Lafuente (stronk7)
e23faa4c81 Merge branch 'MDL-55046-master' of git://github.com/dpalou/moodle 2016-07-26 19:40:52 +02:00
Eloy Lafuente (stronk7)
8b13e09595 Merge branch 'wip-mdl-55337' of https://github.com/rajeshtaneja/moodle 2016-07-26 13:12:07 +02:00
Rajesh Taneja
4505459083
MDL-55337 behat: Added 1 sec delay between post
Ensure post is created at different timestamp, else
returned posts will be different and test fails.
This will happen on a fast machine.
2016-07-26 18:59:51 +08:00
Dan Poltawski
773a11519d Merge branch 'MDL-55278_master' of https://github.com/dmonllao/moodle 2016-07-26 11:57:09 +01:00
Dan Poltawski
be5837d797 Merge branch 'MDL-54987-master-fixes' of https://github.com/lameze/moodle 2016-07-26 09:55:33 +01:00
Dan Poltawski
3624777b24 Merge branch 'MDL-54984-master' of git://github.com/junpataleta/moodle 2016-07-26 09:52:42 +01:00
Dan Poltawski
970c8e5ba4 MDL-49533 version: bump 2016-07-26 09:41:24 +01:00
Dan Poltawski
e799990454 Merge branch 'MDL-49533-master' of git://github.com/andrewnicols/moodle 2016-07-26 09:40:17 +01:00
Simey Lameze
e747d65514 MDL-54987 mod_choice: Fix notices and behat failures 2016-07-26 16:24:35 +08:00
Dan Poltawski
d0733c7d69 Merge branch 'MDL-50051-master' of git://github.com/junpataleta/moodle 2016-07-26 09:14:45 +01:00
Dan Poltawski
6d5a7eee0c Merge branch 'MDL-54988-master' of git://github.com/junpataleta/moodle 2016-07-26 09:13:10 +01:00
Jun Pataleta
fb77333453 MDL-50267 lang: Remove deprecated strings in 2.9 2016-07-26 16:03:32 +08:00
David Monllao
72e92d0ac2 Merge branch 'MDL-55325-master' of https://github.com/xow/moodle 2016-07-26 10:33:21 +08:00
David Monllao
837cec00f9 Merge branch 'wip-mdl-55091-m' of https://github.com/rajeshtaneja/moodle
Conflicts:
	lib/upgrade.txt
2016-07-26 10:14:30 +08:00
Rajesh Taneja
52f3e060e4
MDL-55091 phpunit: Following has been deprecated.
1. getMock()
2. setExpectedException()
3. checkForUnintentionallyCoveredCode renamed to beStrictAboutCoversAnnotation
4. beStrictAboutTestSize renamed to enforceTimeLimit
5. UnitTestCase class is now fully removed.
2016-07-26 10:11:30 +08:00
David Monllao
1a9c3d587f Merge branch 'wip-MDL-55183-master' of git://github.com/abgreeve/moodle
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2016-07-26 09:52:51 +08:00
Andrew Nicols
f1f94da496 MDL-49533 repository: Remove the Alfresco plugin
The SDK that this plugin was designed around is not compatible with recent
versions of Alfresco so the decisio has been made to move the repository to
the plugins database.
2016-07-26 08:57:34 +08:00
David Monllao
db044a0997 Merge branch 'MDL-55251_m32v1' of https://github.com/sbourget/moodle 2016-07-26 05:12:00 +08:00