Brian Wilson d6a74a644d Merge branch 'master' into release ...

Conflicts:
	cms/static/js/views/modals/edit_xblock.js

2014-05-13 11:10:48 -04:00

..

djangoapps

fix importing bug (STUD-1599)

2014-05-12 15:59:41 -04:00

envs

CMS: debug toolbar should be displayed on dev stack.

2014-05-13 10:30:59 -04:00

lib

Add test of local_resource_url in AcidBlock

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

static

Merge branch 'master' into release

2014-05-13 11:10:48 -04:00

templates

Fix acceptance tests.

2014-05-12 16:22:05 +03:00

__init__.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

.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

Show error page templates

2014-05-02 13:41:34 -04:00

wsgi.py

Centralize startup code, and execute in all contexts

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