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

Conflicts:
	cms/djangoapps/contentstore/views.py

2013-05-13 15:47:33 -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

Refactor choosing the browser for lettuce tests to settings.py

2013-04-18 10:18:35 -04:00

aws.py

parameterizes CMS email settings

2013-05-10 13:42:28 -07:00

common.py

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

2013-05-13 15:47:33 -04:00

dev_ike.py

Pep8 autofixes

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

dev.py

update cms envs

2013-05-06 16:02:13 -04:00

jasmine.py

Install phantom-jasmine via npm, rather than git submodules

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

test.py

Remove localization middleware from jasmine test execution

2013-05-01 11:34:28 -04:00