Commit Graph

14212 Commits

Author SHA1 Message Date
Jay Zoldak
b329b0ea42 Remove toy dbs from CMS test settings.py file as they are not used. 2013-02-06 10:36:28 -05:00
Jay Zoldak
b63c3c5a67 Change modulestore name and subclass TestCase 2013-02-06 10:36:28 -05:00
cahrens
08ce212bd5 Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy
Conflicts:
	cms/static/js/models/settings/advanced.js
2013-02-06 10:35:12 -05:00
Calen Pennington
2302b40022 Fix static_replace tests 2013-02-06 10:33:36 -05:00
Don Mitchell
1cc62fae75 Catch null pointer for uninitialized dates 2013-02-06 10:23:29 -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
Brian Talbot
bb789e758b studio - course nav: general flex-grid layout - WIP 2013-02-06 09:57:03 -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
cahrens
8093de1d93 Set size of ACE Editor. 2013-02-06 09:49:27 -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
Brian Talbot
280de111e1 studio - soft landing: fixed flexible grid proportions on sign up/in UI 2013-02-06 09:18:34 -05:00
Diana Huang
f9304a88cb Remove unneeded error type. 2013-02-06 09:15:24 -05:00
Don Mitchell
05ec0c11c6 Oops, when i alphabetized i got the value incorrectly.
Fixed cancel to not retain new entries.
2013-02-06 09:08:28 -05:00
Diana Huang
95d3957377 Merge pull request #1438 from MITx/feature/vik/peer-grading-xmodule
Patch peer grading tab to work
2013-02-06 06:07:18 -08:00
Brian Talbot
8c86eb2522 studio - soft landing: revised copy 2013-02-06 09:03:07 -05:00
Don Mitchell
592d7e532b Keys are sorted now 2013-02-06 08:58:20 -05:00
Brian Talbot
1687a99c5c studio - soft landing: added in modal copy and resolved image dimensions issue 2013-02-06 08:53:23 -05:00
David Ormsbee
92f2149daa Merge pull request #1443 from MITx/feature/ichuang/flag-to-disable-progress-graph
Allow policy.json to disable progress graph
2013-02-06 05:48:03 -08:00
Victor Shnayder
31b8f0ce7f Have errors go through jsmolcalc's getInfo 2013-02-05 23:27:52 -05:00
ichuang
6a7e30e331 add doc about disable_progress_graph 2013-02-06 04:01:28 +00:00
ichuang
0936f448fc add disable_progress_graph key to course metadata 2013-02-06 03:45:10 +00:00
Kevin Chugh
c7a133470d inline discussions working 2013-02-05 22:43:09 -05:00
Victor Shnayder
219c51f898 Fix placeholder email in signup form 2013-02-05 22:24:20 -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
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
Don Mitchell
5275db9ab9 Cancel kind of works (reverts but leaves in new fields :-( )
Filter out system metadata fields
2013-02-05 19:17:43 -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