Andy Armstrong 0ed3a95d3a Merge branch 'release' ...

Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py

2014-09-25 16:25:45 -04:00

..

djangoapps

Merge branch 'release'

2014-09-25 16:25:45 -04:00

envs

Merge branch 'release'

2014-09-25 16:25:45 -04:00

lib

Quality cleanup

2014-09-08 12:02:31 -04:00

static

Merge branch 'release'

2014-09-25 16:25:45 -04:00

templates

Merge branch 'release'

2014-09-25 16:25:45 -04:00

__init__.py

…

.coveragerc

…

startup.py

Moved imports to startup.py.

2014-09-11 20:14:37 +05:00

tests.py

add simple help-modal-test

2014-09-22 09:34:32 -04:00

urls.py

Add Django apps for student account and profile.

2014-09-25 08:36:22 -04:00

wsgi_apache_lms.py

apache lms wsgi fix

2013-09-16 21:46:57 -07:00

wsgi.py

Make split_mongo assert block identity uniqueness only over (block_type, block_id) tuples [LMS-11364]

2014-09-11 09:38:13 -04:00