Sam Hemelryk 2a336e2a36 Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle ... Conflicts: backup/util/ui/base_moodleform.class.php		2013-12-04 09:44:25 +13:00
..
checks	Revert "MDL-39876 Change get_record('course') calls to get_course"	2013-08-21 13:42:30 +08:00
dbops	Merge branch 'MDL-38734-master' of git://github.com/danpoltawski/moodle	2013-11-01 08:55:29 +08:00
destinations/tests	MDL-32569 convert remaining backup tests and drop old simpletests	2012-04-21 16:24:33 +02:00
factories	MDL-39474 introduce $CFG->debugdeveloper and cleanup $CFG init	2013-08-12 13:01:47 +02:00
helper	MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere	2013-11-06 16:40:01 +00:00
includes	Merge branch 'MDL-38196-master' of git://github.com/sammarshallou/moodle	2013-10-10 09:31:33 +08:00
interfaces
loggers	MDL-38196 Backup/restore: Display log if non-empty	2013-10-08 11:00:11 +01:00
output
plan	MDL-42084 Unit tests: Remove unnecessary 'clear time limit change' lines	2013-11-06 16:40:04 +00:00
progress	Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle	2013-12-03 11:12:34 +13:00
settings	MDL-38735 backup: add missing setType() to forms	2013-04-03 02:17:40 +02:00
structure	MDL-41087 Backup: add progress tracking in slow steps	2013-09-13 11:07:23 +01:00
ui	Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle	2013-12-04 09:44:25 +13:00
xml	MDL-41669 Restore: Progress bar needs to include more tasks	2013-09-16 17:18:12 +01:00