Commit graph

50676 commits

Author SHA1 Message Date
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
Sam Hemelryk
3c0c2bf080 MDL-27622 theme_mymobile: Pre-integration clean up 2011-11-09 18:18:41 +13: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
Mary Evans
4db41cbdcf MDL-25511-theme_canvas tidy up CORE css files 2011-11-09 02:22:36 +00: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
David Mudrak
9faf837fc0 Moved CSS into the base theme to make the UI friendly in all themes by default 2011-11-08 23:58:10 +01:00
David Mudrak
37065c2e06 MDL-29793 Advanced grading forms attached to activity modules can be restored now 2011-11-08 23:33:40 +01:00
Colin Chambers
e3ab75de2b MDL-30185 reduce height of true/false question type fields 2011-11-08 16:18:07 +00:00
David Mudrak
9b553d472e MDL-29793 Advanced grading forms attached to activity modules are included in the backup now 2011-11-08 16:25:58 +01:00
Aparup Banerjee
98901d3ea9 Merge branch 'MDL-29739' of git://github.com/timhunt/moodle 2011-11-08 20:34:41 +08:00
Eloy Lafuente (stronk7)
8f76418516 MDL-20534 lti: added missing MOODLE_INTERNAL checks 2011-11-08 12:09:49 +01:00
Aparup Banerjee
3c905de59d Merge branch 'MDL-29970' of git://github.com/timhunt/moodle 2011-11-08 16:48:59 +08:00
David Mudrak
3e5e7004c5 Merge pull request #24 from marinaglancy/wip-nov08-rubric 2011-11-08 00:23:45 -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
Marina Glancy
c97933ffa3 MDL-30161: link from gradebook (grading analysis) only appears now in Grader report but for all items; in User report the link under activity name contains userid 2011-11-08 14:09:50 +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
Eloy Lafuente (stronk7)
419c4f54c5 MDL-20534 lti: comments cleanup 2011-11-08 03:36:26 +01:00
Marina Glancy
8545f86cc9 Fixed small bug in displaying locked outcomes in assignment grade form 2011-11-08 10:34:23 +08:00
Eloy Lafuente (stronk7)
64ce589b39 MDL-20534 lti: various fixes 2011-11-08 03:31:44 +01:00
Marina Glancy
71380f2f14 MDL-30061: advanced grading evaluation freezes now if grade is locked or overriden 2011-11-08 10:06:33 +08:00
Eloy Lafuente (stronk7)
b9fbe554ef MDL-20534 lti: fix settings page, needs more work (B12) 2011-11-08 02:29:24 +01:00
Marina Glancy
050125d47e fixed bug that appeared when teacher grades student with a rubric for the first time 2011-11-08 09:15:42 +08:00
Eloy Lafuente (stronk7)
5f1362550f MDL-20534 lti: reformat queries and fix some errors 2011-11-08 02:12:39 +01:00
Eloy Lafuente (stronk7)
c69bd1af4f MDL-20534 lti: various fixes to add/update_instance() 2011-11-08 02:11:53 +01:00
David Mudrak
bb50c37651 MDL-30162 The grading method can be selected when creating new instance of the activity module 2011-11-08 01:54:36 +01:00
Sam Hemelryk
ee16b8af34 Merge branch 'MDL-25823' of git://github.com/rwijaya/moodle 2011-11-08 13:10:00 +13:00
David Mudrak
b2c16c6e51 Files embedded into the form description are now served by the core itself
The grading form description is in the core scope so it should be served
by the core, not by the plugin.
2011-11-08 01:06:47 +01:00
Sam Hemelryk
195ad02f4a Merge branch 'wip-MDL-30059-master' of git://github.com/phalacee/moodle 2011-11-08 13:00:00 +13:00