Commit Graph

9919 Commits

Author SHA1 Message Date
Victor Shnayder
02eb55a913 Compiled version of Carlos' merge 2013-02-05 20:15:50 -05:00
Carlos Andrés Rocha
9bc25ff372 Replace editamolecule input type applet with GWT version 2013-02-05 20:15:50 -05:00
Victor Shnayder
ab9bd4b805 Have errors go through jsmolcalc's getInfo 2013-02-05 20:15:50 -05:00
jmclaus
d74b21e444 Added edit a gene 2013-02-05 20:15:50 -05:00
Carlos Andrés Rocha
752a455257 Fixed design-a-protein input type to save the value of output 2013-02-05 20:15:50 -05:00
jmclaus
bc3f373edf Added design protein 2D 2013-02-05 20:15:49 -05:00
Carlos Andrés Rocha
a52bf81846 WIP Support multiple edit-a-molecule applets 2013-02-05 20:15:49 -05:00
Carlos Andrés Rocha
11db1190e6 WIP Save edit-a-molecule state in input field
Also add reset button and fix run condition from the GWT loader in Firefox
2013-02-05 20:15:49 -05:00
Carlos Andrés Rocha
41cce2d84f WIP Rename edit-a-molecule files to be more consistent 2013-02-05 20:15:49 -05:00
Carlos Andrés Rocha
b864770da4 WIP show edit-a-molecule applet 2013-02-05 20:15:49 -05:00
Carlos Andrés Rocha
efaaf58db5 WIP restore chemicalequationinput template 2013-02-05 20:15:49 -05:00
Carlos Andrés Rocha
f68f023e35 WIP integration of edit-a-molecule 2013-02-05 20:15:48 -05:00
Victor Shnayder
c5b86f3e81 Initial template for edit a molecule input 2013-02-05 20:15:48 -05:00
Carlos Andrés Rocha
d0d15c0dc2 Import edit-a-molecule resources 2013-02-05 20:15:48 -05:00
Victor Shnayder
739938f35f add readme for symbolicresponse implementation (thanks Ike!) 2013-02-05 20:15:48 -05:00
Victor Shnayder
6d053b35c3 change sample upload script to work properly over https 2013-02-05 20:15:48 -05:00
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
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
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
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
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
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
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
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
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
Calen Pennington
0350d15e29 Make static_replace fall back to data_directory prefix, if it doesn't find the file anywhere else 2013-02-05 11:06:46 -05:00
Calen Pennington
90107fa88f Import cache function correctly 2013-02-05 11:06:46 -05:00
Calen Pennington
10f8dbfa46 Handle options passed to clear_collectstatic_cache 2013-02-05 11:06:46 -05:00
Calen Pennington
2551243dfa Install the static_replace app for the management command 2013-02-05 11:06:46 -05:00
Calen Pennington
ae5d3cbc57 Add admin command to flush the staticfiles cache 2013-02-05 11:06:46 -05:00
Calen Pennington
8592db92bf Add more tests of static_replace 2013-02-05 11:06:46 -05:00
Calen Pennington
5eae9c3a40 Make lms and cms coverage reports cover common/djangoapps 2013-02-05 11:06:46 -05:00