Diana Huang ae65bb0332 Merge branch 'master' into feature/diana/rubric-input ...

Conflicts:
	common/lib/capa/capa/inputtypes.py

2013-01-14 13:40:45 -05:00

..

djangoapps

Merge branch 'master' into feature/diana/rubric-input

2013-01-14 13:40:45 -05:00

envs

Minor naming fix

2013-01-14 12:32:31 -05:00

lib

symmath use https, no server cert verify

2013-01-05 12:29:03 -05:00

static

Fix some minor bugs in the staff grading interface

2013-01-14 10:22:22 -05:00

templates

Merge branch 'master' into feature/diana/rubric-input

2013-01-14 13:40:45 -05:00

__init__.py

…

.coveragerc

Exclude settings.py files from coverage reports and configure titles for the reports.

2012-12-17 15:00:11 -05:00

urls.py

Merge branch 'master' into diana/peer-grading-views

2013-01-04 11:19:10 -05:00

wsgi.py

Add a wsgi file for the lms that loads the modulestores immediately after the application starts

2012-08-28 12:01:05 -04:00