Gabe Mulley c9b0568acc Merge branch 'release' ...

Conflicts:
	cms/djangoapps/contentstore/views/item.py

2013-11-12 08:41:42 -05:00

..

djangoapps

Merge branch 'release'

2013-11-12 08:41:42 -05:00

envs

Merge pull request #1567 from edx/will/acceptance-test-asset-pipeline

2013-11-08 09:39:19 -08:00

static

Merge branch 'release'

2013-11-12 08:41:42 -05:00

templates

Merge pull request #1580 from edx/christina/item

2013-11-06 10:50:56 -08: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

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

urls_dev.py

pylint cleanup

2013-08-01 14:16:55 -04:00

urls.py

Use XBlock handlers for handle_ajax in XModules

2013-11-08 11:08:48 -05:00

wsgi.py

Centralize startup code, and execute in all contexts

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

xmodule_namespace.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00