Will Daly a5001bab2a Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form ...

Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss

2014-11-13 11:16:16 -05:00

..

accordion.html

Merge branch 'release'

2014-02-21 16:17:02 -05:00

course_about.html

try importing the exact references we need rather than deferencing it from the djangoapp module

2014-11-11 21:49:13 -05:00

course_navigation.html

Disabled student view if course is not yet released for students.

2014-09-22 12:50:46 +05:00

courses.html

This PR addresses the open feedback on the Microsites feature

2014-02-28 16:27:12 -05:00

courseware-error.html

Unicode support for course names in reverification flow

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

courseware.html

Properly escape CourseKeys and UsageKeys in html templates

2014-10-01 10:26:52 -04:00

error-message.html

Puts module.render() in try statements.

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

gradebook.html

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:49:55 -04:00

info.html

display banner on course info page if user is not enrolled (TNL-286)

2014-09-18 11:35:18 -04:00

instructor_dashboard.html

Merge pull request #5838 from edx/dsjen/feature-flag-analytics-enrollments

2014-11-12 10:40:04 -05:00

mktg_coming_soon.html

Properly escape CourseKeys and UsageKeys in html templates

2014-10-01 10:26:52 -04:00

mktg_course_about.html

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form

2014-11-10 15:05:37 -05:00

news.html

Added more descriptive page titles.

2014-01-30 17:32:03 -05:00

progress_graph.js

fix bug

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

progress.html

Properly escape CourseKeys and UsageKeys in html templates

2014-10-01 10:26:52 -04:00

static_tab.html

Add '' default to bodyclass in courseware templates

2014-02-01 16:18:51 +01:00

submission_history.html

Prevent XSS attack via submission_history page.

2013-07-23 17:23:59 -04:00

syllabus.html

Added more descriptive page titles.

2014-01-30 17:32:03 -05:00

welcome-back.html

Remove Django Waffle

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

xqa_interface.html

Properly escape CourseKeys and UsageKeys in html templates

2014-10-01 10:26:52 -04:00