David Ormsbee d0bff1ed3c Merge branch 'master' into jmpm-analytics ...

Conflicts:
	lms/djangoapps/instructor/views.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html

2013-03-06 17:09:09 -05:00

..

djangoapps

Tell user that spaces aren't allowed in usernames (requested by Teppo).

2013-03-04 11:17:29 -05:00

lib

Merge branch 'master' into jmpm-analytics

2013-03-06 17:09:09 -05:00

static

Merge branch 'master' into jmpm-analytics

2013-03-06 17:09:09 -05:00

templates

Merged, delete Ace.

2013-02-19 14:56:37 -05:00

test

remove empty attempts and weights from simple test course

2013-02-21 15:41:59 -05:00

xml_cleanup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00