Commit Graph

10188 Commits

Author SHA1 Message Date
Victor Shnayder
697c1d7bc9 sample script to log in and upload an answer to a problem 2013-02-05 20:15:48 -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
Victor Shnayder
6b468df57d Merge pull request #1441 from MITx/hotfix/dave/revert_comment_client_changes
Revert "Fix permissions bug and add test cases for django comment client...
2013-02-05 15:54:25 -08:00
Vik Paruchuri
0fc50095d9 Fix combined open ended tests 2013-02-05 18:53:53 -05:00
David Ormsbee
a3a886bd0f Revert "Add tests for django-comment-client models" (which actually had
a model change as well)

This reverts commit 053547453e.
2013-02-05 18:51:16 -05:00
David Ormsbee
119b4206a4 Revert "Fix permissions bug and add test cases for django comment client permissions."
This reverts commit e745087455.
2013-02-05 18:42:01 -05:00
Vik Paruchuri
8877ec3500 More robust default version 2013-02-05 18:38:21 -05:00
Your Name
d5b70d7bfc inline cohorting working 2013-02-05 18:38:06 -05:00
Vik Paruchuri
4614687e7f Debug image submissions 2013-02-05 18:24:18 -05:00
Brian Wilson
1b465d1beb implement testcenter_login 2013-02-05 18:01:55 -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
Christina Roberts
3222e083eb Merge pull request #1435 from MITx/feature/cale/no-course-collectstatic-bugfix
Fix bug where we imported two functions w/ the same name
2013-02-05 13:36:56 -08:00
Christina Roberts
0d8cfb9baa Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404
change from throwing a Http404 exception, which I believe will try to re...
2013-02-05 13:36:28 -08:00
Vik Paruchuri
0133c7c669 Patch peer grading tab to work 2013-02-05 16:32:40 -05:00
David Ormsbee
b68aff72f2 Merge pull request #1436 from MITx/debug/dave/sass
undo pipeline changes
2013-02-05 13:26:22 -08:00
Chris Dodge
3fa1fe0cd6 change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404. 2013-02-05 16:26:07 -05:00
David Ormsbee
1ef9d6388f re-add compression flag to sass 2013-02-05 16:25:59 -05:00
Vik Paruchuri
3dc05aa904 Make some bug fixes, alter definition passing to work 2013-02-05 16:25:46 -05:00
David Ormsbee
706a1072b9 undo pipeline changes 2013-02-05 16:24:53 -05:00
Calen Pennington
8360a7a7f5 Fix bug where we imported two functions w/ the same name 2013-02-05 16:23:10 -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
134f2f7af7 Fix tests, bugfix for problem url error 2013-02-05 14:21:08 -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
David Ormsbee
74c112e5cc Merge pull request #1373 from MITx/feature/zoldak/django-comment-client-tests
Add unit tests for django comment client
2013-02-05 10:37:18 -08:00
David Ormsbee
e50652e733 Merge pull request #1397 from MITx/feature/cale/no-course-collectstatic
Free courses from the confines of collectstatic
2013-02-05 10:32:54 -08:00
Vik Paruchuri
7984c4dfcb Move over grading service to xmodule 2013-02-05 13:10:56 -05:00
Calen Pennington
69ee6b584e Merge pull request #1430 from MITx/feature/jarv/remove-repos-cfg
Removing repos.json import
2013-02-05 08:43:47 -08:00
John Jarvis
bff477e8d3 Removing repos.json import 2013-02-05 11:35:12 -05:00
Calen Pennington
4d8165b2b6 Remove bad import of replace_urls 2013-02-05 11:06:46 -05:00