Chris Dodge 625237601f Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export ...

Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py
	common/lib/xmodule/xmodule/contentstore/mongo.py

2012-12-27 14:16:40 -05:00

..

djangoapps

initial commit. Add 'import_path' field to the GridFS so that when we export, we know where it originated from

2012-12-12 10:57:06 -05:00

envs

fix edit conflict

2012-11-26 09:36:59 -05:00

lib

Merge pull request #731 from MITx/feature/ichuang/symmath_improvements

2012-09-25 19:36:02 -07:00

static

Somehow linked file disappeared again.

2012-12-12 10:55:57 -05:00

templates

Refactored videos to a much simpler impl b/c about videos don't have

2012-12-18 12:46:54 -05:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

.coveragerc

Make coverage reports only include code from the source directories

2012-11-08 12:25:12 -05:00

CHANGELOG.md

Add comment about the target of change log entries

2012-10-30 16:48:47 -04:00

urls.py

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-16 09:03:15 -05: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