Eloy Lafuente (stronk7)
907cc4ceb7
Merge branch 'master_MDL-28110' of git://github.com/danmarsden/moodle
2011-07-07 03:00:42 +02:00
Eloy Lafuente (stronk7)
627e4bd4a7
Merge branch 'master_MDL-28111' of git://github.com/danmarsden/moodle
2011-07-07 02:36:28 +02:00
Eloy Lafuente (stronk7)
6eb2cf62bd
MDL-27989 whitespace fix
2011-07-07 02:21:44 +02:00
Eloy Lafuente (stronk7)
5b77684af7
Merge branch 'MDL-27989_master' of git://github.com/kordan/moodle
2011-07-07 02:19:15 +02:00
Eloy Lafuente (stronk7)
dfef3028ae
Merge branch 'MDL-26285' of git://git.luns.net.uk/moodle
2011-07-07 02:10:13 +02:00
Eloy Lafuente (stronk7)
25e2bb1b83
Merge branch 'w26_MDL-27375_m22_enrolcase' of git://github.com/skodak/moodle
2011-07-07 01:39:38 +02:00
Eloy Lafuente (stronk7)
535a635afc
Merge branch 'w26_MDL-28117_m22_dataurlhack' of git://github.com/skodak/moodle
2011-07-07 01:32:30 +02:00
Eloy Lafuente (stronk7)
482b1ea121
Merge branch 'MDL-27329' of git://git.luns.net.uk/moodle
2011-07-07 00:24:19 +02:00
Eloy Lafuente (stronk7)
4357214a49
Merge branch 'MDL-28100' of git://git.luns.net.uk/moodle
2011-07-07 00:12:19 +02:00
Eloy Lafuente (stronk7)
b274bc55d0
Merge branch 'MDL-27279' of git://git.luns.net.uk/moodle
2011-07-07 00:01:08 +02:00
Dan Poltawski
ac9695e5d8
MDL-26285 block_rss_client - do not disable with enablerssfeeds
...
This setting was used in 1.9 and below to control feed generation only, not
for RSS consumption.
2011-07-06 21:10:43 +01:00
Eloy Lafuente (stronk7)
83ca5bef34
Merge branch 'MDL-28222' of git://github.com/timhunt/moodle
2011-07-06 20:27:52 +02:00
Tim Hunt
82c07ea4f4
MDL-28222 quiz reports missing context in call to quiz_report_feedback_for_grade.
2011-07-06 19:08:52 +01:00
Eloy Lafuente (stronk7)
babbab1449
Merge branch 'MDL-27040' of git://github.com/timhunt/moodle
2011-07-06 19:25:47 +02:00
Eloy Lafuente (stronk7)
cb600c4606
Merge branch 'MDL-28166' of git://github.com/timhunt/moodle
2011-07-06 19:03:59 +02:00
Tim Hunt
6c7da46108
MDL-26165 quiz submit are-you-sure is potentially confusing.
2011-07-06 14:49:38 +01:00
Tim Hunt
8f78cd5abc
MDL-28195 confirm_action should allow the button labels to be customised
2011-07-06 14:47:30 +01:00
Tim Hunt
81522abd63
MDL-28166 fix some more instances of my favourite becuase typo.
2011-07-06 14:19:25 +01:00
Tim Hunt
cbb8b55c33
MDL-28166 send quiz event notifications asynchronously.
...
This avoids the problem that you cannot send messages in transactions.
It also means that the quiz submission will not be prevented, and the
message will still be sent eventually, if any part of the messaging
system is giving intermittent errors when the student wants to submit
their quiz.
2011-07-06 14:16:30 +01:00
Rossiani Wijaya
fd9672ac65
MDL-27931 admin bulk user upload: convert city as required field. Credit goes to Charles Fulton for supplying the patch.
2011-07-06 15:13:16 +08:00
Sam Hemelryk
8f49f9ce8e
Merge branch 'MDL-27934' of git://git.luns.net.uk/moodle
2011-07-06 13:24:47 +08:00
Sam Hemelryk
50c1cb0394
Merge branch 'MDL-27855' of git://git.luns.net.uk/moodle
2011-07-06 13:17:54 +08:00
Sam Hemelryk
024ad4bd82
Merge branch 'MDL-27168' of git://git.luns.net.uk/moodle
2011-07-06 12:03:33 +08:00
Sam Hemelryk
1a3c5d2366
Merge branch 'MDL-26626' of git://git.luns.net.uk/moodle
2011-07-06 11:19:27 +08:00
Sam Hemelryk
8323432992
Merge branch 'MDL-26611-take2' of git://git.luns.net.uk/moodle
2011-07-06 11:06:20 +08:00
Sam Hemelryk
5b966cbb3b
Merge branch 'MDL-28135' of git://github.com/nebgor/moodle
2011-07-06 10:53:48 +08:00
Eloy Lafuente (stronk7)
ea9ad8f175
Merge branch 'w26_MDL-28147_m22_minify' of git://github.com/skodak/moodle
2011-07-06 03:13:11 +02:00
Eloy Lafuente (stronk7)
7edcd093b6
Merge branch 'MDL-28160' of git://github.com/timhunt/moodle
2011-07-06 03:06:34 +02:00
Eloy Lafuente (stronk7)
87cc19de07
Merge branch 'w26_MDL-28161_m22_caches' of git://github.com/skodak/moodle
2011-07-06 02:54:12 +02:00
Eloy Lafuente (stronk7)
b2dfa10d5a
Merge branch 'w26_MDL-28167_m22_exconstructor' of git://github.com/skodak/moodle
2011-07-06 02:05:20 +02:00
Eloy Lafuente (stronk7)
34d5507ab8
Merge branch 'wip-MDL-28172-master' of git://github.com/samhemelryk/moodle
2011-07-06 01:52:32 +02:00
Eloy Lafuente (stronk7)
ed436add99
Merge branch 'MDL-28179' of git://github.com/timhunt/moodle
2011-07-06 01:45:15 +02:00
Eloy Lafuente (stronk7)
60ee61147d
Merge branch 'MDL-28193' of git://git.luns.net.uk/moodle
2011-07-06 01:29:27 +02:00
Eloy Lafuente (stronk7)
9a160c7c46
MDL-28196 quiz calls get_in_or_equal (fixing missing $DB)
2011-07-05 22:02:30 +02:00
Eloy Lafuente (stronk7)
476ea4f8ce
Merge branch 'MDL-28196' of git://github.com/timhunt/moodle
2011-07-05 19:55:31 +02:00
Dan Poltawski
fe50898ebc
MDL-23580 course overview - remove debugging junk
2011-07-05 18:46:08 +01:00
Eloy Lafuente (stronk7)
6ce986e54c
Merge branch 'MDL-27821' of git://github.com/timhunt/moodle
2011-07-05 19:41:32 +02:00
Eloy Lafuente (stronk7)
dd927fcefb
Merge branch 'MDL-28185_master' of git://github.com/stronk7/moodle
2011-07-05 17:58:55 +02:00
Eloy Lafuente (stronk7)
555ac02985
Merge branch 'MDL-26618' of git://github.com/timhunt/moodle
2011-07-05 17:46:46 +02:00
Ruslan Kabalin
9f05a1a640
MDL-28186 messaging: Fix "Enable messagning setting" infuence on the menus
...
"Enable messaging system" (Site administration > Advanced features) is
supposed to control messaging between site users only, thus it should not
remove user messging preferences menu item. However, it may remove instant
messging preferences from providers list for the user.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-07-05 15:35:52 +01:00
Eloy Lafuente (stronk7)
89526681cb
MDL-28185 upgrade - fix oracle problem upgrading blocks
2011-07-05 15:37:16 +02:00
Tim Hunt
b149b78859
MDL-28196 quiz calls get_in_or_equal (not DB->get_in_or_equal) in two places
...
Also, another minor error in one method call.
2011-07-05 14:29:30 +01:00
Andrew Robert Nicols
b7eceef75f
MDL-28193 Add $external arg to get_driver_instance
...
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
2011-07-05 12:22:41 +01:00
Kordan
c5b7c9357f
addition to previous fix for MDL-27989 in master
2011-07-05 11:32:20 +02:00
Dan Poltawski
f2ad165538
MDL-26611 Roles Language - remove reference to 'legacy role type'
2011-07-05 10:23:00 +01:00
Sam Hemelryk
ee992c6c66
Merge branch 'MDL-25357_wip' of git://github.com/timhunt/moodle
2011-07-05 16:51:49 +08:00
Kordan
7843d2d609
MDL-27989 fix for master
2011-07-05 10:26:01 +02:00
Rossiani Wijaya
54c37fbd88
MDL-27555 assignment module: remove 'submitted' option from optional setting for offline assignment type.
2011-07-05 15:33:33 +08:00
Aparup Banerjee
3b1b5018f7
MDL-28135 general Updated broken and typo docs links
2011-07-05 14:41:29 +08:00
Aparup Banerjee
19b4d9d831
MDL-28135 general Updated the Copyright notice to point to docs.moodle.org/dev/Releases instead of en/Release
2011-07-05 14:30:24 +08:00
