76405 Commits

Author SHA1 Message Date
AMOS bot
eba3c97445 Automatically generated installer lang files 2015-12-25 00:03:55 +08:00
Dan Poltawski
afbb53d70b weekly release 3.1dev 2015-12-23 11:35:50 +00:00
Dan Poltawski
711134ee20 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-12-23 11:35:46 +00:00
Dan Poltawski
c39cc37d5c Merge branch 'MDL-52595-master' of git://github.com/andrewnicols/moodle 2015-12-23 11:29:01 +00:00
Andrew Nicols
eb474609aa MDL-52595 tests: Disable xdebug for travis runs 2015-12-23 13:14:37 +08:00
Andrew Nicols
2ece61e652 Merge branch 'MDL-52355-master' of git://github.com/junpataleta/moodle 2015-12-23 10:04:51 +08:00
Jun Pataleta
db9be61f20 MDL-52355 mod_data: Added Gregorian hour and minute values 2015-12-23 09:53:12 +08:00
Shamim Rezaie
4210c83d3a MDL-52355 mod_data: Make date field respect the calendar type in use
Updated the date subplugin to consider that the input date element
values might be for any calendar type and not just the Gregorian
calendar.
2015-12-23 09:53:11 +08:00
Shamim Rezaie
2c4bac4cd9 MDL-52354 select_time: Make select_time respect the set calendar type
The select_time method updated to display form elements in accordance
to the calendar type plugin that is in use.
2015-12-23 09:53:11 +08:00
Andrew Nicols
3dc5cdf543 Merge branch 'MDL-52060-master-arn' of https://github.com/andrewnicols/moodle 2015-12-23 09:08:48 +08:00
Andrew Nicols
46c18e0dd2 MDL-52060 phpunit: Add tests for test_set_table_modified_by_sql 2015-12-23 09:08:06 +08:00
Eloy Lafuente (stronk7)
7814a99341 Merge branch 'MDL-49743-master' of git://github.com/danpoltawski/moodle 2015-12-22 17:14:38 +01:00
AMOS bot
008b95b248 Automatically generated installer lang files 2015-12-23 00:03:59 +08: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
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