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 |
|
John Jarvis
|
1c09d9cacb
|
For prod environments only log info and up
|
2013-02-01 13:34:29 -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 |
|
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 |
|
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 |
|
Vik Paruchuri
|
f3f509da3b
|
Fix input area styling
|
2013-01-31 12:45:48 -05:00 |
|
Victor Shnayder
|
6088a926cc
|
Add showanswer="past_due" and tests
|
2013-01-31 12:34:43 -05:00 |
|
Victor Shnayder
|
ea091a6eb8
|
Add tests for showanswer
|
2013-01-31 12:34:42 -05:00 |
|
Victor Shnayder
|
025b074b87
|
Add simple test for showanswer, fix test_system
|
2013-01-31 12:34:42 -05:00 |
|
Victor Shnayder
|
e41172d55d
|
Add start of test framework for capa
|
2013-01-31 12:34:41 -05:00 |
|
Vik Paruchuri
|
a61746609c
|
Fix keyerror
|
2013-01-31 12:18:42 -05:00 |
|
Victor Shnayder
|
e0fb906c06
|
add note about potential bug in verticals. No time to investigate at the moment...
|
2013-01-31 12:14:20 -05:00 |
|
Victor Shnayder
|
e431378f46
|
Add first pass at a randomize module
|
2013-01-31 12:14:01 -05:00 |
|
Jay Zoldak
|
6fe209b0cf
|
Merge pull request #1392 from MITx/tests/diana/update-oe-unit-tests
New tests for OpenEndedGrading
|
2013-01-31 08:34:06 -08:00 |
|
Vik Paruchuri
|
ee06afcb27
|
Possibly fix self assessment tests
|
2013-01-31 11:06:12 -05:00 |
|
Victor Shnayder
|
ada9ff7f27
|
Fix randomization bug in capa.
(Note: capa_problem was still doing randomization internally, but now it does what's actually intended)
|
2013-01-31 10:45:11 -05:00 |
|
Chris Dodge
|
0d20c192b9
|
add exporting of course info
|
2013-01-31 09:57:07 -05:00 |
|
Diana Huang
|
8144a1dfaf
|
Add in next_problem jasmine tests
|
2013-01-30 17:25:13 -05:00 |
|
Calen Pennington
|
c4f56620df
|
Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"
This reverts commit ab437b9463, reversing
changes made to 7a8e87c789.
|
2013-01-30 16:49:49 -05:00 |
|
Vik Paruchuri
|
2ba194a4f6
|
Change step names to human names
|
2013-01-30 16:44:40 -05:00 |
|
Diana Huang
|
36d8b8768c
|
Merge branch 'master' into tests/diana/update-oe-unit-tests
|
2013-01-30 16:41:18 -05:00 |
|
Diana Huang
|
6322263c90
|
New Jasmine tests
|
2013-01-30 16:40:55 -05:00 |
|