Nimisha Asthagiri d7f850a764 Merge branch 'release' ...

Conflicts:
	lms/djangoapps/instructor/features/data_download.py

2014-10-07 16:23:28 -04:00

..

mustache

Unify forum thread views (and templates)

2014-08-29 15:59:31 -04:00

_blank_slate.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

_discussion_course_navigation.html

Make forum New Post buttons behave as buttons

2014-01-17 16:38:51 -05:00

_discussion_module_studio.html

in Studio, render compact placeholders for inline discussions.

2014-04-10 15:44:30 -04:00

_discussion_module.html

Fix inconsistent ui issues on discussion during blackout period

2014-08-07 19:33:40 +05:00

_filter_dropdown.html

Remove "flagged discussions" from forum topic menu

2014-08-29 15:59:33 -04:00

_js_body_dependencies.html

continue working on backbone & got vote migrated and working

2012-08-20 17:32:36 -07:00

_js_data.html

more refactoring; enabled partial re-rendering for votes, endorse, and closed

2012-08-21 15:26:50 -07:00

_js_head_dependencies.html

Support adding cohorts from the instructor dashboard

2014-10-01 09:22:32 -04:00

_recent_active_posts.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

_search_bar.html

Remove defunct forum post tagging code

2014-01-14 13:03:56 -05:00

_similar_posts.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

_thread_list_template.html

Move more forum nav rendering logic to front end

2014-09-04 18:22:19 -04:00

_underscore_templates.html

Merge branch 'release'

2014-10-07 16:23:28 -04:00

_user_profile.html

i18n: externalize strings in discussion forums templates and python code.

2014-01-15 14:26:22 -05:00

index.html

Properly escape CourseKeys and UsageKeys in html templates

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

maintenance.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

user_profile.html

Properly escape CourseKeys and UsageKeys in html templates

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