Han Su Kim f42d42d1f8 Merge branch 'master' into release ...

Conflicts:
	cms/envs/common.py
	lms/envs/common.py

2014-03-07 14:39:09 -05:00

..

djangoapps

Merge pull request #2811 from edx/andya/container-unit-tests

2014-03-07 11:31:41 -05:00

envs

Merge branch 'master' into release

2014-03-07 14:39:09 -05:00

lib

Add test of local_resource_url in AcidBlock

2014-02-25 14:01:37 -05:00

static

BLD-844: Add possibility to download transcripts in different formats.

2014-03-07 19:22:22 +01:00

templates

Improve code clarity.

2014-03-05 12:59:09 -05:00

__init__.py

…

.coveragerc

Change coverage report config to reflect refactoring of terrain files

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

startup.py

Remove obselete cms startup code

2014-01-24 16:42:38 -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

Correct misaligned django-cas integration

2014-03-04 09:35:08 -05:00

wsgi.py

Centralize startup code, and execute in all contexts

2013-08-27 12:12:20 -04:00