Don Mitchell 884019b14c Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse ...

Conflicts:
	cms/djangoapps/models/settings/course_metadata.py
	cms/urls.py

2013-03-22 16:56:31 -04:00

..

djangoapps

Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse

2013-03-22 16:56:31 -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

Fix caching bug on back button.

2013-03-22 09:51:45 -04:00

templates

Merge pull request #1719 from MITx/feature/btalbot/studio-checklists

2013-03-22 12:49:30 -07: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 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse

2013-03-22 16:56:31 -04:00

xmodule_namespace.py

Small pylint cleanup

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