50855 Commits

Author SHA1 Message Date
Sam Hemelryk
cc688de44f Merge branch 'MDL-29239' of git://github.com/rwijaya/moodle 2011-12-21 14:59:54 +13:00
Sam Hemelryk
aaee11b85d Merge branch 'MDL-30704' of git://github.com/timhunt/moodle 2011-12-21 14:30:15 +13:00
Eloy Lafuente (stronk7)
765d97c8a1 MDL-30777: whitespace fix 2011-12-21 00:40:25 +01:00
Eloy Lafuente (stronk7)
90022d184e Merge branch 'MDL-30777_t2' of git://github.com/kiklop74/moodle 2011-12-21 00:38:48 +01:00
Eloy Lafuente (stronk7)
bccb64f172 Merge branch 'MDL-30170-mnet-undelete' of git://github.com/mudrd8mz/moodle 2011-12-20 23:23:37 +01:00
Eloy Lafuente (stronk7)
1af989f758 Merge branch 'MDL-29400_misleading_file_upload_status' of git://github.com/gerrywastaken/moodle 2011-12-20 22:53:12 +01:00
Eloy Lafuente (stronk7)
e968c5f910 MDL-30761 make it work under Oracle. To revisit after MDL-29765 is done. 2011-12-20 22:36:31 +01:00
Eloy Lafuente (stronk7)
311b953168 Merge branch 'w51_MDL-30761_m23_slowmysql' of git://github.com/skodak/moodle 2011-12-20 22:17:21 +01:00
Eloy Lafuente (stronk7)
bda8c9c92f Merge branch 'MDL-30631' of git://github.com/kiklop74/moodle 2011-12-20 22:02:11 +01:00
Eloy Lafuente (stronk7)
6920a61669 Merge branch 'MDL-30603_m23' of https://github.com/nebgor/moodle 2011-12-20 19:49:19 +01:00
Eloy Lafuente (stronk7)
e2ec1ebdf6 Merge branch 'MDL-29048-master' of git://github.com/ankitagarwal/moodle 2011-12-20 18:55:31 +01:00
Eloy Lafuente (stronk7)
2cf28daa90 Merge branch 'wip-MDL-30733-master' of github.com:marinaglancy/moodle 2011-12-20 18:51:09 +01:00
Darko Miletic
75c95c8b02 MDL-30777: Properly implemented error message 2011-12-20 11:06:50 -03:00
Aparup Banerjee
e59a1dd670 MDL-25561 Gradebook : fixed whitespaces 2011-12-20 16:02:55 +08:00
Aparup Banerjee
8f43b3990d Merge branch 'MDL-25561_user_report_name_clickable' of git://github.com/andyjdavis/moodle 2011-12-20 15:52:38 +08:00
Aparup Banerjee
50c59551c6 Merge branch 'MDL-30627-master-1' of git://git.luns.net.uk/moodle 2011-12-20 13:38:21 +08:00
Aparup Banerjee
21be45b46d Merge branch 'MDL-30641-master-1' of git://git.luns.net.uk/moodle 2011-12-20 11:54:23 +08:00
Aparup Banerjee
74f0b72254 Merge branch 'MDL-30569-master' of git://github.com/ankitagarwal/moodle 2011-12-20 11:08:42 +08:00
Eloy Lafuente (stronk7)
b37a5a000f Merge branch 'wip-mdl-29067' of git://github.com/rajeshtaneja/moodle 2011-12-20 03:07:43 +01:00
Eloy Lafuente (stronk7)
c557dbdbfe Merge branch 'wip-MDL-30770-m23' of git://github.com/samhemelryk/moodle 2011-12-20 02:26:03 +01:00
Eloy Lafuente (stronk7)
2dee0aaf2e Merge branch 'MDL-30739' of git://github.com/stronk7/moodle 2011-12-20 02:23:09 +01:00
Eloy Lafuente (stronk7)
80472947dc Merge branch 'MDL-30739' of git://github.com/timhunt/moodle 2011-12-20 02:21:00 +01:00
Sam Hemelryk
54a4d23d43 Merge branch 'MDL-30764-master' of git://github.com/sammarshallou/moodle 2011-12-20 14:15:47 +13:00
Eloy Lafuente (stronk7)
3ed2e334d8 Merge branch 'MDL-30738' of git://github.com/kiklop74/moodle 2011-12-20 01:59:46 +01:00
Sam Hemelryk
f67911b6ac Merge branch 'MDL-30760' of git://github.com/timhunt/moodle 2011-12-20 13:39:54 +13:00
Sam Hemelryk
eae0b9a9e3 Merge branch 'MDL-30646' of git://github.com/timhunt/moodle 2011-12-20 13:23:45 +13:00
Sam Hemelryk
22c3690b9d Merge branch 'MDL-29846' of git://github.com/timhunt/moodle 2011-12-20 13:16:03 +13:00
Sam Hemelryk
f8882018f2 Merge branch 'w51_MDL-30787_m23_coursemodedit' of git://github.com/skodak/moodle 2011-12-20 12:08:23 +13:00
Eloy Lafuente (stronk7)
961e8f9457 Merge branch 'MDL-30741_master' of git://github.com/jfilip/moodle 2011-12-19 23:59:33 +01:00
Sam Hemelryk
fc0d8f77f2 Merge branch 'wip-MDL-28948-master' of git://github.com/abgreeve/moodle 2011-12-20 10:44:41 +13:00
Sam Hemelryk
5e928f2e7e Merge branch 'w51_MDL-30779_m23_dbtransfer' of git://github.com/skodak/moodle 2011-12-20 10:24:16 +13:00
Sam Hemelryk
1a73fc9a24 Merge branch 'w51_MDL-30765_m23_context' of git://github.com/skodak/moodle 2011-12-20 10:21:35 +13:00
Sam Hemelryk
136d4c09f3 Merge branch 'w51_MDL-30697_m23_roleslink' of git://github.com/skodak/moodle 2011-12-20 10:04:33 +13:00
Tim Hunt
7ddfd168ac MDL-30704 Quiz grades report shows inconsistent averages.
Previously, for the overall grade, we averaged the final marks for each
student; while for the individual question grades, we averaged all
grades.

The report now works consistently on the principle that the averages
should include exactly what is currenlty being shown in the report. This
is more logical, and so should be easier for users to understand.

If you want to see the averages that are currently shown (e.g. just the
average of each student's highers grade) then the report options let you
do that.
2011-12-19 14:59:36 +00:00
Tim Hunt
8c52a5ce72 MDL-29846 qbehaviours admin: correct $needed logic.
Also, fix a notice.
2011-12-19 14:31:11 +00:00
Aparup Banerjee
26b85f89bc Merge branch 'w51_MDL-30735_m23_cron' of git://github.com/skodak/moodle 2011-12-19 11:52:33 +08:00
Sam Hemelryk
042efe1aa7 Merge branch 'w51_MDL-30789_m23_enrolupdatestatus' of git://github.com/skodak/moodle 2011-12-19 16:22:42 +13:00
Sam Hemelryk
7554371cd9 Merge branch 'MDL-30500' of git://github.com/lazydaisy/moodle 2011-12-19 15:21:56 +13:00
Sam Hemelryk
c3f90a5722 Merge branch 'MDL-37049' of git://github.com/jamiepratt/moodle 2011-12-19 15:06:01 +13:00
Sam Hemelryk
92e72b0a86 Merge branch 'MDL-30683' of git://github.com/timhunt/moodle 2011-12-19 14:17:20 +13:00
Mary Evans
e580c65962 MDL-30500 Fix for Sky High report & print layout 2011-12-19 00:06:10 +00:00
Sam Hemelryk
d0fe873623 Merge branch 'MDL-29176' of git://github.com/timhunt/moodle 2011-12-19 12:28:52 +13:00
Sam Hemelryk
90179a5093 Merge branch 'MDL-30734' of git://github.com/timhunt/moodle 2011-12-19 11:52:49 +13:00
Sam Hemelryk
6ccf06637f Merge branch 'MDL-30742' of git://github.com/timhunt/moodle 2011-12-19 11:37:10 +13:00
Sam Hemelryk
09608abe56 Merge branch 'MDL-30744' of git://github.com/timhunt/moodle 2011-12-19 10:21:11 +13:00
Sam Hemelryk
b53bea8167 Merge branch 'MDL-30758' of git://github.com/timhunt/moodle 2011-12-19 09:27:48 +13:00
Petr Skoda
af7177dbcb MDL-30789 add new update_status() method to enrol plugins and improve enrol cache invalidation 2011-12-18 17:30:17 +01:00
Petr Skoda
af18993548 MDL-30787 fix use of module and section edit capabilities 2011-12-18 13:54:38 +01:00
Petr Skoda
21db6da150 MDL-30697 fix incorrect capability for role assign button
Credit goes to Alexander Bias.
2011-12-17 14:46:47 +01:00
Petr Skoda
e3258164c6 MDL-30735 fix cron maintenancerun detection
Credit goes to Rodrigo Belluomini Cardilli.
2011-12-17 14:17:19 +01:00