Commit graph

49922 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
7ca578dea9 Merge branch 'w44_MDL-30148_m22_guestpass' of git://github.com/skodak/moodle 2011-11-09 23:59:02 +01:00
Eloy Lafuente (stronk7)
d64cb2fb73 Merge branch 'w44_MDL-30131_m22_enrolcaching' of https://github.com/skodak/moodle 2011-11-09 23:47:01 +01:00
Sam Hemelryk
e3dfd1a1d9 Merged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/moodle.git with conflict resolution 2011-11-10 10:15:50 +13:00
Sam Hemelryk
7d99144e83 Merge branch 'w44_MDL-30150_m22_pagetypefrankenstyle' of git://github.com/skodak/moodle 2011-11-10 09:41:38 +13:00
Eloy Lafuente (stronk7)
ff64599f25 Merge branch 'w44_MDL-29897_m22_upgradetxt' of git://github.com/skodak/moodle 2011-11-09 16:35:57 +01:00
Eloy Lafuente (stronk7)
b5b99e0b7a NOBUG: Whitespace fixes 2011-11-09 16:32:30 +01:00
Eloy Lafuente (stronk7)
3fa5cb0bea Merge branch 'MDL-27542b' of git://github.com/rwijaya/moodle 2011-11-09 15:55:07 +01:00
Aparup Banerjee
b965ee236c Merge branch 'MDL-29620-workshop-sequence' of git://github.com/mudrd8mz/moodle 2011-11-09 17:55:04 +08:00
Eloy Lafuente (stronk7)
c4bdf6b2d4 Merge branch 'w44_MDL-30151_m22_initialforumsubscribe' of git://github.com/skodak/moodle 2011-11-09 10:05:40 +01:00
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
Rossiani Wijaya
d52777b486 MDL-27542 calendar export: fixed the following:
1. changing auth token to use user id instead of username
2. add fall back checking for old url
3. remove yui functionality to generate calendar url
4. add missing variable
5. fixed usercontext instance
2011-11-07 17:07:00 +08:00
Petr Skoda
274a7d3701 MDL-29030 add block page type upgrade 2011-11-07 09:13:51 +01: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