mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-06 17:03:33 +02:00
Code Issues Projects Releases Wiki Activity
80,597 Commits 36 Branches 529 Tags
Commit Graph

80597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
80156d01c4 Merge branch 'MDL-56095-master-2nd' of git://github.com/FMCorz/moodle 2016-10-10 10:09:46 +01:00
David Monllao
e8cd446ecd Merge branch 'MDL-45388-master' of git://github.com/danpoltawski/moodle 2016-10-10 16:59:06 +08:00
David Monllao
47e863bb73 Merge branch 'MDL-56162-master' of git://github.com/FMCorz/moodle 2016-10-10 16:48:07 +08:00
David Monllao
e84c33d694 Merge branch 'MDL-56232-master' of git://github.com/junpataleta/moodle 2016-10-10 13:27:50 +08:00
Jun Pataleta
2d3130532c MDL-56232 mod_lti: Fix logic for disabling mod_form fields 
* Disable tool "Select content" button if selected preconfigured tool
  does not support Content-Item, and if the selected option is set to
  "Automatic, based on launch URL".
* Disable tool configuration form fields if selected preconfigured tool
  does not support Content-Item, but enable these fields if the selected
  option is set to "Automatic, based on launch URL".
* Behat tests also updated to check disabling/enabling of launch url field.
 2016-10-10 13:16:25 +08:00
David Monllao
96d2a6fd5f Merge branch 'MDL-56254-master' of git://github.com/FMCorz/moodle 2016-10-10 13:01:40 +08:00
David Monllao
fae446b9cb Merge branch 'MDL-56097' of git://github.com/stronk7/moodle 2016-10-10 12:57:27 +08:00
David Monllao
cf489b75ef Merge branch 'MDL-56216-master' of git://github.com/danpoltawski/moodle 2016-10-10 12:49:07 +08:00
Frédéric Massart
82b945dbbe MDL-56095 output: Make the progress bar templatable 
The order of inclusion of weblib and outputlib had to change
as the progress_bar (weblib) uses interfaces defined in outputlib.
 2016-10-07 16:40:38 +02:00
Eloy Lafuente (stronk7)
85ef6fe2d9 MDL-56097 install: update the list of stale files for 3.2 2016-10-07 00:41:11 +02:00
Eloy Lafuente (stronk7)
d9520bc04e weekly release 3.2dev 2016-10-06 22:31:27 +02:00
Eloy Lafuente (stronk7)
badaed3224 Merge branch 'MDL-56306-master' of git://github.com/danpoltawski/moodle 2016-10-06 22:25:46 +02:00
Dan Poltawski
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
Dan Poltawski
636ec5010f MDL-56306 tests: make upgrade_util_test compatible with travis 2016-10-06 18:01:43 +01:00
Dan Poltawski
586cf92909 MDL-45388 admin: warn of themedesignermode in /admin/ and perf footer 
This is:
a) To help avoid devs going on a wild goose chase to find a perf issue
when it's caused by css building
b) To make it clearer that this should never be enabled on production
sites (we already have a warning in the performance report, but who
looks at that)

Now that boost is the default theme and builds css itself, it's more
critical.
 2016-10-06 11:49:17 +01:00
Eloy Lafuente (stronk7)
f73f938469 weekly release 3.2dev 2016-10-06 11:51:28 +02:00
Eloy Lafuente (stronk7)
b79069d233 NOBUG: Fixed file access permissions 2016-10-06 11:51:28 +02:00
Eloy Lafuente (stronk7)
a2884f8b6c Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-10-06 11:51:24 +02:00
Dan Poltawski
47c12e2095 MDL-56216 theme_boost: correct favicon 2016-10-06 10:45:24 +01:00
Dan Poltawski
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
Andrew Nicols
4dfc6a3296 Merge branch 'wip-mdl-55986-fix-2' of https://github.com/rajeshtaneja/moodle 2016-10-06 15:07:16 +08:00
Rajesh Taneja
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
Andrew Nicols
0223a663a9 Merge branch 'MDL-22078_master-fix' of git://github.com/dmonllao/moodle 2016-10-06 10:38:24 +08:00
Andrew Nicols
a4b2896238 Merge branch 'wip-mdl-55739' of https://github.com/rajeshtaneja/moodle 2016-10-06 10:08:14 +08:00
David Monllao
40eea06c7d MDL-22078 course reset: No enddate time shift if no enddate 2016-10-06 10:07:22 +08:00
Rajesh Taneja
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
Andrew Nicols
952ffbc2b2 MDL-56092 auth_email: Correct assumed ordering in unit test 2016-10-06 09:07:08 +08:00
Eloy Lafuente (stronk7)
21d8921112 Merge branch 'wip-mdl-55713' of https://github.com/rajeshtaneja/moodle 2016-10-06 01:58:58 +02:00
Rajesh Taneja
904306389f
MDL-55713 behat: Include named and partial behat selector files 2016-10-06 07:55:51 +08:00
Juan Leyva
5101310d51 MDL-53777 tool_mobile: Fix incorrect and untranslated string 2016-10-06 01:48:19 +02:00
Dan Poltawski
520ee366f4 Merge branch 'MDL-54802-master-fix-2' of git://github.com/cameron1729/moodle 2016-10-05 14:34:11 +01:00
Cameron Ball
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
Eloy Lafuente (stronk7)
adc77f07c5 Merge branch 'MDL-22078_master' of https://github.com/dmonllao/moodle 2016-10-05 12:22:07 +02:00
Frédéric Massart
d2e09f2b08 MDL-56162 theme_boost: Moodle modals are working and styled for Boost 2016-10-05 12:15:33 +02:00
Dan Poltawski
4f11002077 Merge branch 'MDL-54802-master-fix' of git://github.com/cameron1729/moodle 2016-10-05 10:33:14 +01:00
Dan Poltawski
f3da9c49a8 Merge branch 'MDL-56194-master' of git://github.com/FMCorz/moodle 2016-10-05 10:25:30 +01:00
Cameron Ball
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
David Monllao
5be1491759 Merge branch 'wip-mdl-56210-fix' of https://github.com/rajeshtaneja/moodle 2016-10-05 15:51:43 +08:00
Rajesh Taneja
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
David Monllao
b02c16399e Merge branch 'MDL-55713-master-fix' of git://github.com/andrewnicols/moodle 2016-10-05 15:26:36 +08:00
Andrew Nicols
d98217550b MDL-55713 behat: Bad rebase conflict resolution fix 2016-10-05 15:19:07 +08:00
Dan Poltawski
e43bab742d Merge branch 'MDL-55129-master' of git://github.com/jleyva/moodle 2016-10-05 08:08:11 +01:00
Andrew Nicols
77371e2d4a Merge branch 'MDL-55767-master-fix1' of http://github.com/damyon/moodle 2016-10-05 14:24:09 +08:00
Damyon Wiese
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
Andrew Nicols
4187b3e521 MDL-55713 behat: Correct all references to selectortype 2016-10-05 14:10:26 +08:00
David Monllao
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
Andrew Nicols
b31984d5a2 MDL-55713 2016-10-05 11:46:49 +08:00
Andrew Nicols
6ee51d010f MDL-55713 behat: Correct copy/paste error 2016-10-05 11:04:56 +08:00
Andrew Nicols
9bf212b072 Merge branch 'wip-mdl-56092' of https://github.com/rajeshtaneja/moodle 2016-10-05 10:08:15 +08:00
Rajesh Taneja
a4c970ff0e
MDL-56092 phpunit: Add auth/tests to phpunit.xml.dist 2016-10-05 10:03:46 +08:00