Chris Dodge 3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 ...

Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt

2013-01-07 12:34:48 -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

Custom tabs

2012-09-18 08:45:09 -04: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

Final ie8 fixes hopefully. Now renders correctly for staff. Moved the

2012-11-05 13:55:09 -05: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

implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff

2012-10-25 14:27:26 -04:00

instructor_dashboard.html

Add unit tests

2012-11-20 15:56:18 -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

The progress page now checks course.metadata.get(no_grade, False) to see if the course has a grade.

2012-12-19 12:47:43 -05:00

static_tab.html

Some 188-specific styling + default styling for static tabs

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

syllabus.html

Fixed syllabus to look good with new courseware styling

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

welcome-back.html

quick wording change

2012-09-07 15:57:43 -04:00

xqa_interface.html

IE errors if you try to use 'return' as a dict key.

2012-11-30 18:22:37 -05:00