badaed3224
Merge branch 'MDL-56306-master' of git://github.com/danpoltawski/moodle
2016-10-06 22:25:46 +02:00
41a9a9219a
MDL-56303 quiz: lack of quiz filtering
...
Also, correctly feed completiongradeitemnumber with grade item numbers
and not with grade item ids.
2016-10-06 22:24:57 +02:00
636ec5010f
MDL-56306 tests: make upgrade_util_test compatible with travis
2016-10-06 18:01:43 +01:00
f73f938469
weekly release 3.2dev
2016-10-06 11:51:28 +02:00
b79069d233
NOBUG: Fixed file access permissions
2016-10-06 11:51:28 +02:00
a2884f8b6c
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2016-10-06 11:51:24 +02:00
c6c50e04d9
MDL-22078 lib: bump redirect_if_major_update_required()
...
Changes to the course table enforce an update
2016-10-06 09:24:52 +01:00
4dfc6a3296
Merge branch 'wip-mdl-55986-fix-2' of https://github.com/rajeshtaneja/moodle
2016-10-06 15:07:16 +08:00
f32c2fd781
MDL-55986 behat: use double quotes not single
...
On windows we need option value to be in
double quotes, else it fails
2016-10-06 15:03:56 +08:00
0223a663a9
Merge branch 'MDL-22078_master-fix' of git://github.com/dmonllao/moodle
2016-10-06 10:38:24 +08:00
a4b2896238
Merge branch 'wip-mdl-55739' of https://github.com/rajeshtaneja/moodle
2016-10-06 10:08:14 +08:00
40eea06c7d
MDL-22078 course reset: No enddate time shift if no enddate
2016-10-06 10:07:22 +08:00
16e62ecc56
MDL-55739 core_course: Check if gradepass is set and not empty
...
Default value of gradepass is 0.00000 and empty check
passes. But on oracle gradepass value is 0, so just
check if the field is set and that should be enough
2016-10-06 09:50:21 +08:00
952ffbc2b2
MDL-56092 auth_email: Correct assumed ordering in unit test
2016-10-06 09:07:08 +08:00
21d8921112
Merge branch 'wip-mdl-55713' of https://github.com/rajeshtaneja/moodle
2016-10-06 01:58:58 +02:00
904306389f
MDL-55713 behat: Include named and partial behat selector files
2016-10-06 07:55:51 +08:00
5101310d51
MDL-53777 tool_mobile: Fix incorrect and untranslated string
2016-10-06 01:48:19 +02:00
520ee366f4
Merge branch 'MDL-54802-master-fix-2' of git://github.com/cameron1729/moodle
2016-10-05 14:34:11 +01:00
2ce9628484
MDL-54802 mod_quiz: Improve validation when editing a quiz uusing require passing grade
...
When editing a quiz that is using the require passing grade completion method,
the grade to pass cannot be zero. Since the completion method is locked we
cannot recommend that the completion method is changed (as we do when the quiz
is being created). Instead we have to inform the user that the grade to pass
must not be zero.
2016-10-05 19:21:40 +08:00
adc77f07c5
Merge branch 'MDL-22078_master' of https://github.com/dmonllao/moodle
2016-10-05 12:22:07 +02:00
4f11002077
Merge branch 'MDL-54802-master-fix' of git://github.com/cameron1729/moodle
2016-10-05 10:33:14 +01:00
f3da9c49a8
Merge branch 'MDL-56194-master' of git://github.com/FMCorz/moodle
2016-10-05 10:25:30 +01:00
26cb467b47
MDL-54802 mod_quiz: Move grade to pass error to require passing grade element
...
When using a passing grade of zero, with the required passing grade
option, an error was displayed on the "grade to pass" element.
This was confusing as the error message is referring to the
"Require passing grade" element. This patch moves the message to
the "Require passing grade" element.
Additionaly this patch fixes a small typo in a comment.
2016-10-05 17:14:00 +08:00
5be1491759
Merge branch 'wip-mdl-56210-fix' of https://github.com/rajeshtaneja/moodle
2016-10-05 15:51:43 +08:00
86ebbed6ca
MDL-56210 behat: Test for disabled button later
...
With phantomjs, dom is not updated by the time
next step is executed, so suffle it to ensure
this scenario pass
2016-10-05 15:45:22 +08:00
b02c16399e
Merge branch 'MDL-55713-master-fix' of git://github.com/andrewnicols/moodle
2016-10-05 15:26:36 +08:00
d98217550b
MDL-55713 behat: Bad rebase conflict resolution fix
2016-10-05 15:19:07 +08:00
e43bab742d
Merge branch 'MDL-55129-master' of git://github.com/jleyva/moodle
2016-10-05 08:08:11 +01:00
77371e2d4a
Merge branch 'MDL-55767-master-fix1' of http://github.com/damyon/moodle
2016-10-05 14:24:09 +08:00
9b807e6dbf
MDL-55767 tool_lpimportcsv: Find existing scales on the site
...
The code was trying to match the imported scale to an existing scale for the site. It was
not loading the items before comparing them, so the matching always failed.
2016-10-05 14:23:10 +08:00
4187b3e521
MDL-55713 behat: Correct all references to selectortype
2016-10-05 14:10:26 +08:00
8643c576c7
MDL-22078 course: Complete proposed patch
...
- New site setting to define the default course duration (used to set
the default end date for some course formats)
- End date setting out of restore
- Fix tool_uploadcourse
- Other fixes here and there
2016-10-05 12:31:05 +08:00
b31984d5a2
MDL-55713
2016-10-05 11:46:49 +08:00
6ee51d010f
MDL-55713 behat: Correct copy/paste error
2016-10-05 11:04:56 +08:00
9bf212b072
Merge branch 'wip-mdl-56092' of https://github.com/rajeshtaneja/moodle
2016-10-05 10:08:15 +08:00
a4c970ff0e
MDL-56092 phpunit: Add auth/tests to phpunit.xml.dist
2016-10-05 10:03:46 +08:00
d905fc31bd
Merge branch 'wip-mdl-55986-fix' of git://github.com/rajeshtaneja/moodle
2016-10-05 09:46:36 +08:00
c7fc66f2ac
Merge branch 'MDL-45969-master' of git://github.com/damyon/moodle
2016-10-05 09:42:17 +08:00
b9b474182a
MDL-55986 behat: all options are not valid for single run
...
Sanitize options which are valid for single run only
2016-10-05 09:39:26 +08:00
2a864ee9a8
Merge branch 'MDL-56092-master' of git://github.com/jleyva/moodle
2016-10-05 08:30:35 +08:00
5bba36f63f
Merge branch 'MDL-56016-master' of git://github.com/FMCorz/moodle
2016-10-05 08:10:02 +08:00
7ad3d5db04
Merge branch 'MDL-56231-32-flexible_table-construct-phpdoc' of https://github.com/roperto/moodle
2016-10-05 01:48:49 +02:00
bd1edc8314
MDL-55713 behat: fix mistakenly broken php
2016-10-05 01:21:32 +02:00
8497955eb4
Merge branch 'MDL-56126-master' of git://github.com/jleyva/moodle
2016-10-05 01:05:27 +02:00
b976e22a7e
Merge branch 'MDL-55713-master-3' of git://github.com/andrewnicols/moodle
2016-10-05 00:34:01 +02:00
2720dce627
Merge branch 'wip-mdl-55986' of https://github.com/rajeshtaneja/moodle
2016-10-05 00:29:29 +02:00
30cdddb017
MDL-55129 mod_assign: Allow plugins to handle configs for external
...
Until now in the get_assignments WS all the settings for assignment
plugins (submission and feedback) are returned, this was bad because:
- It was returning settings for plugins that may not be enabled
- It was returning settings that would be a security risk (a third
party plugin including a password or credentials for connecting a
remote site)
- Some values was returned "raw" without further processing, for
example, maxsubmissionsizebytes returned 0 when using the plugin
default value instead a valid size
- Assignment plugins implemented an API for communication with the
external API, see for example: get_external_parameters, it didn’t make
sense had an API for the received parameters and not the returned data.
2016-10-04 20:28:38 +01:00
4089c42e12
MDL-55404 upgrade: dramatically simplify test code
...
Fixing http://xunitpatterns.com/Obscure%20Test.html
2016-10-04 20:00:59 +01:00
6658ef6cd9
Merge branch 'MDL-55404-master' of git://github.com/cameron1729/moodle
2016-10-04 18:23:36 +01:00
a57e3d3b1f
MDL-56011 lib: move Mustache loading to core_component autoloader
2016-10-04 18:17:22 +01:00
Eloy Lafuente (stronk7)