Chris Dodge 22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 ...

Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt

2013-01-17 09:15:37 -05:00

..

modules

Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory

2012-07-24 16:13:59 -04:00

peer_grading

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

2013-01-10 16:45:40 -05:00

staff_grading

Add peer and staff grading required display, notifications

2013-01-15 15:40:23 -05:00

views

Hook up forms for forgot password functionality.

2012-07-17 16:27:30 -04:00

.gitignore

Moving LMS code into subdirectory

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

calculator.coffee

Add a short delay to calculator input focus so it doesn't jump to the bottom of the screen when you open it.

2012-09-06 15:52:31 -04:00

courseware.coffee

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-12-07 11:17:41 -05:00

customwmd.coffee

Fix WMD editor reply boxes on embedded discussions, although I think the way it's implemented is something of a hack.

2012-09-04 23:49:56 -07:00

feedback_form.coffee

Moving LMS code into subdirectory

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

histogram.coffee

Handle the case where histogram score can be null

2012-06-11 16:07:09 -04:00

main.coffee

perform a new merge from master, resolve conflicts

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

mathjax_delay_renderer.coffee

fixed multiple renderer bug

2012-08-06 22:20:56 -04:00

modal.coffee

wip modal

2012-06-21 09:51:03 -04:00

navigation.coffee

set active accordion state

2012-08-23 13:10:14 -04:00