Arthur Barrett 04e75485ba merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.

2013-05-06 13:40:38 -04:00

..

djangoapps

merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.

2013-05-06 13:40:38 -04:00

envs

merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.

2013-05-06 13:40:38 -04:00

lib

Revert "fix merge conflict"

2013-04-26 12:40:35 -04:00

static

merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.

2013-05-06 13:40:38 -04:00

templates

merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.

2013-05-06 13:40:38 -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

ummm. forgot to commit stuff

2013-03-27 22:51:52 -04:00

urls.py

merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.

2013-05-06 13:40:38 -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

Remove duplicated StringyX definitions.

2013-04-24 14:59:32 -04:00