cahrens 6629d5d3a3 Merge branch 'master' into talbs/studio-authorship ...

Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/static/sass/elements/_controls.scss
	cms/templates/activation_active.html
	cms/templates/activation_complete.html
	cms/templates/activation_invalid.html

2013-07-22 12:15:42 -04:00

..

__init__.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

test_assets.py

pylint fixes

2013-07-09 19:16:44 -04:00

test_checklists.py

Provide implicit saves for XBlocks and XModules.

2013-07-18 16:37:34 -04:00

test_contentstore.py

Merge pull request #160 from edx/fix/vik/studio-oe

2013-07-19 08:44:16 -07:00

test_core_caching.py

more cleanups in CMS project

2013-04-13 21:13:34 -04:00

test_course_settings.py

Provide implicit saves for XBlocks and XModules.

2013-07-18 16:37:34 -04:00

test_course_updates.py

Reproduce POST showing up as PUT error

2013-07-19 11:12:23 -04:00

test_crud.py

Implement next generation modulestore

2013-07-19 13:10:14 -04:00

test_i18n.py

No longer persist XModule templates

2013-07-16 14:33:58 -04:00

test_item.py

json field value conversion test

2013-07-18 16:48:29 -04:00

test_request_event.py

replace test setting changes with test-specific mock.patch.dicts

2013-07-10 10:18:58 -04:00

test_textbooks.py

Provide implicit saves for XBlocks and XModules.

2013-07-18 16:37:34 -04:00

test_users.py

Tests for course creator status as returned in index page.

2013-07-12 11:25:12 -04:00

test_utils.py

Strip off https://

2013-06-06 10:55:41 -04:00

tests.py

pylint fixes

2013-07-09 19:16:44 -04:00

utils.py

No longer persist XModule templates

2013-07-16 14:33:58 -04:00