49873 Commits

Author SHA1 Message Date
Sun Zhigang
29a9ba9130 MDL-29656 Fix bad string reference 2011-11-09 16:47:16 +08:00
Eloy Lafuente (stronk7)
7654b7bbc1 Merge branch 'MDL-28277-master' of git://github.com/ankitagarwal/moodle 2011-11-09 09:43:18 +01:00
Ankit Kumar Agarwal
f9ab70a908 MDL-28277 Changing optional_param to optional_param_array 2011-11-09 13:29:26 +05:30
Dan Poltawski
39b7715099 MDL-29696 mod/data - fixed page continuing after footer. 2011-11-09 15:42:07 +08:00
Sun Zhigang
81bb0556d9 MDL-29722 - No default guest enrol instance for requested courses 2011-11-09 15:20:00 +08:00
Aparup Banerjee
024f0f7374 Merge branch 'MDL-29977-mnet-masquerade' of git://github.com/mudrd8mz/moodle 2011-11-09 13:40:24 +08:00
Aparup Banerjee
92f6c2eb7f Merge branch 'MDL-30021' of git://github.com/timhunt/moodle 2011-11-09 12:19:20 +08:00
Aparup Banerjee
097ba12ba0 Merge branch 'MDL-29058' of git://github.com/timhunt/moodle 2011-11-09 11:29:45 +08:00
Dan Poltawski
2d7ad201ac MDL-29812 partcipiant report - breaks when filtering by user 2011-11-09 11:17:17 +08:00
Aparup Banerjee
5b653c75dd Merge branch 'wip-MDL-24200-master' of git://github.com/phalacee/moodle 2011-11-09 11:05:32 +08:00
Eloy Lafuente (stronk7)
b7830daba1 Merge branch 'master_MDL-29159' of git://github.com/danmarsden/moodle 2011-11-09 02:20:26 +01:00
Eloy Lafuente (stronk7)
0a9ed36c9e Merge branch 'master_MDL-30146' of git://github.com/danmarsden/moodle 2011-11-09 02:13:38 +01:00
Eloy Lafuente (stronk7)
ec25a72c4d Merge branch 'master_MDL-27036' of git://github.com/danmarsden/moodle 2011-11-09 02:03:25 +01:00
Eloy Lafuente (stronk7)
df087b865b Merge branch 'master_MDL-30041' of git://github.com/danmarsden/moodle 2011-11-09 01:34:08 +01:00
Eloy Lafuente (stronk7)
e7ec46fc59 MDL-28277 SCORM some whitespace and MOODLE_INTERNAL fixes 2011-11-09 01:30:51 +01:00
Eloy Lafuente (stronk7)
253b3231b9 Merge branch 'MDL-28277-master' of git://github.com/ankitagarwal/moodle 2011-11-09 01:20:06 +01:00
Dan Poltawski
c1733742c6 MDL-29803 report/logs - don't retrieve all users uncessarily
Also remove uncessary retrieval of idnumber

Helps display the main logs page on large sites without running out of
memory
2011-11-09 00:49:36 +01:00
Aparup Banerjee
98901d3ea9 Merge branch 'MDL-29739' of git://github.com/timhunt/moodle 2011-11-08 20:34:41 +08:00
Aparup Banerjee
3c905de59d Merge branch 'MDL-29970' of git://github.com/timhunt/moodle 2011-11-08 16:48:59 +08:00
Aparup Banerjee
3730e077fc Merge branch 'wip-mdl-27521-master' of git://github.com/phalacee/moodle 2011-11-08 15:18:22 +08:00
Aparup Banerjee
3a21e47829 Merge branch 'wip-mdl-27790-modified' of git://github.com/rajeshtaneja/moodle 2011-11-08 14:50:16 +08:00
Aparup Banerjee
7e63edc42f Merge branch 'MDL-30135' of git://github.com/timhunt/moodle 2011-11-08 11:43:49 +08:00
Aparup Banerjee
d4bdd01bd2 Merge branch 'MDL-30137' of git://github.com/timhunt/moodle 2011-11-08 11:37:59 +08:00
Rajesh Taneja
687f512d88 MDL-27790 Backup: Added warning message to let user know that temporary course will be created for restoration process 2011-11-08 11:37:48 +08:00
Rajesh Taneja
416128379f MDL-27790 Backup: temperory course will be deleted in case of exception and cancellation of restore process 2011-11-08 11:37:43 +08:00
Aparup Banerjee
5d788e38ff MDL-30154 Repositories : fixed whitespace. 2011-11-08 11:29:31 +08:00
Aparup Banerjee
7a3a8fd0c5 Merge branch 'MDL-30154_master_wip' of git://github.com/grabs/moodle 2011-11-08 11:15:01 +08:00
Sam Hemelryk
ee16b8af34 Merge branch 'MDL-25823' of git://github.com/rwijaya/moodle 2011-11-08 13:10:00 +13:00
Sam Hemelryk
195ad02f4a Merge branch 'wip-MDL-30059-master' of git://github.com/phalacee/moodle 2011-11-08 13:00:00 +13:00
Sam Hemelryk
3e4fb0cf81 Merge branch 'MDL-30044-master' of git://github.com/ankitagarwal/moodle 2011-11-08 11:58:10 +13:00
Sam Hemelryk
daa1ed26cf Merge branch 'MDL-30175' of git://github.com/stronk7/moodle 2011-11-08 10:57:54 +13:00
Eloy Lafuente (stronk7)
c443a1cdb6 MDL-30175 cm_info - add support to external url icon images 2011-11-07 22:14:13 +01:00
Tim Hunt
4a84c94bec MDL-30135 question formats: trans_format/get_format should be public.
They need to be used by third-party qtype developers.
2011-11-07 11:31:27 +00:00
Jason Fowler
483239087c MDL24200 - Admin Users - Changing the submit button to just a button to prevent it from taking focus when entering text. (Patch provided by Hubert Chathi) 2011-11-07 15:29:11 +08:00
Mark Nielsen
92d0dd9fb8 MDL-30059: Assignment Submission Notification Should Use Teacher's Timezone Rather Than Server Time 2011-11-07 13:32:49 +08:00
Dan Marsden
3cfffd8c3e SCORM MDL-27036 increase sessid, improve lang strings 2011-11-07 14:34:13 +13:00
Sam Hemelryk
efe41e35c9 MDL-28292 block_html: white space fix 2011-11-07 12:33:18 +13:00
Sam Hemelryk
68bcca4d04 Merge branch 'wip-MDL-28292-master' of git://github.com/phalacee/moodle 2011-11-07 12:24:26 +13:00
Sam Hemelryk
a86529bdeb MDL-29864 minify: Added a link to upstream issue being patched 2011-11-07 12:19:57 +13:00
Sam Hemelryk
a82a42b6c1 Merge branch 'MDL-29864-master-2' of git://git.luns.net.uk/moodle 2011-11-07 11:58:44 +13:00
Sam Hemelryk
0abe89f7b4 Merge branch 'MDL-29955' of git://github.com/rwijaya/moodle 2011-11-07 11:41:31 +13:00
Andreas Grabs
6543f3cd5b MDL-30154 - WebDAV-Repository fails on some WebDAV-Server 2011-11-06 22:09:11 +01:00
Dan Marsden
4388bd45b2 SCORM MDL-30146 AICC - add ability to link direct to a simple AICC url 2011-11-05 21:51:24 +13:00
Dan Marsden
ba0e91a281 SCORM MDL-27036 enable AICC HACP 2011-11-05 20:31:01 +13:00
Tim Hunt
f484a62984 MDL-30137 question engine: Ugglify the SQL to appease MS SQL server. 2011-11-04 15:02:29 +00:00
David Mudrak
10df8657c1 MDL-29977 MNet does not allow to start a remote session when masquerading as another user 2011-11-04 10:02:19 +01:00
Ankit Kumar Agarwal
3ab853fade MDL-28277 SCORM optimising function get_scorm_question_count 2011-11-04 11:27:17 +05:30
Dan Marsden
7320f48b98 SCORM MDL-29159 - override getContentHtml function in treeview so that it doesn't escape text incorrectly 2011-11-04 00:29:05 +13:00
Tim Hunt
de529cd253 MDL-30021 qtype numerical better showunits default when coming from 1.9
This applies to:
1. Upgrade from 1.9,
2. Import of questions exported from 1.9, and
3. Restore of courses backed-up from 1.9.

It also applies to the calculated question type.
2011-11-03 11:27:41 +00:00
Tim Hunt
78fc17ebdf MDL-29058 question export: include files from hints & combined feedback. 2011-11-03 11:27:39 +00:00