Calen Pennington 1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py

2013-03-04 16:33:40 -05:00

..

accordion.html

Move courseware related templates to their own folder

2012-11-19 12:45:46 -05:00

course_about.html

Move courseware related templates to their own folder

2012-11-19 12:45:46 -05:00

course_navigation.html

Use 'is None' and 'is not None'

2013-03-04 10:57:25 -05:00

courses.html

perform a new merge from master, resolve conflicts

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

courseware-error.html

Contact email address updates

2012-09-06 09:26:52 -04:00

courseware.html

Updated YouTube JS API file to the new one.

2013-02-14 11:25:36 +02:00

grade_summary.html

Moved the course template pages to be templates/courseware/

2012-08-20 14:54:23 -04:00

gradebook.html

sidebar hover and firefox bug fixes

2012-08-22 11:40:59 -04:00

info.html

WIP: Model data caching work

2013-01-23 14:51:07 -05:00

instructor_dashboard.html

Taking Ike's delete-student-state-for-problem code and putting it in a separate PR so it's not bundled with more debated features.

2013-02-27 11:42:06 -05:00

news.html

Move courseware related templates to their own folder

2012-11-19 12:45:46 -05:00

notifications.html

Move courseware related templates to their own folder

2012-11-19 12:45:46 -05:00

progress_graph.js

Added parameters to hide grade totals and grade cutoffs in progress graph.

2012-12-19 12:37:02 -05:00

progress.html

Fix tests post-merge

2013-02-13 14:13:22 -05:00

static_tab.html

Some 188-specific styling + default styling for static tabs

2012-09-22 14:17:34 -07:00

submission_history.html

Fixes in response to Victor's comments.

2013-03-04 13:21:19 -05:00

syllabus.html

Fixed syllabus to look good with new courseware styling

2012-08-22 05:25:48 -07:00

welcome-back.html

WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms

2012-12-28 14:44:31 -05:00

xqa_interface.html

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00