David Ormsbee 48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 ...

Conflicts:
	lms/envs/common.py

2013-09-09 10:18:25 -04:00

..

__init__.py

…

acceptance.py

Merge branch 'master' into ormsbee/verifyuser3

2013-09-09 10:18:25 -04:00

aws_migrate.py

…

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-09 10:18:25 -04:00

debug_upload.py

…

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

…

dev_with_worker.py

…

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