Andy Armstrong fe6668a550 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt

2014-09-23 15:53:10 -04:00

..

djangoapps

Merge pull request #5129 from edx/ned/python-zip-assets

2014-09-18 19:31:47 -04:00

envs

Basic Mobile API (v0.5) and Video Abstraction Layer integration.

2014-09-23 12:31:46 -04:00

lib

Add Studio handling for changes to group configurations

2014-06-20 11:41:22 -04:00

static

Video link obfuscation. [BLD-1230]

2014-09-16 18:13:07 +02:00

templates

Updated Files & Uploads template help

2014-09-15 20:14:33 -04:00

__init__.py

…

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:53:12 -05:00

startup.py

Moved imports to startup.py.

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

urls_dev.py

Add the ability to view templates in a browser in development mode

2014-02-07 14:56:35 -05:00

urls.py

Basic Mobile API (v0.5) and Video Abstraction Layer integration.

2014-09-23 12:31:46 -04: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