Commit graph

50608 commits

Author SHA1 Message Date
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
Eloy Lafuente (stronk7)
7fdee5b643 MDL-20534 lti: add component and set lti module as core one 2011-11-08 00:55:59 +01:00
Eloy Lafuente (stronk7)
3bc4f6336b MDL-20534 lti: fix last whitespace issues + borked lang file 2011-11-08 00:36:00 +01:00
Eloy Lafuente (stronk7)
b5d68e50a6 MDL-20534 lti: A7, delete some unused/empty files 2011-11-08 00:01:01 +01:00
Sam Hemelryk
3e4fb0cf81 Merge branch 'MDL-30044-master' of git://github.com/ankitagarwal/moodle 2011-11-08 11:58:10 +13:00
Eloy Lafuente (stronk7)
b1e9a121c9 MDL-20534 lti: fix some errors introduced by myself in the cleanup 2011-11-07 23:41:05 +01:00
Eloy Lafuente (stronk7)
6c64e8ac17 MDL-20534 lti: B3, A6, apply new external icons support to lti (MDL-30175) 2011-11-07 23:40:52 +01:00
Eloy Lafuente (stronk7)
5e1f727df7 MDL-20534 lti: B3, revert old outputlib hack for external icons 2011-11-07 23:35:58 +01:00
David Mudrak
b02b7c5add MDL-30111 Rubric - reordered English strings by stringid 2011-11-07 23:23:38 +01:00
Martin Dougiamas
de2eb195fe MDL-30111 Rubric - some English strings rewording 2011-11-07 23:19:51 +01: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
Andrew Robert Nicols
2a420f5cd4 MDL-30042: Sanitize httpwwwroot in mnet jump 2011-11-07 14:35:46 +00:00
Tony Levi
bce6b3c70a MDL-24577: Fix mark all posts in this discussion read doesn't work completely correct 2011-11-07 12:59:26 +00:00
David Mudrak
903198de7b Merge pull request #23 from marinaglancy/wip-nov07-rubric 2011-11-07 04:47:29 -08: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
Andrew Robert Nicols
7633f4b55b MDL-30165: Make repository file extension check case insensitive 2011-11-07 11:14:19 +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