mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
80,552 Commits 36 Branches 519 Tags
Commit Graph

80552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
David Monllao
d905fc31bd Merge branch 'wip-mdl-55986-fix' of git://github.com/rajeshtaneja/moodle 2016-10-05 09:46:36 +08:00
David Monllao
c7fc66f2ac Merge branch 'MDL-45969-master' of git://github.com/damyon/moodle 2016-10-05 09:42:17 +08:00
Rajesh Taneja
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
Andrew Nicols
2a864ee9a8 Merge branch 'MDL-56092-master' of git://github.com/jleyva/moodle 2016-10-05 08:30:35 +08:00
Andrew Nicols
5bba36f63f Merge branch 'MDL-56016-master' of git://github.com/FMCorz/moodle 2016-10-05 08:10:02 +08:00
Eloy Lafuente (stronk7)
7ad3d5db04 Merge branch 'MDL-56231-32-flexible_table-construct-phpdoc' of https://github.com/roperto/moodle 2016-10-05 01:48:49 +02:00
Eloy Lafuente (stronk7)
bd1edc8314 MDL-55713 behat: fix mistakenly broken php 2016-10-05 01:21:32 +02:00
Eloy Lafuente (stronk7)
8497955eb4 Merge branch 'MDL-56126-master' of git://github.com/jleyva/moodle 2016-10-05 01:05:27 +02:00
Eloy Lafuente (stronk7)
b976e22a7e Merge branch 'MDL-55713-master-3' of git://github.com/andrewnicols/moodle 2016-10-05 00:34:01 +02:00
Eloy Lafuente (stronk7)
2720dce627 Merge branch 'wip-mdl-55986' of https://github.com/rajeshtaneja/moodle 2016-10-05 00:29:29 +02:00
Juan Leyva
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
Dan Poltawski
4089c42e12 MDL-55404 upgrade: dramatically simplify test code 
Fixing http://xunitpatterns.com/Obscure%20Test.html
 2016-10-04 20:00:59 +01:00
Dan Poltawski
6658ef6cd9 Merge branch 'MDL-55404-master' of git://github.com/cameron1729/moodle 2016-10-04 18:23:36 +01:00
Dan Poltawski
a57e3d3b1f MDL-56011 lib: move Mustache loading to core_component autoloader 2016-10-04 18:17:22 +01:00
Dan Poltawski
38c1cbceb7 Merge branch 'MDL-56011-master' of https://github.com/snake/moodle 2016-10-04 18:16:04 +01:00
Dan Poltawski
55e8426f73 MDL-55739 course: more whitespace 2016-10-04 18:12:41 +01:00
Dan Poltawski
c7ecbc9e3d MDL-55739 course: fix trailing whitespace 2016-10-04 18:07:08 +01:00
Dan Poltawski
742d23c68f Merge branch 'MDL-55739-master' of git://github.com/jleyva/moodle 2016-10-04 17:58:27 +01:00
Dan Poltawski
37705564ec Merge branch 'MDL-55100-master' of git://github.com/jleyva/moodle 2016-10-04 17:00:53 +01:00
Dan Poltawski
eedf01895e Merge branch 'MDL-54866-master' of git://github.com/jleyva/moodle 2016-10-04 15:50:44 +01:00
Dan Poltawski
ed3956a39a Merge branch 'MDL-55861-master' of https://github.com/dj4452/moodle 2016-10-04 15:43:51 +01:00
Eloy Lafuente (stronk7)
461e98cdd7 Merge branch 'MDL-56069' of git://github.com/timhunt/moodle 2016-10-04 16:34:50 +02:00
Eloy Lafuente (stronk7)
aef4de1b61 Merge branch 'empty-checks' of https://github.com/danpoltawski/moodle 2016-10-04 16:16:36 +02:00
Dan Poltawski
038dc234f6 MDL-55059 output: fix empty checks 2016-10-04 15:08:12 +01:00
Andrew Nicols
5736b0e15d Merge branch 'MDL-56168-master-fixup' of https://github.com/FMCorz/moodle 2016-10-04 20:54:27 +08:00
Dan Poltawski
d6c8732844 Merge branch 'wip-mdl-55769' of https://github.com/rajeshtaneja/moodle 2016-10-04 13:13:26 +01:00
Dan Poltawski
867b1fad2f Merge branch 'MDL-45890_m32v3' of https://github.com/sbourget/moodle 2016-10-04 13:11:37 +01:00
Juan Leyva
796876b0ab MDL-55739 course: Update get_course_module to return new data 2016-10-04 13:00:35 +01:00
Dan Poltawski
a553501042 Merge branch 'wip-MDL-56001-master' of git://github.com/abgreeve/moodle 2016-10-04 12:42:25 +01:00
Juan Leyva
7c1cb3bf5a MDL-54866 tool_mobile: Rename WS get_site_public_settings 2016-10-04 12:14:10 +01:00
Juan Leyva
6b4926281b MDL-54866 tool_mobile: New Web Service tool_mobile_get_config 2016-10-04 12:09:02 +01:00
Juan Leyva
5c6daf139d MDL-55059 tool_mobile: Support Smart App Banners for iOs 2016-10-04 11:49:34 +01:00
Dan Poltawski
43cb92b4b0 MDL-56007 jquery: add back non-minified files 
Sorry Simey, I lead you astray (detected by unit tests)
 2016-10-04 11:16:29 +01:00
Dan Poltawski
93835cab84 Merge branch 'MDL-56257-master' of git://github.com/FMCorz/moodle 2016-10-04 10:57:35 +01:00
Frédéric Massart
5f22879c3d MDL-56257 theme_boost: Killing that typo monster 2016-10-04 11:37:37 +02:00
Dan Poltawski
8e8b46cd87 Merge branch 'MDL-55226_master' of git://github.com/lazydaisy/moodle 2016-10-04 10:37:36 +01:00
Dan Poltawski
a5a86826fd Merge branch 'MDL-56007-master' of git://github.com/lameze/moodle 2016-10-04 10:29:42 +01:00
Juan Leyva
3e8145a37a MDL-56126 user: New WS core_user_agree_site_policy 
This commit includes a change in moodlelib to throw the
sitepolicynotagreed exception in a way that can be captured and
identified by external systems.
 2016-10-04 10:20:59 +01:00
Dan Poltawski
917a59a1a0 Merge branch 'MDL-55728-master' of git://github.com/jleyva/moodle 2016-10-04 10:15:37 +01:00
Juan Leyva
83e4dc1796 MDL-56092 core_auth: New WS core_auth_confirm_user 2016-10-04 09:50:32 +01:00