Commit Graph

12 Commits

Author SHA1 Message Date
Calen Pennington
0d3c44996a LMS i18n from Tsinghua 2013-07-31 19:39:15 -04:00
Rocky Duan
80195176e9 use escape html everywhere and only send discussion data relavent 2012-08-24 01:45:55 -07:00
Rocky Duan
43ef4f6482 fixed recent threads & tags links 2012-08-22 19:09:58 -07:00
Rocky Duan
5009b78150 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/djangoapps/django_comment_client/permissions.py
	lms/static/coffee/src/discussion/content.coffee
	lms/static/coffee/src/discussion/utils.coffee
	lms/templates/discussion/_recent_active_posts.html
	lms/templates/discussion/_search_bar.html
	lms/templates/discussion/_thread.html
	lms/templates/discussion/_trending_tags.html
	lms/urls.py
2012-08-14 17:32:30 -07:00
Rocky Duan
62bc1aaef7 make following and recent tags display actual things 2012-08-13 16:32:08 -07:00
Mike Chen
2fae27d582 temporarily disable trending and active if no such data is passed to template. 2012-08-09 12:05:19 -04:00
Brittany Cheng
a2f0e31d90 Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 16:21:24 -04:00
Brittany Cheng
9ae21a878a recent activity 2012-08-07 16:21:19 -04:00
Rocky Duan
fddee7defa Merge branch 'brittany' of github.com:dementrock/mitx
Conflicts:
	lms/templates/discussion/_recent_active_posts.html
2012-08-07 16:19:10 -04:00
Rocky Duan
7ba3bdfd61 show recently active posts user's following 2012-08-07 16:16:23 -04:00
Brittany Cheng
338a6788c8 recent activity 2012-08-07 16:11:24 -04:00
Rocky Duan
5309592f01 scaffold for recent active posts 2012-08-07 15:40:36 -04:00