Rocky Duan
|
3b76fe16d8
|
make inline page working
|
2012-08-22 14:04:42 -07:00 |
|
Rocky Duan
|
9b26a20989
|
fixed search highlighting
|
2012-08-22 12:04:32 -07:00 |
|
Rocky Duan
|
37c78524a8
|
migrated threads reloading related stuff
|
2012-08-22 11:07:02 -07:00 |
|
Rocky Duan
|
a90af0c471
|
render permalink in backend
|
2012-08-21 23:26:06 -07:00 |
|
Rocky Duan
|
11e3276e80
|
update comment count based on operations
|
2012-08-21 17:43:20 -07:00 |
|
Rocky Duan
|
fd0eff46e7
|
Merge branch 'feature/rocky/discussion_api_key' into refactor
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/lib/comment_client/utils.py
lms/templates/courseware/courseware.html
|
2012-08-21 17:14:25 -07:00 |
|
Rocky Duan
|
fe091b7bc1
|
Merge branch 'master' of github.com:MITx/mitx into feature/rocky/discussion_api_key
|
2012-08-21 15:45:24 -07:00 |
|
Rocky Duan
|
fdf92d68f6
|
more refactoring; enabled partial re-rendering for votes, endorse, and closed
|
2012-08-21 15:26:50 -07:00 |
|
Rocky Duan
|
cf28dbea60
|
Merge branch 'feature/bk_forum_int'
|
2012-08-21 12:56:56 -07:00 |
|
David Ormsbee
|
3f0fba71d9
|
Remove non-functioning News tab. Enable Instructor tab from Discussion page
|
2012-08-21 14:29:30 -04:00 |
|
David Ormsbee
|
08e892ce9e
|
Add command to seed forum permissions to existing users
|
2012-08-21 13:22:32 -04:00 |
|
David Ormsbee
|
1c84f8e2dd
|
Remove student removal (we shouldn't ever delete users)
|
2012-08-21 13:00:06 -04:00 |
|
David Ormsbee
|
b0894c3973
|
Fix tests for other courses - create default discussion roles on demand if they don't exist
|
2012-08-21 12:38:39 -04:00 |
|
David Ormsbee
|
6d371640d4
|
Removed signal removal in django_comment_client test (we're no longer doing user replication)
|
2012-08-21 12:04:24 -04:00 |
|
Rocky Duan
|
07f818da5a
|
got reply working under backbone framework
|
2012-08-21 02:12:21 -07:00 |
|
Rocky Duan
|
9dedd532c4
|
some progress
|
2012-08-20 23:43:47 -07:00 |
|
Rocky Duan
|
9ac26715a6
|
Merge branch 'feature/bk_forum_int' into refactor
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
lms/templates/discussion/index.html
requirements.txt
|
2012-08-20 22:42:32 -07:00 |
|
Rocky Duan
|
bca6699b58
|
updated seed_permissions_and_roles to accept course_id as a parameter
|
2012-08-20 22:37:26 -07:00 |
|
Rocky Duan
|
a905ac9e1d
|
updated backbone & single thread retrieval now working
|
2012-08-20 22:03:46 -07:00 |
|
Rocky Duan
|
d189a49ee5
|
continue working on backbone & got vote migrated and working
|
2012-08-20 17:32:36 -07:00 |
|
Rocky Duan
|
0b3e9909a4
|
Merge branch 'master' into refactor
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/static/coffee/src/discussion/content.coffee
requirements.txt
|
2012-08-20 15:35:31 -07:00 |
|
Rocky Duan
|
dc599c469f
|
fixed test
|
2012-08-20 15:26:07 -07:00 |
|
Rocky Duan
|
f82c2e00d1
|
simplified mustache helper loading
|
2012-08-20 15:24:19 -07:00 |
|
Rocky Duan
|
af17ba7a79
|
removed dependency on datehelper
|
2012-08-20 12:57:23 -07:00 |
|
Rocky Duan
|
71df263ff9
|
disable all course db related signals
|
2012-08-20 11:57:58 -07:00 |
|
Rocky Duan
|
1f50da8814
|
fixed discussion permission test
|
2012-08-20 11:41:36 -07:00 |
|
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 |
|