Commit graph

76751 commits

Author SHA1 Message Date
Juan Leyva
2a72d9d237 MDL-52585 webservices: Return correct invalid login message 2015-12-22 16:59:24 +01:00
Juan Leyva
333e77703d MDL-52586 webservices: Return the default user home page 2015-12-22 16:50:58 +01:00
Dan Poltawski
5dc7768f7e Merge branch 'master_MDL-51916' of https://github.com/danmarsden/moodle 2015-12-22 13:17:54 +00:00
Dan Poltawski
29747350b1 Merge branch 'MDL-52365_new' of git://github.com/mkassaei/moodle 2015-12-22 13:15:02 +00:00
M Kassaei
c398f6ed44 MDL-52365 qtype ddwtos & ddimageortext: 20 drag items IE11/Edge 2015-12-22 12:36:40 +00:00
Eloy Lafuente (stronk7)
c38bdd62c7 Merge branch 'MDL-51719-master' of git://github.com/danpoltawski/moodle 2015-12-22 13:07:01 +01:00
Dan Poltawski
3e0540b6ec Merge branch 'wip-MDL-51239-master' of git://github.com/abgreeve/moodle 2015-12-22 11:58:28 +00:00
Dan Poltawski
40b6fbd4bf Merge branch 'MDL-52556-master' of git://github.com/jleyva/moodle 2015-12-22 11:17:11 +00:00
Dan Poltawski
b687494f95 MDL-52017 enrol_self: fix incorrect empty statement
Ironically this was detected by causing a syntax error on php54
2015-12-22 09:48:56 +00:00
David Monllao
ab429bfa09 Merge branch 'MDL-52017_master' of git://github.com/markn86/moodle 2015-12-22 16:36:29 +08:00
David Monllao
febc314895 Merge branch 'MDL-51886-master' of git://github.com/dpalou/moodle
Conflicts:
	version.php
2015-12-22 16:28:18 +08:00
David Monllao
a96bf448b8 Merge branch 'MDL-52073-master' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2015-12-22 16:23:33 +08:00
Rajesh Taneja
e487a51db3 MDL-52060 phpunit: Keep track of modified database for reset
Keep list of modified tables, so they can be reset
without any guess work
2015-12-22 15:37:40 +08:00
Andrew Nicols
64f4889ad1 Merge branch 'MDL-52250-master' of git://github.com/danpoltawski/moodle 2015-12-22 15:13:38 +08:00
Andrew Nicols
9d926d1f27 Merge branch 'MDL-52289-master' of git://github.com/jleyva/moodle 2015-12-22 13:51:14 +08:00
Mark Nielsen
e61a9638f1 MDL-52060 phpunit: Improve get_message_processors reset 2015-12-22 13:40:39 +08:00
Mark Nielsen
d494306de7 MDL-52060 phpunit: Prevent querying database metadata 2015-12-22 13:40:38 +08:00
Rajesh Taneja
22d55b3950 MDL-52060 phpunit: Check file only if needed 2015-12-22 13:19:06 +08:00
Rajesh Taneja
44121fbdc9 MDL-52060 phpunit: Keep track of initial reset sequence 2015-12-22 13:19:06 +08:00
Andrew Nicols
ec68e9d530 Merge branch 'MDL-23128-master' of git://github.com/danpoltawski/moodle 2015-12-22 13:11:27 +08:00
Andrew Nicols
3390f40ab7 Merge branch 'MDL-52363' of git://github.com/mkassaei/moodle 2015-12-22 12:33:57 +08:00
David Monllao
4b6b84d677 Merge branch 'wip-mdl-52376' of git://github.com/rajeshtaneja/moodle 2015-12-22 11:24:45 +08:00
David Monllao
39604f212e Merge branch 'MDL-52558-master' of git://github.com/sammarshallou/moodle 2015-12-22 11:16:36 +08:00
Rajesh Taneja
c2df9b3b90 MDL-52427 behat: Fixed question selectors
As class is changed, we need to convert selector
to check if class is contained, rather then checking
selecting with specific class.
2015-12-22 10:43:22 +08:00
Stephen Bourget
bf5a27ce17 MDL-51445 Chat: Fix broken profile links 2015-12-21 20:37:54 -05:00
Andrew Nicols
8dccd20f76 Merge branch 'MDL-52334' of git://github.com/aolley/moodle 2015-12-22 08:45:30 +08:00
Dan Poltawski
bf47ce5050 Merge branch 'MDL-52380-master' of git://github.com/junpataleta/moodle 2015-12-21 16:47:18 +00:00
Dan Poltawski
43fcd55e0c Merge branch 'MDL-52354-master' of git://github.com/junpataleta/moodle 2015-12-21 16:45:15 +00:00
Juan Leyva
6a03246999 MDL-52556 mod_scorm: Return SCO extra data in get_scorm_scoes 2015-12-21 15:42:58 +01:00
Dan Poltawski
2c10892c9e Merge branch 'MDL-52427' of git://github.com/timhunt/moodle 2015-12-21 13:27:38 +00:00
Dan Poltawski
77d0aaa5e3 Merge branch 'MDL-52402' of git://github.com/mr-russ/moodle 2015-12-21 12:46:20 +00:00
Dan Poltawski
07f8dd4314 Merge branch 'MDL-52399-master' of git://github.com/jleyva/moodle 2015-12-21 12:45:30 +00:00
Dan Poltawski
36381280c5 Merge branch 'MDL-52455' of git://github.com/timhunt/moodle 2015-12-21 12:43:01 +00:00
Dan Poltawski
7fe67ef4ad Merge branch 'MDL-52542' of git://github.com/timhunt/moodle 2015-12-21 11:05:40 +00:00
David Monllao
2f3ebc9bdb Merge branch 'MDL-51257-master' of git://github.com/cameron1729/moodle 2015-12-21 17:32:34 +08:00
David Monllao
355570f9e7 Merge branch 'MDL-52429-master' of git://github.com/jleyva/moodle 2015-12-21 17:16:54 +08:00
David Monllao
20b3638322 Merge branch 'MDL-49758-master' of git://github.com/StudiUM/moodle 2015-12-21 17:05:48 +08:00
Dan Poltawski
5cbc9819fd Merge branch 'MDL-52226_master-fix' of git://github.com/dmonllao/moodle 2015-12-21 08:31:55 +00:00
David Monllao
a49fd98349 MDL-52226 tests: Fix behat phpunit naming conflict 2015-12-21 16:27:23 +08:00
Dani Palou
c1baf89e57 MDL-51886 wiki: Add unit tests for view_wiki and view_page 2015-12-21 08:19:24 +01:00
Dani Palou
557b58b099 MDL-51886 wiki: New WS mod_wiki_view_wiki and mod_wiki_view_page 2015-12-21 08:19:24 +01:00
David Monllao
f08d1590c8 Merge branch 'MDL-52226-master' of git://github.com/sammarshallou/moodle 2015-12-21 14:41:21 +08:00
Andrew Nicols
3adcec2b70 Merge branch 'master_MDL-50972' of https://github.com/danmarsden/moodle 2015-12-21 14:01:17 +08:00
Andrew Nicols
1f1894c973 Merge branch 'MDL-52457-master' of git://github.com/jleyva/moodle 2015-12-21 11:58:59 +08:00
David Monllao
f447759a91 Merge branch 'MDL-47106' of git://github.com/timhunt/moodle 2015-12-21 11:32:56 +08:00
David Monllao
5303fb94ef Merge branch 'master_MDL-45712' of git://github.com/danmarsden/moodle 2015-12-21 11:14:09 +08:00
David Monllao
58920c8e53 Merge branch 'MDL-52523' of git://github.com/timhunt/moodle 2015-12-21 10:47:49 +08:00
AMOS bot
56bc2a5740 Automatically generated installer lang files 2015-12-20 00:05:04 +08:00
Michael Aherne
189875242e MDL-52560 badges: Avoid trying to add badges when disabled 2015-12-18 14:13:32 +00:00
Dan Poltawski
ea3ebbf20e weekly release 3.1dev 2015-12-18 12:26:50 +00:00