Chris Dodge 27d7c19c40 Merge branch 'release' ...

Conflicts:
	cms/templates/widgets/source-edit.html

2014-04-14 14:17:03 -04:00

..

djangoapps

Merge pull request #3231 from edx/anton/refactor-speed-control

2014-04-11 19:38:04 +03:00

envs

Support for Duplicate and Delete of XBlock Container Leaves (disabled under Feature Flag).

2014-04-10 21:22:15 -04:00

lib

Add test of local_resource_url in AcidBlock

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

static

Merge pull request #3234 from edx/nimisha/container-duplicate-delete

2014-04-10 22:10:33 -04:00

templates

Merge branch 'release'

2014-04-14 14:17:03 -04:00

__init__.py

…

.coveragerc

…

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

Fix pylint disable pragmas that were pep8 violations

2014-03-20 10:18:40 -04:00

wsgi.py

Centralize startup code, and execute in all contexts

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