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

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py

2013-03-15 09:46:47 -04:00

..

mustache

inline mustache working

2013-02-08 14:41:36 -05:00

_ajax_single_thread.html

fixed comment retrieval

2012-08-19 10:07:31 -07:00

_blank_slate.html

blank slate

2012-08-07 11:10:24 -04:00

_content_renderer.html

Remove user_id from content renderer although I'm 99.9% sure this isn't

2012-09-11 01:51:16 -07:00

_discussion_course_navigation.html

Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view.

2012-11-01 04:37:16 -04:00

_discussion_module.html

Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view.

2012-11-01 04:37:16 -04:00

_filter_dropdown.html

make cohort filter visibility conditional on selected commentable cohortedness

2013-02-08 17:22:29 -05:00

_forum.html

use escape html everywhere and only send discussion data relavent

2012-08-24 01:45:55 -07:00

_inline_new_post.html

Make allow_anonymous and allow_anonymous_to_peers use field access in templates

2013-03-08 13:23:06 -05:00

_inline.html

use escape html everywhere and only send discussion data relavent

2012-08-24 01:45:55 -07: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_dependencies.html

continue working on backbone & got vote migrated and working

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

_js_head_dependencies.html

Converted tooltips to coffee too, and removed both converted files from the included js header.

2012-09-17 19:19:09 -07:00

_new_post.html

Make allow_anonymous and allow_anonymous_to_peers use field access in templates

2013-03-08 13:23:06 -05:00

_paginator.html

use escape html everywhere and only send discussion data relavent

2012-08-24 01:45:55 -07:00

_recent_active_posts.html

use escape html everywhere and only send discussion data relavent

2012-08-24 01:45:55 -07:00

_search_bar.html

use escape html everywhere and only send discussion data relavent

2012-08-24 01:45:55 -07:00

_similar_posts.html

use escape html everywhere and only send discussion data relavent

2012-08-24 01:45:55 -07:00

_single_thread.html

candidate without inline

2013-03-13 18:50:00 -04:00

_sort.html

Make 'date' the first sort key since it's the new default (students seem to prefer it, especially since top is kind of unclear).

2012-08-29 22:20:20 -07:00

_thread_list_template.html

change cohort dropdown verbiage

2013-02-08 15:41:11 -05:00

_trending_tags.html

use escape html everywhere and only send discussion data relavent

2012-08-24 01:45:55 -07:00

_underscore_templates.html

candidate without inline

2013-03-13 18:40:10 -04:00

_user_active_threads.html

use escape html everywhere and only send discussion data relavent

2012-08-24 01:45:55 -07:00

_user_profile.html

Prevent showing redundant roles for this user

2012-09-14 14:29:17 -04:00

ajax_create_comment.html

major refactor of templates

2012-08-19 00:59:43 -07:00

ajax_create_thread.html

major refactor of templates

2012-08-19 00:59:43 -07:00

ajax_update_comment.html

major refactor of templates

2012-08-19 00:59:43 -07:00

ajax_update_thread.html

major refactor of templates

2012-08-19 00:59:43 -07:00

ajax_user_profile.html

toggle moderator status

2012-08-14 16:43:33 -07:00

index.html

Make display_name defaulting explicit

2013-03-08 14:58:09 -05:00

single_thread.html

Move dropdown filter into a more clearly named file, discussion-filter.js, and move the

2012-09-17 18:08:44 -07:00

user_profile.html

User profile page redone to act like the inline discussion, except threads are

2012-09-12 15:16:35 -07:00