David Ormsbee 78acd083be Merge branch 'master' into ormsbee/verifyuser3 ...

Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss

2013-09-04 10:58:30 -04:00

..

__init__.py

Get the cms up to the point of rendering a template

2012-06-08 14:01:41 -04:00

acceptance_static.py

Commented why Acceptance_static is needed

2013-07-10 16:23:26 -04:00

acceptance.py

If sauce is not enabled, allow full range of ports

2013-08-21 16:05:03 -04:00

aws_migrate.py

adding migrate env for cms

2013-08-01 08:43:20 -04:00

aws.py

Add new setting to cms project

2013-08-12 13:29:15 -04:00

common.py

Merge branch 'master' into ormsbee/verifyuser3

2013-09-04 10:58:30 -04:00

debug_upload.py

pylint fixes

2013-07-09 19:16:44 -04:00

dev_dbperf.py

on the new envs configuration file, we need to squelch pylint errors on the from dev import *

2013-08-10 00:29:17 -04:00

dev_ike.py

Remove unused imports from cms, as detected by pylint.

2013-06-19 16:56:34 -04:00

dev_with_worker.py

Add exceptions for unused imports in settings files

2013-05-21 13:07:04 -04:00

dev.py

add a few debug messages to get localhost debug information. Also partition out the MongoDjangoToolbar configuration into a separate env config. This is because doing imports on large courses grinds localdev to a halt due to all the stack trace generation.

2013-08-09 20:46:14 -04:00

test.py

Enable the django_nose app by default

2013-08-15 19:31:30 -04:00