Commit graph

80696 commits

Author SHA1 Message Date
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
948673efae Merge branch 'MDL-55886-master' of git://github.com/danpoltawski/moodle 2016-10-04 11:20:24 +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
Andrew Nicols
eba8a38200 Merge branch 'MDL-56056-master' of git://github.com/FMCorz/moodle 2016-10-04 10:35:25 +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
c8379882b8 Merge branch 'MDL-56198' of git://github.com/timhunt/moodle 2016-10-04 09:01:25 +08:00
Andrew Nicols
2e80ff16dd MDL-53777 tool_mobile: Adjust langstring 2016-10-04 08:53:19 +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
Eloy Lafuente (stronk7)
8f900947e9 Merge branch 'MDL-56166-master' of git://github.com/FMCorz/moodle 2016-10-04 00:41:00 +02:00
Eloy Lafuente (stronk7)
ed66d725e6 Merge branch 'MDL-56160-master' of git://github.com/dpalou/moodle 2016-10-04 00:39:06 +02:00
Juan Leyva
c8743f62b4 MDL-55728 webservice: Return editor files in Web Services 2016-10-03 16:49:13 +01:00
Dan Poltawski
e22ce8ab82 Merge branch 'MDL-56181-master-czechia' of git://github.com/mudrd8mz/moodle 2016-10-03 16:43:52 +01:00
Dan Poltawski
b9c3211c92 Merge branch 'MDL-56143-master-typo-boost' of git://github.com/mudrd8mz/moodle 2016-10-03 16:42:39 +01:00
Dan Poltawski
4e0f7f98ec Merge branch 'MDL-52317' of https://github.com/NeillM/moodle 2016-10-03 16:09:25 +01:00
Tim Hunt
9bee35d5ad MDL-56198 assignment: improve grading info responsiveness 2016-10-03 16:09:21 +01:00
Dan Poltawski
8ba8b13bd9 Merge branch 'MDL-55786-master' of git://github.com/jleyva/moodle 2016-10-03 15:44:40 +01:00
Dan Poltawski
2d71da6851 Merge branch 'MDL-54802-master' of git://github.com/lameze/moodle 2016-10-03 14:46:43 +01:00
Juan Leyva
afb7799a6d MDL-55786 rating: New Web Service core_rating_add_rating 2016-10-03 12:22:29 +01:00
Juan Leyva
a497458c89 MDL-55786 rating: Move common code to new function 2016-10-03 12:17:09 +01:00
Dan Poltawski
5e0e9f3674 MDL-55740 mod_assign: bump version 2016-10-03 11:18:43 +01:00
Dan Poltawski
b885488c02 Merge branch 'MDL-55740-master' of git://github.com/jleyva/moodle 2016-10-03 11:16:09 +01:00
Dan Poltawski
c59a6ffd53 Merge branch 'MDL-55347-master' of git://github.com/jleyva/moodle 2016-10-03 10:31:52 +01:00
Dan Poltawski
3324250395 Merge branch 'wip-MDL-55911-master' of https://github.com/Beedell/moodle 2016-10-03 10:24:59 +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
c951f1fe58 MDL-53777 tool_mobile: New setting typeoflogin, including WS 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
Andrew Nicols
cd40761f63 Merge branch 'MDL-56003-master-int' of https://github.com/FMCorz/moodle 2016-10-03 15:57:46 +08:00
Frédéric Massart
13ca1c3101 MDL-56003 theme_boost: Update thirdpartylib.xml to reflect BS4 update 2016-10-03 09:48:37 +02: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
David Monllao
6a9dc6b899 Merge branch 'MDL-55165-master' of git://github.com/danpoltawski/moodle 2016-10-03 13:31:36 +08:00
Simey Lameze
bc963d98d8 MDL-56009 lib: update RequireJS to 2.3.2 2016-10-03 13:21:33 +08:00
Daniel Thee Roperto
29406dded1 MDL-56231 library: Fixed PhpDoc for flexible_table constructor.
The flexible_table::__construct($uniqueid) accepts a string, not an int
as previously noted in the PhpDoc.
2016-10-03 16:07:11 +11:00
David Monllao
2f234a4af8 Merge branch 'MDL-56164-master' of git://github.com/danpoltawski/moodle 2016-10-03 13:07:01 +08:00
Rajesh Taneja
24c2dcada5
MDl-56210 behat: Ensure page is loaded, before checking button 2016-10-03 13:03:51 +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
dbab30b127 MDL-55767 competency: Deprecate langstring and replace 2016-10-03 12:59:32 +08:00