Chris Dodge fbbae44988 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master ...

Conflicts:
	cms/djangoapps/contentstore/views/course.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/management/commands/show_permissions.py
	lms/djangoapps/django_comment_client/models.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/envs/common.py

2013-05-20 10:22:36 -04:00

..

__init__.py

Get the cms up to the point of rendering a template

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

acceptance.py

Removed COURSES_ROOT and DATA_DIR from cms/envs/acceptance.py

2013-05-15 17:06:44 -04:00

aws.py

Set the default celery queue name in addition to the default routing key

2013-05-17 17:59:51 -04:00

common.py

Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master

2013-05-20 10:22:36 -04:00

dev_ike.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

dev_with_worker.py

Added base Celery settings

2013-05-17 11:33:14 -04:00

dev.py

Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master

2013-05-20 10:22:36 -04:00

jasmine.py

Install phantom-jasmine via npm, rather than git submodules

2013-05-13 11:33:09 -04:00

test.py

Merge pull request #2063 from edx/feature/rocha/lets-use-celery

2013-05-17 12:36:23 -07:00