77546 Commits

Author SHA1 Message Date
Dan Poltawski
d137e671f7 Merge branch 'MDL-52952-master-fix' of github.com:xow/moodle 2016-03-23 12:08:32 +08:00
John Okely
94eb96aa78 MDL-52952 forms: Ignore autofill catching fields in form change checker 2016-03-23 11:54:27 +08:00
David Monllao
b5335149f4 Merge branch 'wip-MDL-53254-master' of https://github.com/marinaglancy/moodle 2016-03-23 09:17:11 +08:00
Dan Poltawski
8ca99daf86 Merge branch 'MDL-53383-master' of git://github.com/andrewnicols/moodle 2016-03-23 08:14:23 +08:00
Juan Leyva
efca239e17 MDL-52767 mod_quiz: New Web Service get_quiz_required_qtypes 2016-03-23 00:57:07 +01:00
Juan Leyva
b6c538416b MDL-52767 mod_quiz: New API for retrieving the question types 2016-03-23 00:56:05 +01:00
Juan Leyva
ff99efcd96 MDL-52767 mod_quiz: New Web Service get_attempt_access_information 2016-03-23 00:55:37 +01:00
Juan Leyva
a79a63619b MDL-52767 mod_quiz: New Web Service get_quiz_access_information 2016-03-23 00:54:41 +01:00
Eloy Lafuente (stronk7)
debb1c3a6c Merge branch 'MDL-53547' of git://github.com/timhunt/moodle 2016-03-22 22:58:30 +01:00
Marina Glancy
cbecc3c35a MDL-53254 tags: little fixes after review 2016-03-22 17:10:34 +08:00
Dan Poltawski
63dcc87631 MDL-52752 mathjaxloader: version bump 2016-03-22 16:40:00 +08:00
Dan Poltawski
aa69618116 Merge branch 'wip-MDL-52752-master' of git://github.com/abgreeve/moodle 2016-03-22 16:31:10 +08:00
Eloy Lafuente (stronk7)
8261a8a3ed MDL-53393 libraries: Fix thirdpartylib to point to directory 2016-03-22 09:06:04 +01:00
Tim Hunt
4c8c69ea9f MDL-53547 logstore_database: better DB driver handling in unit test 2016-03-22 06:42:49 +00:00
Dan Poltawski
ae0af5491b Merge branch 'wip-mdl-49963' of https://github.com/rajeshtaneja/moodle 2016-03-22 13:51:34 +08:00
Rajesh Taneja
a8d9cb87ba MDL-49963 behat: fixed scenario and step definition
1. Participants are sorted by last access and they could
   be different on different db's. So sort them by last name
   before checking.
2. Use Give-When-Then steps.
2016-03-22 13:46:13 +08:00
Dan Poltawski
4a166bfd16 Merge branch 'wip-MDL-51867-master2' of https://github.com/marinaglancy/moodle 2016-03-22 13:13:57 +08:00
David Monllao
8c16f34c88 Merge branch 'wip-MDL-53227-master' of git://github.com/marinaglancy/moodle 2016-03-22 13:00:30 +08:00
Dan Poltawski
ce32fa5572 MDL-39524 tests: fix incorrect phpdoc 2016-03-22 12:56:53 +08:00
Dan Poltawski
cdb2a2ef9f Merge branch 'MDL-39524' of https://github.com/jrchamp/moodle 2016-03-22 12:52:26 +08:00
Dan Poltawski
2ae04cacde Merge branch 'MDL-39524-master' of git://github.com/danpoltawski/moodle 2016-03-22 12:51:30 +08:00
Dan Poltawski
afda050660 MDL-39524 tests: unit test for get_real_size() 2016-03-22 12:47:07 +08:00
Dan Poltawski
4a00b04476 Merge branch 'MDL-53049-anchor-offset' of https://github.com/brendanheywood/moodle 2016-03-22 11:44:19 +08:00
Dan Poltawski
9d3e484e6c Merge branch 'MDL-53147-inbox-layout' of https://github.com/brendanheywood/moodle 2016-03-22 11:38:47 +08:00
David Monllao
a28ed1a731 Merge branch 'MDL-53228-master' of git://github.com/andrewnicols/moodle 2016-03-22 11:35:54 +08:00
Mark Nelson
0c7cca226d MDL-48012 tool_recyclebin: removed indexes as FKs exist 2016-03-22 11:12:08 +08:00
Dan Poltawski
5aaa2b3750 Merge branch 'MDL-52158-master' of https://github.com/xow/moodle 2016-03-22 10:32:34 +08:00
Eloy Lafuente (stronk7)
55e90f2270 Merge branch 'MDL-53393-master' of git://github.com/cameron1729/moodle 2016-03-22 03:16:51 +01:00
David Monllao
a018d82af7 MDL-53513 libraries: Fix lessphp version 2016-03-22 09:57:51 +08:00
David Monllao
809307b490 Merge branch 'MDL-53513-master' of git://github.com/lameze/moodle 2016-03-22 09:56:21 +08:00
Dan Poltawski
c71d11404d Merge branch 'wip-MDL-52619-master' of git://github.com/abgreeve/moodle 2016-03-22 09:54:03 +08:00
David Monllao
64fe3af054 Merge branch 'MDL-53456-master' of git://github.com/lameze/moodle 2016-03-22 09:50:34 +08:00
David Monllao
67f884029d Merge branch 'MDL-53512-master' of git://github.com/lameze/moodle 2016-03-22 09:47:36 +08:00
David Monllao
01cd5aeef6 Merge branch 'MDL-53455-master' of git://github.com/lameze/moodle
Conflicts:
	lib/jquery/plugins.php
2016-03-22 09:44:49 +08:00
David Monllao
cdc6407a10 Merge branch 'wip-MDL-53458-master' of git://github.com/abgreeve/moodle 2016-03-22 09:35:19 +08:00
Eloy Lafuente (stronk7)
c572ac8f3a Merge branch 'MDL-53357-dont-break-urls' of https://github.com/brendanheywood/moodle 2016-03-22 02:25:40 +01:00
Simey Lameze
6648283a77 MDL-53512 libraries: update google API library to version 1.1.7 2016-03-22 08:38:11 +08:00
David Monllao
37f45f44b7 Merge branch 'MDL-53409-master' of git://github.com/crazyserver/moodle 2016-03-22 08:01:16 +08:00
Eloy Lafuente (stronk7)
675c6d4b54 Merge branch 'wip-MDL-45274-master' of https://github.com/marinaglancy/moodle 2016-03-22 00:45:48 +01:00
David Monllao
ab89d2aebc MDL-53454 lib: Fix incorrect jquery version 2016-03-22 07:44:31 +08:00
David Monllao
854cd1464b Merge branch 'MDL-53454-master' of git://github.com/lameze/moodle 2016-03-22 07:42:52 +08:00
Eloy Lafuente (stronk7)
8eb8e5df83 Merge branch 'MDL-48307-master' of git://github.com/marinaglancy/moodle 2016-03-22 00:28:02 +01:00
David Monllao
88027ca371 Merge branch 'wip-MDL-53457-master' of git://github.com/abgreeve/moodle 2016-03-22 07:24:37 +08:00
David Monllao
145bb61d79 Merge branch 'wip-MDL-53465-master' of git://github.com/abgreeve/moodle 2016-03-22 07:12:52 +08:00
David Monllao
bc9f8c5e1c Merge branch 'MDL-53518-master' of git://github.com/lameze/moodle 2016-03-22 06:56:40 +08:00
David Monllao
f811003aae Merge branch 'MDL-53519-master' of git://github.com/lameze/moodle 2016-03-22 06:51:57 +08:00
Eloy Lafuente (stronk7)
197f99a808 Merge branch 'MDL-52978_master' of git://github.com/markn86/moodle 2016-03-21 23:07:16 +01:00
Eloy Lafuente (stronk7)
b1871ae68b MDL-53034 mod_quiz: version mini-bump 2016-03-21 23:01:46 +01:00
Eloy Lafuente (stronk7)
5032fb4f54 Merge branch 'MDL-53034-master' of git://github.com/jleyva/moodle 2016-03-21 22:58:28 +01:00
Eloy Lafuente (stronk7)
3720f100ea Merge branch 'MDL-52888-master' of git://github.com/jleyva/moodle 2016-03-21 22:40:43 +01:00