Commit Graph

3706 Commits

Author SHA1 Message Date
Kyle Fiedler
2bbb19790d Fixed jquery ui image problem and added a base style sheet for lms to override fonts 2012-07-31 11:06:39 -04:00
Calen Pennington
2f95a8e1d0 Re-add __init__.py for contentstore that was accidentally deleted in 05add5818b 2012-07-31 09:29:14 -04:00
ichuang
94e73936fc Merge pull request #319 from MITx/kimth/lms-coderesponse
Kimth/lms coderesponse
2012-07-30 18:51:16 -07:00
kimth
b9e5e9f0ee Read XML for queuename 2012-07-30 20:18:25 -04:00
kimth
6244412c28 Simplify default linenumbers behavior 2012-07-30 18:59:11 -04:00
David Ormsbee
e5fd92630d Merge pull request #316 from MITx/feature/halogenandtoast/form-field-errors
Added styles for errors
2012-07-30 15:24:12 -07:00
David Ormsbee
1baa306cfa Merge pull request #320 from MITx/feature/kfiedler/courseware-style
Start to whip out a bunch of the styles and get courseware working
2012-07-30 15:23:52 -07:00
Kyle Fiedler
c611bd9228 added treeview 2012-07-30 17:39:44 -04:00
Kyle Fiedler
257ce0430f Moved vendor sass files to css folder and included them in 2012-07-30 17:39:19 -04:00
Kyle Fiedler
7ab5bbfaef Moved files and removed files 2012-07-30 17:37:53 -04:00
Kyle Fiedler
6cad5459b3 Start to refactor courseware scss 2012-07-30 17:37:11 -04:00
Kyle Fiedler
3bb82c41d2 Remove couse css file 2012-07-30 16:21:03 -04:00
Calen Pennington
021e10ab4e Merge pull request #317 from MITx/feature/cale/cms-aws-cfg
Feature/cale/cms aws cfg
2012-07-30 13:11:48 -07:00
Calen Pennington
89b5f5b2be Minor review notes 2012-07-30 16:11:35 -04:00
kimth
bd66a28d32 Add TODO note 2012-07-30 15:23:14 -04:00
Calen Pennington
ab0055c201 Add update_schematic to window in schematic.js 2012-07-30 14:04:39 -04:00
Calen Pennington
1fce1dbe34 Make sure that django-pipelined css and js don't collide between the cms and lms 2012-07-30 14:04:39 -04:00
Calen Pennington
395cf147be Look up data_dir in the metadata, not in the top of the json object when loading from mongodb 2012-07-30 14:04:39 -04:00
Calen Pennington
2caf1024f1 Force mongodb fs_root to be a path object 2012-07-30 14:04:15 -04:00
Calen Pennington
d0c99151f0 Continue during backcompat imports by replacing contents with error xml 2012-07-30 14:04:15 -04:00
Calen Pennington
7ae0836f77 Add some more tests of github_sync 2012-07-30 13:50:50 -04:00
Calen Pennington
66d5c8effd Add more detail to error messages during loading from xml 2012-07-30 13:50:50 -04:00
Calen Pennington
6997fc579e Continue on errors when syncing with github 2012-07-30 13:50:00 -04:00
kimth
bd0b20bb60 xqueue_callback uses 'xqueue_body' tag rather than 'response' tag for main message 2012-07-30 13:35:13 -04:00
Calen Pennington
05add5818b Return a custom error for duplicate elements, and ignore it when loading into mongo 2012-07-30 13:16:21 -04:00
kimth
4e43b662fa CodeResponse admits only one student response 2012-07-30 13:10:24 -04:00
Calen Pennington
6bd9cd6c28 Add management command for syncing with github 2012-07-30 12:59:28 -04:00
Calen Pennington
cec2c893be Add AWS keys so that the CMS can send email 2012-07-30 12:59:28 -04:00
Calen Pennington
818cb0d1e7 Separate cms and lms auth and env files, and have the LMS that runs with the CMS use the CMS modulestore 2012-07-30 12:59:28 -04:00
Calen Pennington
d86b72fc24 Split REPOS data into separate file on aws 2012-07-30 12:59:28 -04:00
Calen Pennington
7e06c72e42 Add logsettings to CMS 2012-07-30 12:59:28 -04:00
Calen Pennington
d6dc45756c Add an aws settings for the cms 2012-07-30 12:59:28 -04:00
Calen Pennington
012036a478 Clean up minor whitespace stuff in settings 2012-07-30 12:59:28 -04:00
Calen Pennington
39e5a7762e Make github_sync use a namedtuple for repo settings 2012-07-30 12:59:28 -04:00
Calen Pennington
c9e637d719 Make cms and lms tests run independently (they had been colliding on collectstatic) 2012-07-30 12:58:45 -04:00
Calen Pennington
5e60983e48 Merge pull request #314 from MITx/kf-cms-style
Style for CMS
2012-07-30 09:58:08 -07:00
Calen Pennington
02217c33ac Merge pull request #313 from MITx/feature/victor/xml-verify
Feature/victor/xml verify
2012-07-30 09:57:37 -07:00
kimth
80b62bf026 Serialize xqueue payload 2012-07-30 12:30:08 -04:00
Kyle Fiedler
a040f4346e Added styles for errors 2012-07-30 11:57:31 -04:00
Kyle Fiedler
44168deffc Added styles for buttons 2012-07-30 09:51:50 -04:00
Kyle Fiedler
270f0f3ae4 Added more styles includeing the index page more color changes and header styles 2012-07-30 09:51:50 -04:00
Kyle Fiedler
b777d2c057 Added some more style for cal view and nav bar 2012-07-30 09:51:50 -04:00
Kyle Fiedler
84272f3f8c Added Gemfile.lock to ignore 2012-07-30 09:51:50 -04:00
Kyle Fiedler
1d5ce54140 Added styles for buttons 2012-07-30 09:51:49 -04:00
Kyle Fiedler
d53e4bd38f Added more styles includeing the index page more color changes and header styles 2012-07-30 09:51:49 -04:00
Kyle Fiedler
9d638d2ac0 Added some more style for cal view and nav bar 2012-07-30 09:50:25 -04:00
Kyle Fiedler
d94fd1542d Added Gemfile.lock to ignore 2012-07-30 09:50:24 -04:00
Victor Shnayder
59defd33b6 Formatting and little bugfixes
* add course and org to full/course.xml
* fix error path in clean_xml script
* commit rakefile change needed by c5334f150c
2012-07-27 16:09:25 -04:00
Victor Shnayder
cb30850759 Config for integration tests
* move askbot repo into mitx as a submodule
* set settings as in 85865f7221
* remove test_mongo env.
* Refactor tests to use new config structure.
* Add real integration tests--not working due to bugs in course xml. Turned off.
2012-07-27 16:09:25 -04:00
Victor Shnayder
a8afe5ed17 Change modulestore to use a logging error handler
* log errors, but don't fail
2012-07-27 16:09:25 -04:00