Diana Huang
|
7860e013ad
|
Fix unit tests to handle new max score requirements.
|
2013-02-04 14:25:23 -05:00 |
|
Diana Huang
|
85abc43515
|
Add in the ability to handle due dates and grace periods
|
2013-02-04 14:02:42 -05:00 |
|
Vik Paruchuri
|
3380745692
|
About to trim some lines
|
2013-02-04 13:54:27 -05:00 |
|
Christina Roberts
|
517f756ffa
|
Merge pull request #1413 from MITx/feature/christina/misc2
See if this helps with the tab-changing race condition.
|
2013-02-04 10:34:37 -08:00 |
|
cahrens
|
39479d9e18
|
See if this helps with the tab-changing race condition.
|
2013-02-04 13:28:34 -05:00 |
|
Diana Huang
|
97a32f8ced
|
Remove extra styling.
|
2013-02-04 12:45:40 -05:00 |
|
Vik Paruchuri
|
f742b7d865
|
Start to integrate peer grading xmodule back into notifications
|
2013-02-04 12:07:03 -05:00 |
|
Diana Huang
|
f9cca8befd
|
Starting a framework for handling the closure of an open ended problem.
Currently incomplete.
|
2013-02-04 11:51:05 -05:00 |
|
Diana Huang
|
4b59e7d551
|
Fix max score check for the updated rubric UI stuff.
|
2013-02-04 10:34:00 -05:00 |
|
Diana Huang
|
f49b5ec771
|
Merge branch 'master' into diana/rubric-ui-improvements
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
common/lib/xmodule/xmodule/self_assessment_module.py
lms/djangoapps/open_ended_grading/grading_service.py
lms/static/sass/course.scss
|
2013-02-04 09:11:28 -05:00 |
|
ichuang
|
e59b0b87b1
|
add docs for conditional module; clean up a bit more
|
2013-02-03 21:07:23 -05:00 |
|
ichuang
|
4446ddb292
|
cleaned up conditional module a bit; add test for conditional module
|
2013-02-03 20:59:05 -05:00 |
|
ichuang
|
95ef12169a
|
extend conditional module to add require_attempted
|
2013-02-03 18:53:51 -05:00 |
|
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
|
95b8134731
|
initial implementation of conditional_module; doesn't load dynamically yet
|
2013-02-03 18:53:51 -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 |
|
Arthur Barrett
|
0ca7131974
|
Clicking on annotation span should scroll to the discussion widget.
|
2013-02-01 16:08:23 -05:00 |
|
Vik Paruchuri
|
b609bbeeed
|
Fix JS tests
|
2013-02-01 15:36:05 -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
|
ba30c2ce58
|
Calculate the total score from the 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
|
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 |
|
Arthur Barrett
|
8f005a5a1f
|
Moved discussion html into its own method, should probably be in a template.
|
2013-02-01 13:31:35 -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 |
|
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 |
|
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 |
|
Arthur Barrett
|
48bb447fbd
|
Adding basic annotatable module and related files.
|
2013-01-31 18:42:11 -05:00 |
|
Vik Paruchuri
|
edce6edb99
|
Clean up peer grading service imports
|
2013-01-31 18:38:55 -05:00 |
|
Vik Paruchuri
|
4825ad7a15
|
Fix module imports
|
2013-01-31 18:35:11 -05:00 |
|
Vik Paruchuri
|
59ba308354
|
Add in peer grading entry point
|
2013-01-31 18:28:15 -05:00 |
|
Vik Paruchuri
|
bdb82cda65
|
Strip out JS, old urls
|
2013-01-31 18:23:30 -05:00 |
|
Brian Talbot
|
f6cd4c75b8
|
lms - revising xmodule HTML display styles and overwriting some to retain old syllabus table styling
|
2013-01-31 18:15:20 -05:00 |
|
Vik Paruchuri
|
52f3e9daaf
|
Start moving peer grading to xmodule
|
2013-01-31 18:05:57 -05:00 |
|
Vik Paruchuri
|
c5e80b9543
|
Fix open ended module tests
|
2013-01-31 17:34:33 -05:00 |
|
Vik Paruchuri
|
d6f8def733
|
Move over rubric parsing logic to rubric module
|
2013-01-31 17:18:32 -05:00 |
|
Vik Paruchuri
|
5eff483c76
|
Fix max score in combined xmodule tests
|
2013-01-31 17:08:13 -05:00 |
|
Vik Paruchuri
|
524047a11e
|
Fix key error in open ended child
|
2013-01-31 17:06:37 -05:00 |
|
Vik Paruchuri
|
01cdc6e7f8
|
Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes
Conflicts:
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
|
2013-01-31 16:50:10 -05:00 |
|
Don Mitchell
|
fbd9a126ba
|
Merge pull request #1393 from MITx/fix/cdodge/export-static-tabs
add exporting of course info
|
2013-01-31 10:55:45 -08:00 |
|