Commit Graph

12 Commits

Author SHA1 Message Date
Calen Pennington
241ef68f4f Start linting envs files, add task to only pylint errors, and move pylintrc file to the correct location 2013-05-21 09:34:12 -04:00
Carlos Andrés Rocha
4050da6b4c Enable meta-universities (organizations that contain other) 2013-03-28 13:23:50 -04:00
Chris Dodge
3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
2013-01-07 12:34:48 -05:00
Jay Zoldak
0a77dd4431 Smart accordion walkthrough working for cms-master branch
Conflicts:
	lms/envs/cms/acceptance.py
2013-01-02 10:44:19 -05:00
Chris Dodge
b75a814f7a add django performance metering 2012-11-02 15:08:45 -04:00
Calen Pennington
096d6853eb Allow for branding subdomains that are longer than a single . 2012-10-11 13:18:27 -04:00
Calen Pennington
9e9825cb88 Enable the edge virtual university landing page in the lms 2012-10-11 13:18:01 -04:00
Calen Pennington
284f0d6a22 Make the lms running alongside the CAS in dev point to the same contentstore, and server up static content 2012-10-11 12:31:52 -04:00
Calen Pennington
20f84b2055 Use the right config as the base for lms.envs.cms.aws 2012-10-11 12:31:52 -04:00
Calen Pennington
b19627ccf3 Add configs for lms and lms preview running against mongo 2012-10-10 12:49:52 -04:00
Calen Pennington
1a8532d8ad Make it possible to create, edit, and publish a draft 2012-10-10 12:49:51 -04:00
Calen Pennington
0a55e1eae1 Add sub-environments for the lms that is running alongside the lms for debugging 2012-09-17 13:51:33 -04:00