David Ormsbee 48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 ...

Conflicts:
	lms/envs/common.py

2013-09-09 10:18:25 -04:00

..

djangoapps

Merge pull request #823 from edx/jkarni/feature/multiple-assets-upload

2013-09-09 06:47:58 -07:00

envs

Merge branch 'master' into ormsbee/verifyuser3

2013-09-09 10:18:25 -04:00

static

Merge pull request #823 from edx/jkarni/feature/multiple-assets-upload

2013-09-09 06:47:58 -07:00

templates

Merge pull request #823 from edx/jkarni/feature/multiple-assets-upload

2013-09-09 06:47:58 -07: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