Diana Huang
|
042ae2da29
|
Fix some bugs with the grading module and make
the 'closed' page a little nicer
|
2013-02-06 12:51:52 -05:00 |
|
Diana Huang
|
e8d01a0882
|
Merge branch 'master' into feature/diana/close-oe-problems
|
2013-02-06 11:52:40 -05:00 |
|
Diana Huang
|
78948210b8
|
Use different template when peer grading is closed.
|
2013-02-06 11:50:35 -05:00 |
|
Diana Huang
|
977e1904f9
|
Refactor out time parsing logic into its own class.
|
2013-02-06 11:25:06 -05:00 |
|
Calen Pennington
|
cfae1cdf62
|
Pep8 autofixes
|
2013-02-06 11:13:50 -05:00 |
|
Jay Zoldak
|
fde6d1ba1c
|
Refactor tests for cms contentstore.
|
2013-02-06 10:42:21 -05:00 |
|
Jay Zoldak
|
2c5a7ccdf7
|
Rearrange factories and clean up imports
|
2013-02-06 10:36:28 -05:00 |
|
Diana Huang
|
40854fc1b4
|
Merge branch 'master' into feature/diana/close-oe-problems
|
2013-02-06 10:15:18 -05:00 |
|
Diana Huang
|
f9304a88cb
|
Remove unneeded error type.
|
2013-02-06 09:15:24 -05:00 |
|
Victor Shnayder
|
4110a4e28b
|
Protect against failure to load MathJax
- e.g. if on a train and don't have access to S3 or the rest of the web
|
2013-02-05 20:15:47 -05:00 |
|
Vik Paruchuri
|
94e6346cf2
|
Fix combined open ended tests
|
2013-02-05 19:04:30 -05:00 |
|
Vik Paruchuri
|
a1e73392c1
|
Fix descriptor creation
|
2013-02-05 19:02:21 -05:00 |
|
Vik Paruchuri
|
0fc50095d9
|
Fix combined open ended tests
|
2013-02-05 18:53:53 -05:00 |
|
Vik Paruchuri
|
8877ec3500
|
More robust default version
|
2013-02-05 18:38:21 -05:00 |
|
Vik Paruchuri
|
4614687e7f
|
Debug image submissions
|
2013-02-05 18:24:18 -05:00 |
|
Diana Huang
|
6e7287dd8e
|
Fix some bugs in the peer grading problem code.
|
2013-02-05 17:36:06 -05:00 |
|
Vik Paruchuri
|
8bf29c0e1a
|
Alter image test criteria
|
2013-02-05 17:17:58 -05:00 |
|
Vik Paruchuri
|
06499bbafc
|
Fix some of the tests
|
2013-02-05 17:10:35 -05:00 |
|
Vik Paruchuri
|
1d3f8f0655
|
Pass display name and content link rewriting down the chain
|
2013-02-05 16:54:57 -05:00 |
|
Vik Paruchuri
|
8e7fa6c90c
|
Support due date and display name
|
2013-02-05 16:48:21 -05:00 |
|
Vik Paruchuri
|
e6770bcaa7
|
Parse and pass metadata
|
2013-02-05 16:42:56 -05:00 |
|
Vik Paruchuri
|
3dc05aa904
|
Make some bug fixes, alter definition passing to work
|
2013-02-05 16:25:46 -05:00 |
|
Diana Huang
|
51db547a63
|
Merge branch 'master' into diana/rubric-ui-improvements
Conflicts:
common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
|
2013-02-05 16:18:56 -05:00 |
|
Vik Paruchuri
|
ce0b31465c
|
Add in methods to interact with xmodule, change descriptor
|
2013-02-05 16:17:55 -05:00 |
|
Christina Roberts
|
8c4b661292
|
Merge pull request #1434 from MITx/bug/btalbot/studio-boldblockquote
studio - resolved HTML display issue with bold and blockquote
|
2013-02-05 13:13:44 -08:00 |
|
Diana Huang
|
a7588410b2
|
Fix tests
|
2013-02-05 16:11:04 -05:00 |
|
Vik Paruchuri
|
8ab76f72ad
|
Switching over to a versioning system
|
2013-02-05 16:07:35 -05:00 |
|
Diana Huang
|
31c89e6d03
|
Consolidate error messages.
|
2013-02-05 16:06:14 -05:00 |
|
Diana Huang
|
c70531ae27
|
Move closed check logic into the OpenEndedChild
|
2013-02-05 16:00:16 -05:00 |
|
Diana Huang
|
120aa3cd3b
|
Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule
Feature/vik/peer grading xmodule
|
2013-02-05 12:55:48 -08:00 |
|
Diana Huang
|
018412ca26
|
Return False to make this code clearer
|
2013-02-05 15:41:23 -05:00 |
|
Diana Huang
|
37900c3f76
|
Add more error logging for date parsing and make
the closure checking more robust
|
2013-02-05 15:37:20 -05:00 |
|
Brian Talbot
|
d713b288b5
|
studio - resolved HTML display issue where bold and blockquote elements didn't match LMSs style
|
2013-02-05 15:21:41 -05:00 |
|
Vik Paruchuri
|
ce87e6f221
|
Skip two tests
|
2013-02-05 14:57:59 -05:00 |
|
Vik Paruchuri
|
cae65706fd
|
Pare down on peer grading service
|
2013-02-05 14:37:08 -05:00 |
|
Vik Paruchuri
|
8027cc7024
|
Fix some issues with tests
|
2013-02-05 14:35:44 -05:00 |
|
Vik Paruchuri
|
e13de7543f
|
Test fixes, err response fixes, address review comments
|
2013-02-05 14:12:11 -05:00 |
|
Vik Paruchuri
|
34dc6e6320
|
Fix some issues with peer grading service
|
2013-02-05 13:37:55 -05:00 |
|
Vik Paruchuri
|
7984c4dfcb
|
Move over grading service to xmodule
|
2013-02-05 13:10:56 -05:00 |
|
Arthur Barrett
|
2097b69332
|
Added button to show/hide guided notes and discussions.
|
2013-02-05 13:10:23 -05:00 |
|
Arthur Barrett
|
45e4c0cfac
|
Moved discussion thread html to its own template and only scroll when not in view.
|
2013-02-05 12:37:58 -05:00 |
|
Calen Pennington
|
04879a83d3
|
Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible
|
2013-02-05 11:06:45 -05:00 |
|
Calen Pennington
|
b05ead864f
|
Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic""
This reverts commit c4f56620df.
|
2013-02-05 11:06:45 -05:00 |
|
Don Mitchell
|
82b2dc7193
|
Merge pull request #1427 from MITx/feature/christina/misc2
Do not do finds within the event method. Decreases likelihood of hitting...
|
2013-02-05 07:19:40 -08:00 |
|
cahrens
|
286616e659
|
Do not do finds within the event method. Decreases likelihood of hitting bug in older versions of Chrome.
https://edx.lighthouseapp.com/projects/102637/tickets/153
|
2013-02-05 09:50:34 -05:00 |
|
Diana Huang
|
f3be02d772
|
Merge branch 'master' into diana/rubric-ui-improvements
|
2013-02-05 09:13:14 -05:00 |
|
Diana Huang
|
4bb4c458a8
|
Merge branch 'master' into feature/diana/close-oe-problems
|
2013-02-05 09:12:08 -05:00 |
|
Arthur Barrett
|
3136d2b4c1
|
Fixed target used for span event.
|
2013-02-04 18:53:37 -05:00 |
|
Victor Shnayder
|
82afc477fa
|
Merge pull request #1396 from MITx/feature/victor/randomization
Feature/victor/randomization
|
2013-02-04 15:37:07 -08:00 |
|
Victor Shnayder
|
b6614f6939
|
add initial test that only tests the descriptor
|
2013-02-04 18:28:22 -05:00 |
|