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

pylint fixing

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

access.py

Force locations to be Location objects earlier

2013-07-01 12:33:08 -04:00

assets.py

POST requests were claiming request.method == 'PUT'

2013-07-19 11:14:01 -04:00

checklist.py

No longer persist XModule templates

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

component.py

POST requests were claiming request.method == 'PUT'

2013-07-19 11:14:01 -04:00

course.py

POST requests were claiming request.method == 'PUT'

2013-07-19 11:14:01 -04:00

error.py

pylint fixes

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

item.py

Have save_item parse json formatted field values by type

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

preview.py

Provide implicit saves for XBlocks and XModules.

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

public.py

Remove proof-of-concept page

2013-05-22 15:55:51 -04:00

requests.py

Remove create_json_response in favor of JsonResponse class

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

session_kv_store.py

Fix SessionKeyValueStore.has to use the correct indexing value when looking up data

2013-06-28 14:19:10 -04:00

tabs.py

Provide implicit saves for XBlocks and XModules.

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

user.py

Merge branch 'master' into talbs/studio-authorship

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