Andy Armstrong 7b26e85478 Merge branch 'release' into andya/merge-hotfix-2014-08-29 ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py

2014-08-29 16:50:10 -04:00

..

djangoapps

Merge branch 'release' into andya/merge-hotfix-2014-08-29

2014-08-29 16:50:10 -04:00

envs

Fixup of Bug/djpyfs

2014-08-26 15:59:34 -04:00

lib

Add Studio handling for changes to group configurations

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

static

Replace reference to Google OpenSans with edX-hosted OpenSans

2014-08-27 10:34:53 -04:00

templates

Studio: adding in usage note to UX reference templates

2014-08-28 15:37:48 -04:00

__init__.py

…

.coveragerc

…

startup.py

Monkey patch 'django.utils.translation'

2014-08-27 15:27:34 -07: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

Unflag Group Configurations, Render only existing children in staff view of split_test.

2014-08-22 16:43:54 -04:00

wsgi.py

Centralize startup code, and execute in all contexts

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