ichuang
a759850e3e
add SSL / MIT certificates auth; clean up external_auth.views
2012-08-01 22:42:06 -04:00
Rocky Duan
5d3b187540
Merge branch 'master' of github.com:MITx/mitx
2012-08-01 16:45:21 -04:00
ichuang
10ebcefd54
add openid authentication
2012-08-01 14:59:55 -04:00
Victor Shnayder
46775386d3
make CACHE_TIMEOUT messages go away
2012-08-01 11:40:12 -04:00
Brittany Cheng
f1e07024d4
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-07-31 18:43:21 -04:00
Kyle Fiedler
9d14033f6b
Added some styles for the top navigation and for the sidebar navigation
2012-07-31 16:29:01 -04:00
David Ormsbee
fafa86b413
Merge pull request #322 from MITx/feature/kfiedler/courseware-style
...
Added fix for videos start to zero out colors and mit styles
2012-07-31 11:31:16 -07:00
Kyle Fiedler
d30ae5389e
Added fix for videos start to zero out colors and mit styles
2012-07-31 14:18:42 -04:00
Calen Pennington
b659846e1f
Add askbot to lms staticfiles_dirs in test
2012-07-31 12:46:47 -04:00
Brittany Cheng
32cf7c6f66
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-07-31 11:26:17 -04:00
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
Brittany Cheng
bba8e29733
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-07-30 18:36:23 -04:00
Kyle Fiedler
257ce0430f
Moved vendor sass files to css folder and included them in
2012-07-30 17:39:19 -04:00
Brittany Cheng
95291ef745
fix line 511
2012-07-30 17:29:07 -04:00
Brittany Cheng
554fc827f4
Merge branch 'master' of github.com:dementrock/mitx into discussion2
2012-07-30 17:22:12 -04:00
Rocky Duan
941ae0f068
basic error handling
2012-07-30 17:16:44 -04:00
Brittany Cheng
91cb814ee0
merging with origin master
2012-07-30 16:28:49 -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
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
012036a478
Clean up minor whitespace stuff in settings
2012-07-30 12:59:28 -04:00
Rocky Duan
0790a3add4
image uploading & render markdown
2012-07-27 17:50:38 -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
73b3826820
Initial integration tests!
...
* new env file to run integration tests with mongo backend
- needs askbot to get db in the right state
- needs wiki to load pages successfully
- not using migrations to make it run faster
* import test courses, check that each page loads without erroring.
* fix NonePointerException in index view to make tests pass
* misc formatting cleanups
2012-07-27 16:09:25 -04:00
Victor Shnayder
8a6b9a5666
update lms readme
2012-07-27 16:06:54 -04:00
Rocky Duan
104e4c9fc8
Merge branch 'master' of github.com:MITx/mitx
2012-07-26 17:35:40 -04:00
Calen Pennington
6afe1709e7
Merge pull request #306 from MITx/arjun/compile_coffee
...
Compiling coffee files in course data directories on startup.
2012-07-26 13:31:46 -07:00
Victor Shnayder
08ce3944ab
Make logging work for xmodule and company.
...
* We do not want to disable existing loggers when setting up our own
2012-07-26 14:49:11 -04:00
Arjun Singh
73261719ce
Added TODO near temporary code.
2012-07-26 13:14:00 -04:00
Rocky Duan
9d2bccbee7
Merge branch 'master' of github.com:MITx/mitx
2012-07-26 10:43:42 -04:00
Calen Pennington
73d6565fac
Merge remote-tracking branch 'origin/hotfix/1.0.1'
...
Conflicts:
common/djangoapps/student/views.py
2012-07-26 09:05:57 -04:00
Arjun Singh
3002260de5
Compiling coffee files in course data directories on startup.
2012-07-25 21:45:01 -04:00
Rocky Duan
fb408a99b5
add discussion app & url conf
2012-07-25 18:09:34 -04:00
Matthew Mongeau
bd9da89fe9
Move press articles to json.
2012-07-25 17:31:34 -04:00
Kyle Fiedler
00596d2f20
Added courseware css back into the main template
2012-07-25 14:57:44 -04:00
John Jarvis
dab92102d1
reading WIKI_ENABLED from env.json
2012-07-25 14:15:49 -04:00
Calen Pennington
dde48f122e
Merge pull request #247 from MITx/feature/cms-problem-preview
...
Problem previewing in the CMS
2012-07-25 07:10:45 -07:00
Calen Pennington
29cf09763f
Fixing up cms tests to only use data in common/test/data
2012-07-25 10:09:25 -04:00
John Jarvis
18b05fe78f
enabled_features changed mitx_features
2012-07-24 21:50:45 -04:00
Calen Pennington
8a0270ea2b
Allow for modular css from XModules, and split capa module css out as a test
2012-07-24 16:14:04 -04:00
Calen Pennington
50f27bcfb7
Eagerly load all modules when reading the course from xml, so that users who are already on a problem page can check their answers
2012-07-24 16:14:04 -04:00
Calen Pennington
8481937f59
Move Logger and *withPrefix javascript into a common location
2012-07-24 16:14:03 -04:00
Calen Pennington
87ce82570d
Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware
2012-07-24 16:14:03 -04:00
Victor Shnayder
ba733fa5d1
add options to dev_mongo env
2012-07-24 16:14:01 -04:00
Victor Shnayder
49e8d08c1e
Add get_courses() to mongo modulestore
...
* Note: This doesn't run yet
* add config file for lms on mongo
* Some comment additions and cleanups
2012-07-24 16:14:01 -04:00
Calen Pennington
987fe17358
Load js fragments in order, so that Subview is loaded before the classes that use it
2012-07-24 16:14:00 -04:00
Calen Pennington
5026d6e9fb
Give all XModuleDescriptors a module_class, and make it inheritance of js_module_names work
2012-07-24 16:14:00 -04:00
Calen Pennington
3cdceab16c
Uniquify js fragments pulled from XModules, and load both XModuleDescriptor and XModule js into the cms
2012-07-24 16:13:59 -04:00
Calen Pennington
3fa636e060
Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory
2012-07-24 16:13:59 -04:00
John Jarvis
703293f785
adding enabled features to aws.py
2012-07-24 15:56:42 -04:00
