Commit graph

22260 commits

Author SHA1 Message Date
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
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
37705564ec Merge branch 'MDL-55100-master' of git://github.com/jleyva/moodle 2016-10-04 17:00:53 +01:00
Dan Poltawski
ed3956a39a Merge branch 'MDL-55861-master' of https://github.com/dj4452/moodle 2016-10-04 15:43:51 +01:00
Dan Poltawski
038dc234f6 MDL-55059 output: fix empty checks 2016-10-04 15:08:12 +01:00
Dan Poltawski
867b1fad2f Merge branch 'MDL-45890_m32v3' of https://github.com/sbourget/moodle 2016-10-04 13:11:37 +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
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
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
c9568860cb Merge branch 'wip-MDL-56012-master' of git://github.com/abgreeve/moodle 2016-10-04 09:40:34 +01:00
Andrew Nicols
1f5ae5f4e6 MDL-56010 libraries: Add missing comment back to loglevel 2016-10-04 16:33:31 +08:00
Andrew Nicols
109c3a1c57 Merge branch 'MDL-56010-master' of git://github.com/lameze/moodle 2016-10-04 16:21:05 +08:00
Simey Lameze
f2b169ec03 MDL-56010 libraries: remove jshint changes and update comment block 2016-10-04 16:05:41 +08:00
Simey Lameze
530198c98c MDL-56007 lib: Update readme_moodle.txt and thirdpartylibs.xml 2016-10-04 15:43:17 +08:00
Simey Lameze
9427ff510a MDL-56007 lib: Upgrade JQuery UI to version 1.12.1 2016-10-04 15:41:55 +08:00
Andrew Nicols
a955953c41 Merge branch 'MDL-55928-master' of git://github.com/jleyva/moodle 2016-10-04 14:59:11 +08:00
Andrew Nicols
d4566644f6 Merge branch 'MDL-56009-master' of git://github.com/lameze/moodle 2016-10-04 14:54:12 +08:00
Andrew Nicols
febceada8c Merge branch 'MDL-56000-master' of git://github.com/lameze/moodle 2016-10-04 10:59:18 +08:00
Adrian Greeve
dd9ee3d837 MDL-56012 lib: Update of readme and xml file.
Also made edits to use the PSR-4 autoloader.
2016-10-04 10:47:06 +08:00
Adrian Greeve
cd198eafd6 MDL-56012 lib: Update spout to version 2.6.0 2016-10-04 10:12:29 +08:00
Adrian Greeve
ef783842df MDL-56001 lib: Update of moodle documentation.
Update of readme_moodle.txt and thirdpartylibs.xml
with information about the update to 1.4.2
2016-10-04 10:01:15 +08:00
Adrian Greeve
d6d51786d5 MDL-56001 lib: Upgrade simplepie to 1.4.2 2016-10-04 09:59:25 +08:00
Andrew Nicols
a4bf84ebda Merge branch 'wip-MDL-31243-master' of https://github.com/Beedell/moodle 2016-10-04 09:19:42 +08:00
Andrew Nicols
520071f0bd MDL-55713 behat: Adjust how NamedPartials are loaded 2016-10-04 09:18:02 +08:00
Andrew Nicols
27ed5be84f Merge branch 'MDL-53777-master' of git://github.com/jleyva/moodle 2016-10-04 08:51:24 +08:00
Eloy Lafuente (stronk7)
b8c241b1fd Merge branch 'MDL-56172-master' of git://github.com/danpoltawski/moodle 2016-10-04 00:53:02 +02:00
Dan Poltawski
4e0f7f98ec Merge branch 'MDL-52317' of https://github.com/NeillM/moodle 2016-10-03 16:09:25 +01:00
Dan Poltawski
8ba8b13bd9 Merge branch 'MDL-55786-master' of git://github.com/jleyva/moodle 2016-10-03 15:44:40 +01:00
Juan Leyva
afb7799a6d MDL-55786 rating: New Web Service core_rating_add_rating 2016-10-03 12:22:29 +01:00
Dan Poltawski
c59a6ffd53 Merge branch 'MDL-55347-master' of git://github.com/jleyva/moodle 2016-10-03 10:31:52 +01:00
Juan Leyva
649777fb8d MDL-55347 user: New WS core_user_set_users_preferences 2016-10-03 10:22:07 +01:00
Juan Leyva
0a90f6247d MDL-53777 tool_mobile: New script for launching the mobile app 2016-10-03 10:02:33 +01:00
Juan Leyva
8a0a7414b2 MDL-53777 tool_mobile: Move mobile settings to the admin tool 2016-10-03 10:02:32 +01:00
Rajesh Taneja
a1d92ef25d
MDL-55986 behat: Fix unit tests to use fixtures 2016-10-03 15:38:24 +08:00
Rajesh Taneja
b04ca8c8a1
MDL-55986 behat: Added option to optimize parallel runs by tags
run.php should only be used for running behat
before this patch if tags were passed, then behat.yml
was being re-written with features havings tags.
As this is not ideal, this option is now removed and
features with tags will be optimally split
by init.php when --optimize-run option is passed
2016-10-03 15:38:04 +08:00
David Monllao
c41132f075 Merge branch 'MDL-55168-master' of git://github.com/danpoltawski/moodle 2016-10-03 14:33:24 +08:00
David Monllao
2e5a8fd7aa Merge branch 'wip-mdl-56210' of https://github.com/rajeshtaneja/moodle 2016-10-03 13:53:29 +08:00
Simey Lameze
bc963d98d8 MDL-56009 lib: update RequireJS to 2.3.2 2016-10-03 13:21:33 +08:00
David Monllao
7b7ddd97b9 Merge branch 'wip-MDL-55990-master' of git://github.com/marinaglancy/moodle 2016-10-03 13:00:08 +08:00
Andrew Nicols
aac3b0bebb Merge branch 'MDL-55767-master' of git://github.com/damyon/moodle 2016-10-03 12:55:06 +08:00
Jake Dallimore
d5553254e9 MDL-56010 libraries: Upgrade loglevel.js to 1.4.1 - post-import changes 2016-10-03 12:25:42 +08:00
Jake Dallimore
0b8cdaf6cb MDL-56010 libraries: Upgrade loglevel.js to 1.4.1 - library import 2016-10-03 12:23:28 +08:00
Damyon Wiese
5e4fffa013 MDL-55767 tool_lpimportcsv: import/export competency fmwks 2016-10-03 11:47:07 +08:00