Brian Wilson
c2d5c04d9d
Merge branch 'master' into fix/brian/nonascii-html-xmodule
2012-12-04 13:26:37 -05:00
Brian Wilson
cde20758f8
cosmetic cleanup
2012-12-04 13:25:04 -05:00
Brian Wilson
dfb9913100
clean up lms tests, and fix export/import
2012-12-04 11:52:35 -05:00
Brian Wilson
4ebd70dcc4
add support for utf8 in sequences, verticals and custom modules.
2012-12-04 03:54:36 -05:00
Diana Huang
9b1cad90b5
Fix location that gets used for open-ended responses
2012-12-03 16:52:29 -05:00
Brian Wilson
5b02e1e3ce
add additional html tests
2012-12-03 16:26:08 -05:00
Brian Wilson
1d44ebb10c
Add more non-ascii characters to full dataset, and make fixes in xmodule code.
2012-12-03 16:22:25 -05:00
Diana Huang
65c56edb5c
Better error logging when login into queue fails
2012-12-03 15:04:34 -05:00
Victor Shnayder
22ce306f64
whitespace and comments
2012-12-03 12:50:41 -05:00
Victor Shnayder
63c1a8ea10
whitespace
2012-12-03 12:50:41 -05:00
Don Mitchell
50d7e6160e
Move models from common to cms.
...
Add unit tests.
2012-12-03 12:20:15 -05:00
Victor Shnayder
97fbd02cb5
Merge pull request #1090 from MITx/vik/modify_open_ended
...
Vik/modify open ended
2012-12-03 06:10:01 -08:00
Brian Wilson
0c1ebd8dfb
add toylab test data and test changes, including fix to jump_to
2012-11-30 19:05:26 -05:00
David Ormsbee
c2c016c58b
Fix MathJax S3 URL to use the standard HTTPS location
2012-11-30 18:00:45 -05:00
David Ormsbee
0b3d739646
Switch to S3 hosted mathjax (I thought we did this ages ago).
2012-11-30 17:01:30 -05:00
Vik Paruchuri
bcd3022320
Add in import for reverse in staff grading (wouldn't work without it)
2012-11-30 15:26:52 -05:00
Vik Paruchuri
3fa1cfd010
Minor bugfix
2012-11-30 14:16:30 -05:00
Vik Paruchuri
6e75584d06
Convert templates to mako
2012-11-30 14:14:29 -05:00
Vik Paruchuri
a20a6c8fb5
Do all html rendering and generation in lms
2012-11-30 14:11:43 -05:00
Victor Shnayder
32d8a6e922
Pass through course_id, location to openendedresponse
...
- set default queue in response type--don't use the default per-course one
2012-11-30 14:11:11 -05:00
Vik Paruchuri
2621d07ced
Remove unneeded debug statements
2012-11-30 13:48:17 -05:00
Vik Paruchuri
2a0c9d0c70
Handle templating within lms
2012-11-30 12:48:13 -05:00
Vik Paruchuri
7330bef8e6
Changes to fix compatibility with controller feedback
2012-11-30 12:11:58 -05:00
Vik Paruchuri
15c5072984
Work on template render code
2012-11-30 11:47:12 -05:00
Vik Paruchuri
51e148a7a7
Add in support for rendering feedback within lms
2012-11-30 11:42:24 -05:00
Victor Shnayder
052807d7f6
Change the unique student id calculation to match the id we send to xqueue
...
- can't change the xqueue one because there's data that uses it
- we checked, and no one has sent out survey links that use the old sha1() format
doing this because we'll need the LMS to be able to send the anon student id to backend services e.g. for peer grading, and passing two different anon student ids to xmodule (one for xqueue, one for other uses) is just asking for confusion.
2012-11-30 11:30:02 -05:00
Don Mitchell
8379e3038d
Moved settings models from common to cms
2012-11-30 10:42:23 -05:00
Don Mitchell
0b7bff4c3f
Everything tested and ready for Tom to fix
2012-11-30 10:40:19 -05:00
Victor Shnayder
5bf39fef96
Cherry pick the test-cleanup parts of e2826cb.
...
- look up test courses by id, not name
2012-11-30 09:52:34 -05:00
Victor Shnayder
9d8d6655c6
add docstring for expect_json decorator
2012-11-30 09:51:35 -05:00
Victor Shnayder
6b5125c4df
fix typos, logger configs
2012-11-30 09:51:33 -05:00
Vik Paruchuri
c2bf0689b6
Remove correct from expected tags
2012-11-29 16:11:52 -05:00
Vik Paruchuri
1a22d3a15f
Lowercase False
2012-11-29 16:11:51 -05:00
Vik Paruchuri
422ecb5b9d
define correctness in the response type
2012-11-29 16:11:51 -05:00
Vik Paruchuri
1e194f0e1a
Fix rubric code, make sure it is removed properly.
2012-11-29 16:11:51 -05:00
Vik Paruchuri
d71445f9d8
Add rubric field to open ended response
2012-11-29 16:11:51 -05:00
Vik Paruchuri
565f502cb1
Add in prompt tag to openended response and parse/pass along properly
2012-11-29 16:11:51 -05:00
Vik Paruchuri
e17db85d34
Add in max score attribute for proper instructor scoring
2012-11-29 16:11:51 -05:00
Vik Paruchuri
0c69c46658
Remove need for msg
2012-11-29 16:11:50 -05:00
Vik Paruchuri
14403103a4
Remove msg key from xqueue passback dict
2012-11-29 16:11:50 -05:00
Vik Paruchuri
9abd80203f
Pass course id in payload
2012-11-29 16:11:50 -05:00
Vik Paruchuri
06a00a982a
Send location to external grader
2012-11-29 16:11:50 -05:00
Vik Paruchuri
941ef52863
Add docs, fix some logic
2012-11-29 16:11:50 -05:00
Vik Paruchuri
dba8a7a767
Add anonymous student id to grader payload
2012-11-29 16:11:50 -05:00
Vik Paruchuri
a901757dd7
Fix minor bug with removed grader type tag
2012-11-29 16:11:50 -05:00
Vik Paruchuri
d59681e3aa
Alter css tag names, change documentation and answer display settings.
2012-11-29 16:11:49 -05:00
Vik Paruchuri
ce7444780b
Add in feedback, work on css to display open ended feedback
2012-11-29 16:11:49 -05:00
Vik Paruchuri
e2d19d1a40
Add openendedparam to list of tags to remove from output html
2012-11-29 16:11:49 -05:00
Vik Paruchuri
bf361af3b3
Added debug code, then removed it
2012-11-29 16:11:49 -05:00
Vik Paruchuri
5c7e6415be
Modify capa types
2012-11-29 16:11:49 -05:00
