Adam Palay 9b3841f62c Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	lms/djangoapps/teams/views.py
	lms/templates/courseware/progress.html

2015-10-19 08:35:33 -05:00

..

accordion.html

edx-procoting will be passing back which font-awesome icon to use

2015-09-25 12:17:00 -04:00

course_about.html

DOC-2268 - Fix instances of "register" on the course about page

2015-10-07 14:14:00 +02:00

course_navigation.html

In-course reverification access control

2015-08-20 08:43:55 -07:00

courses.html

LMS: a11y contrast fixes for find course page

2015-09-24 11:11:07 -04:00

courseware-chromeless.html

updated responsive body class to .is-view-in-course

2015-08-31 14:41:46 -04:00

courseware-error.html

Unicode support for course names in reverification flow

2014-04-08 13:11:41 -04:00

courseware.html

Merge pull request #10115 from edx/ziafazal/SOL-1254

2015-10-15 10:18:21 -04:00

error-message.html

Puts module.render() in try statements.

2014-03-19 19:30:22 +05:00

gradebook.html

Removed dragging and added tool tip to student record.

2015-10-08 15:47:10 -04:00

info.html

updated responsive body class to .is-view-in-course

2015-08-31 14:41:46 -04:00

legacy_instructor_dashboard.html

Move functionality for exporting a CSV of all student answers to a given

2015-08-17 22:32:49 +02:00

news.html

Group imports together in Mako templates

2015-06-03 12:36:47 -04:00

proctored-exam-controls.underscore

Integration of edx_proctoring into the LMS

2015-08-13 19:08:50 -04:00

proctored-exam-status.underscore

PHX-141

2015-09-09 15:51:14 +05:00

progress_graph.js

fix bug

2014-05-13 15:32:46 -04:00

progress.html

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2015-10-19 08:35:33 -05:00

static_tab.html

updated responsive body class to .is-view-in-course

2015-08-31 14:41:46 -04:00

submission_history.html

Make DjangoXBlockUserStateClient pass semantic tests

2015-08-01 08:13:25 -04:00

syllabus.html

Group imports together in Mako templates

2015-06-03 12:36:47 -04:00

welcome-back.html

Remove Django Waffle

2014-09-12 16:22:03 -04:00

xqa_interface.html

Supply default url for XQA server

2015-05-19 14:19:04 -04:00