John Jarvis 78987cc400 resolving merge conflicts

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

..

djangoapps

Merge pull request #1687 from MITx/hotfix/edz/pinning

2013-03-19 09:31:14 -07:00

envs

LMS contentstore lettuce tests now dynamically create courses in mongo

2013-03-15 14:04:22 -04:00

lib

accidentally deleted models file

2013-03-15 12:42:59 -04:00

static

resolving merge conflicts

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

templates

resolving merge conflicts

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

__init__.py

…

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:31:50 -05:00

CHANGELOG.md

Add comment about the target of change log entries

2012-10-30 16:48:47 -04: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

resolving merge conflicts

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

wsgi.py

Add a wsgi file for the lms that loads the modulestores immediately after the application starts

2012-08-28 12:01:05 -04:00

xmodule_namespace.py

Small pylint cleanup

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