51053 Commits

Author SHA1 Message Date
Aparup Banerjee
21be45b46d Merge branch 'MDL-30641-master-1' of git://git.luns.net.uk/moodle 2011-12-20 11:54:23 +08:00
Rossiani Wijaya
d85c839928 MDL-30636 Lesson Module: fixed essay answer display format 2011-12-20 11:53:55 +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
AMOS bot
bbacecda15 Automatically generated installer lang files 2011-12-20 00:31:14 +00: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
Andrew Robert Nicols
2ee40a7018 MDL-30805 Require HTML content for the HTML block configuration 2011-12-19 12:00:54 +00:00
Andrew Robert Nicols
986bd83585 MDL-30804 Rename the 'onthispage' fieldset for block configuration 2011-12-19 11:46:23 +00:00
Rossiani Wijaya
de2e165a3a MDL-30636 Lesson Module: fixed essay answer display format 2011-12-19 15:08:15 +08: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
AMOS bot
2fd64b7b11 Automatically generated installer lang files 2011-12-18 00:31:14 +00: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
Petr Skoda
58a9e8f3de MDL-30765 fix invalid context variable 2011-12-16 23:02:50 +01:00
Tim Hunt
c83ed025ef MDL-30760 question engine: question summary can be longer than 64k!
1. So we will truncate the question summary to 65000 chars if necessary.

2. Also, fix one minor error in mutlianswer save_question_options.

question_bank::MAX_SUMMARY_LENGTH is not the most logical class to add
the constant to, but it needs to be accessible during upgrade, so I was
lazy and put it there.
2011-12-16 15:56:23 +00:00
Petr Skoda
e7f2c2cc9f MDL-30761 improve get_user_access_sitewide() performance 2011-12-16 16:27:01 +01:00
Petr Skoda
8a238aee75 MDL-30761 fix simpletest regression caused by rubrics 2011-12-16 14:22:20 +01:00
Petr Skoda
47651a4d8c MDL-30779 add port and socket to dbtansfer tool 2011-12-16 14:18:51 +01:00
Sam Hemelryk
6be4afb1ad MDL-30770 admin: Fixed notice about missing variable 2011-12-16 17:16:47 +13:00
Aparup Banerjee
441088d647 Merge branch 'master_MDL-28728' of git://github.com/danmarsden/moodle 2011-12-16 11:36:47 +08:00
Rajesh Taneja
e45b444e63 MDL-29067 Admin: Added spam checking on comments, messages and forum posts 2011-12-16 11:19:21 +08:00
adrian@moodle.com
98456628a2 MDL-28948 - lib - removed the hard coded key for the rc4encryt function. 2011-12-16 09:17:24 +08:00
AMOS bot
475fcd7566 Automatically generated installer lang files 2011-12-16 00:31:14 +00:00