Tim Hunt a2ac234956 MDL-20636 Merge remote-tracking branch 'moodle/master' into upgrade ... Conflicts: lib/filestorage/file_storage.php mod/quiz/attemptlib.php mod/quiz/lib.php mod/quiz/mod_form.php mod/quiz/report/overview/overview_table.php mod/quiz/report/overview/report.php mod/quiz/report/responses/report.php mod/quiz/report/responses/responses_table.php mod/quiz/report/statistics/db/install.xml mod/quiz/report/statistics/qstats.php mod/quiz/report/statistics/report.php mod/quiz/report/statistics/statistics_question_table.php mod/quiz/report/statistics/statistics_table.php mod/quiz/report/statistics/version.php mod/quiz/review.php mod/quiz/reviewquestion.php mod/quiz/startattempt.php mod/quiz/styles.css mod/quiz/view.php question/type/essay/questiontype.php question/type/match/backup/moodle2/backup_qtype_match_plugin.class.php question/type/match/backup/moodle2/restore_qtype_match_plugin.class.php question/type/numerical/display.html question/type/numerical/questiontype.php question/type/questiontype.php question/type/random/questiontype.php question/type/shortanswer/questiontype.php theme/base/style/question.css		2011-05-11 20:29:49 +01:00
..
bb	MDL-14589 blocking execution of bb convert	2010-08-29 10:09:03 +00:00
cc	MDL-26623 fix file permissions	2011-03-01 12:26:49 +01:00
controller	MDL-24962 backup - clean plan/settings circular refs on restore	2010-11-15 16:08:02 +00:00
moodle2	MDL-20636 Merge remote-tracking branch 'moodle/master' into upgrade	2011-05-11 20:29:49 +01:00
util	Merge branch 'MDL-26896' of git://github.com/stronk7/moodle	2011-04-11 14:48:01 +08:00
backup.class.php	MDL-25310 backup - Bump!	2010-11-18 21:35:40 +00:00
backup.php	backup MDL-24962 Backup, Restore, and Import all now explicitly destroy the UI, controller, and stage objects upon completion.	2010-11-18 02:09:23 +00:00
backup_scheduled.php	MDL-24321 switching to stdClass in /backup/	2010-09-21 08:47:01 +00:00
backupfilesedit.php	MDL-26623 fix file permissions	2011-03-01 12:26:49 +01:00
backupfilesedit_form.php	"MDL-23910, fixed breadcrumb for backup files editing ui"	2010-08-30 03:44:44 +00:00
backuplib.php	MDL-22135 - logs restore, course and activities + cleanup	2010-11-11 19:46:04 +00:00
import.php	backup MDL-24962 Backup, Restore, and Import all now explicitly destroy the UI, controller, and stage objects upon completion.	2010-11-18 02:09:23 +00:00
lib.php	MDL-25637 Fixed whitespace	2011-01-24 16:20:30 +08:00
log.php	MDL-21666 backup & restore caps - moving to new naming schema. More to come.	2010-02-19 17:50:14 +00:00
restore.php	backup MDL-24962 Backup, Restore, and Import all now explicitly destroy the UI, controller, and stage objects upon completion.	2010-11-18 02:09:23 +00:00
restorefile.php	MDL-26623 fix file permissions	2011-03-01 12:26:49 +01:00
restorefile_form.php	MDL-26623 fix file permissions	2011-03-01 12:26:49 +01:00
restorelib.php	MDL-25637 Fixed whitespace	2011-01-24 16:20:30 +08:00