Diana Huang f49b5ec771 Merge branch 'master' into diana/rubric-ui-improvements ...

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	lms/djangoapps/open_ended_grading/grading_service.py
	lms/static/sass/course.scss

2013-02-04 09:11:28 -05:00

..

djangoapps

Merge branch 'master' into diana/rubric-ui-improvements

2013-02-04 09:11:28 -05:00

envs

pep8 cleanup

2013-02-01 13:13:16 -05:00

lib

Merge remote-tracking branch 'origin/master' into feature/kevin/groups

2013-01-23 16:26:06 -05:00

static

Merge branch 'master' into diana/rubric-ui-improvements

2013-02-04 09:11:28 -05:00

templates

Merge branch 'master' into diana/rubric-ui-improvements

2013-02-04 09:11:28 -05:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

CHANGELOG.md

Add comment about the target of change log entries

2012-10-30 16:48:47 -04:00

urls.py

Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes

2013-01-31 16:50: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