50186 Commits

Author SHA1 Message Date
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
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
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
Marina Glancy
188e840b99 MDL-29481: when student is being regraded we try to pick up the latest saved but not submitted version of grading
There are no visible changes yet because at the moment rubric is only saved when it is submitted but this is a base for AJAX saving
2011-11-07 15:55:08 +08: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
Marina Glancy
13926e735d MDL-30159: fixed bug: When evaluating by advanced grading extra entries are inserted in grading_instances 2011-11-07 14:37:58 +08:00
Aparup Banerjee
e88c193fb0 MDL-28670 webservice : added dimming of service name in security keys page if webservice is disabled or not on authorised list to access webservice. 2011-11-07 14:21:40 +08:00
Chris Scribner
5de15b83cc MDL-20534 lti: Replacing <<< strings with normal multi-line strings. 2011-11-07 01:05:42 -05:00
Ankit Kumar Agarwal
9e07e9a782 MDL-30158 Questions Cleaning up blackboard/format.php 2011-11-07 11:11:04 +05:30
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
Marina Glancy
ffbf4370a2 MDL-30023: rubric editor usability - automatically set scores for added levels 2011-11-07 13:07:43 +08:00
Marina Glancy
2d41a9115b Fixed small bug resulting in a warning message when creating new rubric 2011-11-07 13:07:30 +08:00
Eloy Lafuente (stronk7)
a55c361955 MDL-20534 lti: various fixes 2011-11-06 22:05:35 -05:00
Eloy Lafuente (stronk7)
fabd4fcf53 MDL-20534 lti: A4, add some todos towards unified Oauth 2011-11-06 22:05:11 -05:00
Eloy Lafuente (stronk7)
fccacaa785 MDL-20534 lti: A2, cleanup upgrade and moodle1 conversion 2011-11-06 22:03:55 -05:00
Eloy Lafuente (stronk7)
ea04a9f989 MDL-20534 lti: A3, coding style + some scope, constructors 2011-11-06 22:02:26 -05:00
Chris Scribner
e27cb316aa MDL-20534 lti: A3, whitespace fixes (Changes by stronk7) 2011-11-06 22:00:40 -05:00
Chris Scribner
61eb12d4df MDL-20534 lti: A3, copyright and DOS lf fixed 2011-11-06 21:51:06 -05:00
Chris Scribner
a0ba4ec675 Add unsupported service support. 2011-11-06 20:42:03 -05:00
Chris Scribner
d8d0412168 Updating SSL settings & configuration for the LTI plugin. 2011-11-06 20:42:03 -05:00
Chris Scribner
55e89adf4d Adding securetoolurl and secureicon fields 2011-11-06 20:42:02 -05:00