Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

18841 Commits

Author SHA1 Message Date
Vik Paruchuri
f568e49265 Fix oe version tests 2013-02-06 15:20:02 -05:00
Vik Paruchuri
9e4e98ef74 Fix some css to get things to properly close/open 2013-02-06 15:13:56 -05:00
Diana Huang
04f6d6d0ff Improve documentation 2013-02-06 15:00:08 -05:00
Diana Huang
6f147df7f7 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-02-06 14:16:18 -05:00
Diana Huang
f42f84d9e8 Merge pull request #1440 from MITx/diana/rubric-ui-improvements 
Rubric UI updates
 2013-02-06 11:04:44 -08:00
Diana Huang
f3fa438018 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/timeparse.py
 2013-02-06 13:26:22 -05:00
Vik Paruchuri
f565d17b4f Merge branch 'feature/vik/oe-versioning' into fix/vik/peer-grading-images 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-02-06 13:23:31 -05:00
Vik Paruchuri
a0febd35a0 Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-02-06 13:22:12 -05:00
Vik Paruchuri
ddda9ba55d Try to fix tests 2013-02-06 13:19:37 -05:00
Diana Huang
4adf2f6180 Merge branch 'master' into diana/rubric-ui-improvements 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
 2013-02-06 13:16:24 -05:00
Vik Paruchuri
96636681e9 Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-02-06 13:16:02 -05:00
Diana Huang
1f5beba383 Merge branch 'master' into diana/rubric-ui-improvements 2013-02-06 13:12:04 -05:00
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
Calen Pennington
2302b40022 Fix static_replace tests 2013-02-06 10:33:36 -05:00
Diana Huang
40854fc1b4 Merge branch 'master' into feature/diana/close-oe-problems 2013-02-06 10:15:18 -05:00
Calen Pennington
96eb16cd72 Make local dev work by trying checking staticfiles_storage for both the course_prefixed and non-course_prefixed urls 2013-02-06 10:08:20 -05:00
Don Mitchell
4ba7de3402 Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy 2013-02-06 09:56:19 -05:00
Don Mitchell
0f5571f499 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 2013-02-06 09:48:09 -05:00
Diana Huang
f9304a88cb Remove unneeded error type. 2013-02-06 09:15:24 -05:00
Victor Shnayder
31b8f0ce7f Have errors go through jsmolcalc's getInfo 2013-02-05 23:27:52 -05:00
Kevin Chugh
c7a133470d inline discussions working 2013-02-05 22:43:09 -05:00
Julian Arni
222c01b20b Removed console logs 2013-02-05 20:15:51 -05:00
John Hess
adb77ea699 hack to fix validation issues 2013-02-05 20:15:51 -05:00
Julian Arni
05e25dadcf Added validation warnings 2013-02-05 20:15:51 -05:00
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
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