Diana Huang 47ce9082e4 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py

2013-09-13 17:15:44 -04:00

..

djangoapps

Merge branch 'release'

2013-09-13 17:15:44 -04:00

envs

Make URL patterns to exclude from tracking configurable

2013-09-13 11:24:51 -04:00

static

Change course id limit to 65.

2013-09-11 16:15:16 -04:00

templates

Fix element name conflict

2013-09-10 13:48:12 -04: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

pydev_manage.py

Fixed use_tz not being effective in cms

2013-06-10 17:16:35 -04: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

Merge pull request #798 from edx/will/js-test-tool-squashed

2013-08-27 14:09:13 -07: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