David Ormsbee
|
af079a9362
|
Fix coffee includes for discussion forum.
|
2012-08-23 00:19:55 -04:00 |
|
Rocky Duan
|
952c9d56cf
|
moved some stuff
|
2012-08-22 15:57:04 -07:00 |
|
Rocky Duan
|
3cbaba1961
|
fixed autosubscribe
|
2012-08-22 14:11:19 -07:00 |
|
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
|
4a3975c78d
|
adjusted frontend stuff
|
2012-08-21 23:33:13 -07:00 |
|
Rocky Duan
|
a90af0c471
|
render permalink in backend
|
2012-08-21 23:26:06 -07:00 |
|
Rocky Duan
|
654075e03f
|
migrated follow thread
|
2012-08-21 23:08:32 -07:00 |
|
Rocky Duan
|
11e3276e80
|
update comment count based on operations
|
2012-08-21 17:43:20 -07:00 |
|
Rocky Duan
|
273af4a5ba
|
make delete work
|
2012-08-21 17:15:52 -07:00 |
|
Rocky Duan
|
de4b477649
|
make edit working
|
2012-08-21 17:02:17 -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
|
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
|
17683c43d4
|
attempt to migrate more code
|
2012-08-20 22:24:58 -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
|
8684ae29b2
|
Merge branch 'master' of github.com:MITx/mitx into refactor
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
|
2012-08-20 15:31:51 -07:00 |
|
Rocky Duan
|
348a7b6eb7
|
render time ago in front end
|
2012-08-20 12:04:25 -07:00 |
|
Rocky Duan
|
ff41338cad
|
refactor attempt
|
2012-08-19 21:58:36 -07:00 |
|
Rocky Duan
|
12d51334f8
|
mustache template
|
2012-08-19 16:03:42 -07:00 |
|
Rocky Duan
|
64e6160548
|
slight behavior change
|
2012-08-19 10:44:05 -07:00 |
|
Rocky Duan
|
991bb01af4
|
shouldn't commit env config
|
2012-08-19 10:42:45 -07:00 |
|
Rocky Duan
|
e49226e9e1
|
some refactor
|
2012-08-19 00:16:04 -07: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
|
00ff1b9419
|
can retrieve all comments
|
2012-08-15 01:08:42 -07:00 |
|
Rocky Duan
|
e5fe54ca5d
|
display active threads with only relevant contents
|
2012-08-15 00:46:28 -07:00 |
|
Rocky Duan
|
9ef1a11c28
|
fixed merge bug
|
2012-08-14 18:12:35 -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
|
d0a339bec6
|
fixed similar posts suggestion
|
2012-08-14 17:13:27 -07:00 |
|
Rocky Duan
|
dd80cbc423
|
confirm before changing moderator status
|
2012-08-14 16:57:20 -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
|
50e95de9ef
|
a place to start for the user profiel & fixed some bugs
|
2012-08-14 15:04:36 -07:00 |
|
Rocky Duan
|
eb47093b1c
|
Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
common/djangoapps/student/models.py
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
|
2012-08-14 12:54:43 -07:00 |
|
Rocky Duan
|
3c32aff123
|
disable asc sorting for now
|
2012-08-14 12:50:22 -07:00 |
|
Rocky Duan
|
49e840d62b
|
adjust new post button in forum view
|
2012-08-14 12:43:15 -07:00 |
|
Rocky Duan
|
60b2423c91
|
prompt window for deleting
|
2012-08-14 10:21:11 -07:00 |
|
Rocky Duan
|
38bdcabe53
|
reply now works again
|
2012-08-13 23:23:13 -07:00 |
|
Rocky Duan
|
19ba57858c
|
fixed focus bug: mistakenly binded event twice
|
2012-08-13 22:55:08 -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
|
0fa0f2c8ae
|
add cancel button for new post
|
2012-08-13 21:15:04 -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
|
44f7b37bfb
|
refactored comment_client working
|
2012-08-12 12:56:55 -07:00 |
|
Rocky Duan
|
7030d1f1a2
|
fixed endorse&edit&delete
|
2012-08-11 14:38:37 -07:00 |
|
Victor Shnayder
|
1c3038ff3a
|
Make accordion remember state
* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
|
2012-08-09 19:47:08 -04:00 |
|
Mike Chen
|
efad5632d8
|
set invisible instead of remove to preserve space of voting arrows when voting is disabled
|
2012-08-09 13:03:28 -04:00 |
|
Mike Chen
|
46a7c51df5
|
remove voting arrows if one cannot vote
|
2012-08-09 12:12:43 -04:00 |
|