Commit Graph

2457 Commits

Author SHA1 Message Date
Jay Zoldak
2c5a7ccdf7 Rearrange factories and clean up imports 2013-02-06 10:36:28 -05:00
Diana Huang
f9304a88cb Remove unneeded error type. 2013-02-06 09:15:24 -05:00
Carlos Andrés Rocha
9bc25ff372 Replace editamolecule input type applet with GWT version 2013-02-05 20:15:50 -05:00
jmclaus
d74b21e444 Added edit a gene 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
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
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
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
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
Vik Paruchuri
e8a690df5e Update peer grading tests 2013-02-05 10:46:00 -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