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

..

djangoapps

Merge branch 'master' into jkarni/fix/descriptorsystemruntime

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

envs

Merge pull request #645 from edx/fix/cdodge/add-tech-support-email-config

2013-08-12 11:10:53 -07:00

static

Merge pull request #637 from edx/vaxxxa/videoalpha_to_video

2013-08-12 10:56:12 -07:00

templates

Make VideoAlpha out of Alpha.

2013-08-12 14:31:48 +03: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

one_time_startup.py

pylint fixes

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

pydev_manage.py

Fixed use_tz not being effective in cms

2013-06-10 17:16:35 -04:00

urls_dev.py

pylint cleanup

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

urls.py

Rename MITX_SETTING AUTOMATIC_AUTH_FOR_LOAD_TESTING -> AUTOMATIC_AUTH_FOR_TESTING because it will be used for acceptance testing also.

2013-08-08 12:08:25 -04:00

xmodule_namespace.py

Move string fields, get rid of hard-coded list of booleans.

2013-06-07 15:45:34 -04:00