cahrens 8ca6e324af Merge branch 'master' into feature/btalbot/studio-checklists ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/sass/base-style.scss
	cms/urls.py

2013-03-21 12:23:13 -04:00

..

djangoapps

Merge branch 'master' into feature/btalbot/studio-checklists

2013-03-21 12:23:13 -04:00

envs

Have to explicitly specify safe option on mongo insert, remove, update because the debug toolbar specifies a default of safe=False.

2013-03-19 16:57:19 -04:00

static

Merge branch 'master' into feature/btalbot/studio-checklists

2013-03-21 12:23:13 -04:00

templates

Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists

2013-03-20 16:37:26 -04:00

__init__.py

Pep8 autofixes

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

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:53:12 -05:00

CHANGELOG.md

Add changelog information

2012-11-06 10:34:51 -05:00

manage.py

Pep8 autofixes

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

one_time_startup.py

move the instantiation of the metadata cache out of modulestore.py as it was causing a circular import dependency when running on AWS. Put instantiation into one_time_startup.py which I believe is run before any Django requests are handled

2013-03-14 13:57:48 -04:00

urls.py

Merge branch 'master' into feature/btalbot/studio-checklists

2013-03-21 12:23:13 -04:00

xmodule_namespace.py

Small pylint cleanup

2013-03-18 12:45:46 -04:00