Commit graph

57612 commits

Author SHA1 Message Date
Dan Poltawski
709d684341 Merge branch 'MDL-36064' of git://github.com/netspotau/moodle-mod_assign 2012-10-30 12:14:40 +08:00
Dan Poltawski
ef96f58535 Merge branch 'wip-mdl-35489' of git://github.com/rajeshtaneja/moodle 2012-10-30 12:11:44 +08:00
Dan Poltawski
0caa0c869b Merge branch 'MDL-4655-master' of git://github.com/FMCorz/moodle 2012-10-30 11:58:34 +08:00
Frederic Massart
38fb498bef MDL-30871 message: Removed unused string 2012-10-30 11:04:50 +08:00
Frederic Massart
ba4c451f53 MDL-30871 enrol: Flat file does not fail when notifications are enabled 2012-10-30 11:03:12 +08:00
Sam Hemelryk
e118ad21c9 Merge branch 'MDL-34274-master' of git://github.com/ankitagarwal/moodle 2012-10-30 16:00:45 +13:00
Sam Hemelryk
c8757a3c87 Merge branch 'MDL-35889-master' of git://github.com/ankitagarwal/moodle 2012-10-30 15:48:54 +13:00
Dan Poltawski
8586777168 Merge branch 'MDL-36015_m1' of git://git.catalyst.net.nz/moodle-r2 2012-10-30 10:18:45 +08:00
Dan Poltawski
752a3f14be Merge branch 'wip-mdl-35910' of git://github.com/rajeshtaneja/moodle 2012-10-30 10:00:11 +08:00
Dan Poltawski
e76cc8f4c0 Merge branch 'MDL-36135-evaluators' of git://github.com/mudrd8mz/moodle 2012-10-30 09:37:03 +08:00
Frederic Massart
5735454d8f MDL-26660 libraries: Do not try to parse non-valid XML 2012-10-30 09:22:48 +08:00
Sam Hemelryk
21d31a23a0 Merge branch 'MDL-35959-master' of git://git.luns.net.uk/moodle 2012-10-30 13:31:30 +13:00
Sam Hemelryk
a9ab988e43 Merge branch 'WIP-MDL-36070-master' of git://github.com/nadavkav/moodle 2012-10-30 13:02:24 +13:00
Sam Hemelryk
41b4e5ec7f Merge branch 'MDL-36076' of git://github.com/timhunt/moodle 2012-10-30 12:59:23 +13:00
Sam Hemelryk
ca55ce4b35 Merge branch 'MDL-36101-master' of git://github.com/micaherne/moodle 2012-10-30 12:54:56 +13:00
Sam Hemelryk
ebaa74a3e0 Merge branch 'MDL-36103' of git://github.com/timhunt/moodle 2012-10-30 12:52:00 +13:00
Sam Hemelryk
86c0eb48ba Merge branch 'MDL-36105-master' of https://github.com/mackensen/moodle 2012-10-30 12:31:22 +13:00
Sam Hemelryk
558aecf818 Merge branch 'wip-mdl-36131' of git://github.com/rajeshtaneja/moodle 2012-10-30 12:24:31 +13:00
Sam Hemelryk
7080f72c73 Merge branch 'MDL-36137_master' of git://github.com/lazydaisy/moodle 2012-10-30 12:17:11 +13:00
Michael de Raadt
8d880a2ec6 MDL-35358 Lesson Module: fixed teacher grade essays display when lesson is only available for group members only 2012-10-29 17:58:51 +08:00
Dan Poltawski
8688c112b6 Merge branch 'MDL-34910_master' of git://github.com/dmonllao/moodle 2012-10-29 15:36:07 +08:00
Dan Poltawski
01412583bf Merge branch 'master_MDL-35215' of git://github.com/totara/moodle 2012-10-29 15:33:43 +08:00
Dan Poltawski
69c9669a58 Merge branch 'MDL-34363' of git://github.com/merrill-oakland/moodle 2012-10-29 15:21:39 +08:00
David Monllao
4219ffab43 MDL-34910 blog Remove new entry link when the context doesn't allows to add new entries 2012-10-29 15:04:45 +08:00
Dan Poltawski
506263cfee Merge branch 'WIP-MDL-36033-master' of git://github.com/nadavkav/moodle 2012-10-29 14:59:45 +08:00
Dan Poltawski
4de9b85c83 Merge branch 'wip-MDL-36075_MASTER' of git://github.com/jason-platts/moodle 2012-10-29 14:57:14 +08:00
Dan Poltawski
09f2367617 MDL-34354 - remove unused line 2012-10-29 14:54:14 +08:00
Dan Poltawski
02309e2d50 Merge branch 'MDL-34354-master' of git://git.luns.net.uk/moodle 2012-10-29 14:53:43 +08:00
Dan Poltawski
737492f1a5 Merge branch 'MDL-36099-master' of git://git.luns.net.uk/moodle 2012-10-29 14:50:23 +08:00
Dan Poltawski
f6110392f1 Merge branch 'MDL-35880-master' of git://github.com/ankitagarwal/moodle 2012-10-29 14:35:21 +08:00
Dan Poltawski
aed58a3da8 Merge branch 'MDL-35990-master' of git://github.com/FMCorz/moodle 2012-10-29 14:32:11 +08:00
Dan Poltawski
c28717d913 MDL-35116 - update version numbers 2012-10-29 14:08:28 +08:00
Frederic Massart
d8271e3908 MDL-35116 upgrade: Rename backup files having used short name previously 2012-10-29 14:07:18 +08:00
Dan Poltawski
890988221c Merge branch 'MDL-35117-master' of git://github.com/FMCorz/moodle 2012-10-29 14:03:57 +08:00
Dan Poltawski
3dce356ac4 Merge branch 'MDL-34837-master' of git://github.com/FMCorz/moodle 2012-10-29 13:55:06 +08:00
Dan Poltawski
06b33f67b0 Merge branch 'w43_MDL-35843_m42_expiryself' of git://github.com/skodak/moodle 2012-10-29 13:49:47 +08:00
Dan Poltawski
b01783f086 Merge branch 'MDL-35964' of git://github.com/timhunt/moodle 2012-10-29 13:48:44 +08:00
Dan Poltawski
08f24a6686 Merge branch 'wip-MDL-34343-m24' of git://github.com/samhemelryk/moodle 2012-10-29 12:39:06 +08:00
Dan Poltawski
e93256ecf6 MDL-34399 - bump version to reload cache definition 2012-10-29 12:36:22 +08:00
Dan Poltawski
3aa721e035 Merge branch 'MDL-34399' of git://github.com/timhunt/moodle 2012-10-29 12:18:01 +08:00
Dan Poltawski
6954e44169 Merge branch 'MDL-36086-workshop' of git://github.com/mudrd8mz/moodle 2012-10-29 12:11:51 +08:00
Dan Poltawski
0e0ad4c9f9 Merge branch 'wip-MDL-36052-m24' of git://github.com/samhemelryk/moodle 2012-10-29 11:52:25 +08:00
Dan Poltawski
a9b489525a Merge branch 'wip-MDL-36115-m24' of git://github.com/samhemelryk/moodle 2012-10-29 11:48:55 +08:00
Dan Poltawski
26baacf7d7 Merge branch 'MDL-35297' of git://github.com/stronk7/moodle 2012-10-29 09:50:20 +08:00
Tim Hunt
32953f37b6 MDL-34399 quiz cleanup: remove ugly question/page number hack
It used to be necessary to store the question number and question page
by adding them as random extra fields on the question object (but
I can no longer remember what that reason was). Now it is possible
to store this sensibly in the quiz_attempt object, which is much
cleaner, so do that.
2012-10-26 11:58:25 +08:00
Tim Hunt
15dd772736 MDL-34399 questions cleanup: straighten out strange links to question objects. 2012-10-26 11:58:14 +08:00
Tim Hunt
204ceaa389 MDL-34399 quiz cleanup: remove never used function.
This got added during the Moodle 2.0 files API conversion, but was
always part of a failed experiemnt, so should have been deleted
long ago. It was never actually used.
2012-10-26 11:58:03 +08:00
Tim Hunt
a560d636f4 MDL-34399 questions: cache to help load question definitions.
At the moment, it takes several DB queries to load each question definition,
so this cache is potentially a big win.
2012-10-26 11:58:02 +08:00
Andrew Robert Nicols
afe3566cca MDL-35836 Rewrite doctonewwindow handling to use delegation instead of individual events 2012-10-26 08:52:23 +08:00
Mary Evans
921765e5eb MDL-36197 theme_fusion: Fix for "Your progress" overlaps completion tracking checkbox 2012-10-26 01:18:17 +01:00