Commit Graph

10188 Commits

Author SHA1 Message Date
ichuang
1d29e1f2f4 comment out some debug in conditional_module; leave undeleted for future tests 2013-02-03 18:53:51 -05:00
ichuang
363ca7031e add coffeescript/js for conditional module, does XModule.loadModules 2013-02-03 18:53:51 -05:00
ichuang
19051e40d2 use ajax for doing conditional_module 2013-02-03 18:53:51 -05:00
ichuang
8db96abb18 conditional_module.html 2013-02-03 18:53:51 -05:00
ichuang
95b8134731 initial implementation of conditional_module; doesn't load dynamically yet 2013-02-03 18:53:51 -05:00
Kevin Chugh
fcbd4bd1cd produce and consume group_id from dropdowns 2013-02-02 05:46:11 -05:00
VikParuchuri
01fab2ec68 Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes
Feature/vik/combined xmodule changes
2013-02-01 15:46:33 -08:00
Vik Paruchuri
d9517877a4 Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging 2013-02-01 18:32:48 -05:00
Vik Paruchuri
9310dcbe0d Remove reload test 2013-02-01 18:31:50 -05:00
Brian Wilson
9d98b7055d add course navigation back into timed exam. Add initial timer styling. 2013-02-01 17:52:14 -05:00
Don Mitchell
1595bd9b0e Move dnd code from base.js to a js file only loaded by overview.html 2013-02-01 17:20:58 -05:00
Vik Paruchuri
b609bbeeed Fix JS tests 2013-02-01 15:36:05 -05:00
Diana Huang
a85d43a817 Make rubrics spacing smaller and
fix a bug in the grading service renderer
2013-02-01 15:15:42 -05:00
Diana Huang
71c233af15 Fix bug in the callback 2013-02-01 15:15:42 -05:00
Diana Huang
1c5c54c862 Make the rubric for self-assessment selectable and remove the
separate grade selection.
2013-02-01 15:15:42 -05:00
Diana Huang
68fc794a97 Add in some better encouragement to write feedback 2013-02-01 15:15:42 -05:00
Diana Huang
745c052775 Remove duplicate Javascript and remove total grade selection. 2013-02-01 15:15:42 -05:00
Diana Huang
ba30c2ce58 Calculate the total score from the rubric. 2013-02-01 15:15:42 -05:00
Diana Huang
0bae983982 Visual updates to rubric 2013-02-01 15:15:42 -05:00
Diana Huang
92b7dbdc69 Refactor rubric JS so that we don't have to keep duplicating this code. 2013-02-01 15:15:42 -05:00
Diana Huang
1fde3c5ec5 Make rubric cleaner and visually simpler 2013-02-01 15:15:42 -05:00
Diana Huang
7e345ce512 Add scores to the top of the rubric, remove from individual cells 2013-02-01 15:15:42 -05:00
Diana Huang
69d5c005c3 Refactor rubric CSS into a single file. 2013-02-01 15:15:42 -05:00
Diana Huang
00ffbc070a Make rubrics spacing smaller and
fix a bug in the grading service renderer
2013-02-01 14:34:09 -05:00
John Jarvis
1c09d9cacb For prod environments only log info and up 2013-02-01 13:34:29 -05:00
John Jarvis
f525b17b1a pep8 cleanup 2013-02-01 13:13:16 -05:00
John Jarvis
8b01298969 Removing duplicate loggers 2013-02-01 13:11:14 -05:00
John Jarvis
4a08bc7759 Adding service_variant and a little pep8 cleanup 2013-02-01 13:10:26 -05:00
Diana Huang
91d9bc05be Fix bug in the callback 2013-02-01 13:06:12 -05:00
Your Name
8fd32ed502 update to show cohort name on create and cohort name on view all threads, added cohort dictionary to convert ids to names 2013-02-01 13:01:54 -05:00
Diana Huang
2b764eebad Make the rubric for self-assessment selectable and remove the
separate grade selection.
2013-02-01 11:27:53 -05:00
Diana Huang
1fef6b161b Add in some better encouragement to write feedback 2013-02-01 11:21:56 -05:00
Ned Batchelder
6b6d8a94d0 Don't use PyYAML's .load() for reading YAML, use .safe_load() to avoid security problems. 2013-02-01 10:50:01 -05:00
Diana Huang
cb44918f49 Remove duplicate Javascript and remove total grade selection. 2013-02-01 10:31:46 -05:00
Diana Huang
0ec3be1815 Calculate the total score from the rubric. 2013-02-01 10:17:16 -05:00
Christina Roberts
14ca42a5dc Merge pull request #1405 from MITx/style/btalbot/lms-courseinfolists
temporary style sync up for course info lists
2013-02-01 06:51:35 -08:00
Calen Pennington
dce65f2ab7 Merge pull request #1404 from MITx/feature/edz/service-variant
service variant code for loading different config
2013-02-01 06:49:51 -08:00
Brian Talbot
61de4c028a temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog) 2013-02-01 09:41:51 -05:00
Vik Paruchuri
c4b9288c6d Add comment describing why commented out code is there 2013-02-01 09:32:29 -05:00
Vik Paruchuri
78dda49764 Fix jasmine tests? 2013-02-01 09:28:52 -05:00
Diana Huang
f05bda7644 Visual updates to rubric 2013-02-01 08:44:08 -05:00
Diana Huang
6575386d69 Refactor rubric JS so that we don't have to keep duplicating this code. 2013-02-01 08:43:55 -05:00
e0d
969737c58e service variant code for loading different config 2013-01-31 21:43:35 -05:00
Vik Paruchuri
5ac6439cc0 Xmodule working...need to work on some issues (rubric scores not passing properly), and also fix notifications 2013-01-31 20:22:35 -05:00
Vik Paruchuri
d1c55208c1 Clean up response code 2013-01-31 20:08:55 -05:00
Vik Paruchuri
c1583dbba2 Properly load javascript, fix templates to work with xmodule, modify AJAX handlers 2013-01-31 19:57:35 -05:00
Vik Paruchuri
c2f644656d Fix HTML return 2013-01-31 19:12:49 -05:00
Vik Paruchuri
d8b94f91bd Don't pass course to templates 2013-01-31 18:53:17 -05:00
Vik Paruchuri
4608bb274e Fix system passing issues 2013-01-31 18:43:13 -05:00
Vik Paruchuri
edce6edb99 Clean up peer grading service imports 2013-01-31 18:38:55 -05:00