Julian Arni 7fc6057700 Merge branch 'master' into jkarni/fix/descriptorsystemruntime ...

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

2013-08-12 15:04:49 -04:00

..

__init__.py

Create urls/views/templates for dev-only views

2013-07-31 17:20:26 -04:00

access.py

Force locations to be Location objects earlier

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

assets.py

add a few debug messages to get localhost debug information. Also partition out the MongoDjangoToolbar configuration into a separate env config. This is because doing imports on large courses grinds localdev to a halt due to all the stack trace generation.

2013-08-09 20:46:14 -04:00

checklist.py

Fixing test failures

2013-07-29 13:12:04 -04:00

component.py

Python: videoalpha -> video.

2013-08-12 14:31:48 +03:00

course.py

Add helper methods to hide internals of how users are enrolled in courses.

2013-08-06 09:36:39 -04:00

dev.py

pylint cleanup

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

error.py

pylint fixes

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

item.py

Clean up item views, use JsonResponse class

2013-08-08 09:46:15 -04:00

preview.py

Merge branch 'master' into jkarni/fix/descriptorsystemruntime

2013-08-12 15:04:49 -04:00

public.py

Fix some pylint issues

2013-07-31 15:42:11 -04:00

requests.py

redirects lms landing page to student.views.index if there is no marketing site

2013-08-05 16:05:12 -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

Fix some pylint issues

2013-07-31 15:42:11 -04:00

user.py

make CMS user view not show ErrorDescriptor courses

2013-08-11 15:27:12 +00:00