Rocky Duan
|
ff41338cad
|
refactor attempt
|
2012-08-19 21:58:36 -07:00 |
|
Rocky Duan
|
d5c2b04c5c
|
modified mustache template working
|
2012-08-19 20:43:46 -07:00 |
|
Rocky Duan
|
96b9a37048
|
work around compatibility issue
|
2012-08-19 16:42:56 -07:00 |
|
Rocky Duan
|
12d51334f8
|
mustache template
|
2012-08-19 16:03:42 -07:00 |
|
Rocky Duan
|
b4ec109dac
|
major refactor of templates
|
2012-08-19 00:59:43 -07:00 |
|
Rocky Duan
|
e49226e9e1
|
some refactor
|
2012-08-19 00:16:04 -07:00 |
|
Rocky Duan
|
1c1d449a82
|
minor refactoring
|
2012-08-18 19:16:49 -07:00 |
|
Rocky Duan
|
0dd5428e24
|
refactored code to render ajax content
|
2012-08-18 17:54:43 -07:00 |
|
Rocky Duan
|
238adb1a03
|
Merge branch 'master' into profile
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
lms/templates/course_navigation.html
|
2012-08-18 17:04:37 -07:00 |
|
Rocky Duan
|
028bd23c1c
|
Merge branch 'master' of github.com:MITx/mitx into profile
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
|
2012-08-18 16:57:00 -07:00 |
|
Rocky Duan
|
449da71cd9
|
fixed vote permission
|
2012-08-15 18:04:56 -07:00 |
|
Mike Chen
|
d56ac9a71b
|
added comment
|
2012-08-15 17:22:09 -04:00 |
|
Mike Chen
|
158e978a7e
|
added naive caching. not sure how to expire.
|
2012-08-15 17:15:08 -04:00 |
|
Mike Chen
|
2454c06b08
|
Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance
|
2012-08-15 16:14:17 -04:00 |
|
Rocky Duan
|
7335c1529e
|
show all content in a course in the forum view
|
2012-08-15 11:21:31 -07:00 |
|
Mike Chen
|
b4621d0562
|
added QueryCountDebugMiddleware
|
2012-08-15 11:21:11 -04:00 |
|
Mike Chen
|
7c22a39aca
|
Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance
Conflicts:
common/lib/xmodule/xmodule/discussion_module.py
lms/djangoapps/django_comment_client/forum/views.py
lms/templates/discussion/_thread.html
lms/urls.py
|
2012-08-15 11:05:20 -04:00 |
|
Rocky Duan
|
e5fe54ca5d
|
display active threads with only relevant contents
|
2012-08-15 00:46:28 -07:00 |
|
Rocky Duan
|
308772500e
|
fixed permalink
|
2012-08-14 17:45:09 -07:00 |
|
Rocky Duan
|
ea07d0697e
|
fixed openclose thread
|
2012-08-14 17:37:19 -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
|
700594263e
|
Merge branch 'brittany' of github.com:dementrock/mitx into profile &
small fix
Conflicts:
lms/templates/discussion/user_profile.html
|
2012-08-14 16:52:43 -07:00 |
|
Rocky Duan
|
457b7f468f
|
toggle moderator status
|
2012-08-14 16:43:33 -07:00 |
|
Rocky Duan
|
eef24a5ebe
|
added administrator role
|
2012-08-14 15:58:04 -07:00 |
|
Rocky Duan
|
529c323771
|
fixed bug caused by missing course_id in retrieved comments
|
2012-08-14 15:57:02 -07:00 |
|
Rocky Duan
|
50e95de9ef
|
a place to start for the user profiel & fixed some bugs
|
2012-08-14 15:04:36 -07:00 |
|
Rocky Duan
|
04387289fa
|
fixed bugs caused by merging
|
2012-08-14 13:43:04 -07:00 |
|
Rocky Duan
|
38bdcabe53
|
reply now works again
|
2012-08-13 23:23:13 -07:00 |
|
Rocky Duan
|
6fa0298546
|
make retrieved single thread/comment after update integrated with permissions
|
2012-08-13 21:42:28 -07:00 |
|
Rocky Duan
|
12897ffff0
|
added title & tag for new post & fixed error handling; reply button in generated thread doesn't work
|
2012-08-12 22:54:02 -07:00 |
|
Rocky Duan
|
7b7164a101
|
fixed unicode bug
|
2012-08-12 17:12:16 -07:00 |
|
Rocky Duan
|
44f7b37bfb
|
refactored comment_client working
|
2012-08-12 12:56:55 -07:00 |
|
Rocky Duan
|
b7d3361894
|
Merge branch 'mergedtom' into refactor
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
|
2012-08-11 17:43:16 -07:00 |
|
Rocky Duan
|
de8c828fb3
|
changed comment_client module to be imported as cc
|
2012-08-11 17:42:08 -07:00 |
|
Rocky Duan
|
86b53bb248
|
uh
|
2012-08-10 17:53:22 -07:00 |
|
Mike Chen
|
46a7c51df5
|
remove voting arrows if one cannot vote
|
2012-08-09 12:12:43 -04:00 |
|
Mike Chen
|
b06e31d2ed
|
fix Close Thread showing for students and empty bracket in search bar
|
2012-08-08 14:51:49 -04:00 |
|
Rocky Duan
|
2e45b8c3c6
|
Merge branch 'ccp0101/moderation' into lol
|
2012-08-08 10:46:11 -04:00 |
|
Rocky Duan
|
b1e1cd57d8
|
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
|
2012-08-08 10:45:04 -04:00 |
|
Rocky Duan
|
18fcdc4be2
|
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
|
2012-08-08 10:44:24 -04:00 |
|
Mike Chen
|
b2a048e6fc
|
limit permissions of a role to courses and fix bugs
|
2012-08-08 10:42:29 -04:00 |
|
Rocky Duan
|
c2f27a5f8e
|
some starting refactor ideas
|
2012-08-08 10:03:49 -04:00 |
|
Rocky Duan
|
f1dabe1575
|
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into lol
|
2012-08-07 18:55:34 -04:00 |
|
Rocky Duan
|
690d97f28b
|
fixed merge bugs
|
2012-08-07 18:49:59 -04:00 |
|
Rocky Duan
|
272c7b8b0c
|
Merge branch 'master' into merge
|
2012-08-07 16:49:54 -04:00 |
|
Rocky Duan
|
2685a3b637
|
trending tags
|
2012-08-07 16:41:01 -04:00 |
|
Rocky Duan
|
7ba3bdfd61
|
show recently active posts user's following
|
2012-08-07 16:16:23 -04:00 |
|
Rocky Duan
|
547114a823
|
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
|
2012-08-07 11:31:26 -04:00 |
|
Rocky Duan
|
0c311b8f13
|
search for similar posts without any styling..
|
2012-08-07 11:22:41 -04:00 |
|
Rocky Duan
|
77900bd761
|
simple blank slate
|
2012-08-06 23:17:38 -04:00 |
|