Commit Graph

83 Commits

Author SHA1 Message Date
Arjun Singh
8f63ec4d44 merge 2012-09-14 02:56:34 -07:00
Arjun Singh
fff7bcc5a7 Remove more tags; anonymity to peers 2012-09-14 02:50:08 -07:00
Ibrahim Awwal
910be64aa2 Make pagination respect any filters or searches or sort keys. Searches and filters will
query the comment service to get their results rather than filtering threads that have
already been loaded.
2012-09-14 02:13:53 -07:00
Arjun Singh
a83b9322ae Allow for course subscriptions 2012-09-13 16:03:19 -07:00
Arjun Singh
8bad4c8dbc Allow for course subscriptions 2012-09-13 16:00:48 -07:00
Arjun Singh
7ad9b39b98 Merge master 2012-09-10 15:33:59 -07:00
Arjun Singh
36b3524552 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-06 18:22:15 -10:00
Matthew Mongeau
366e9c674b Code for displaying endorsed checkmark. 2012-09-06 17:46:04 -04:00
Arjun Singh
242f523d74 Explicit request timeout 2012-09-05 15:09:15 -07:00
Calen Pennington
4d2983cb99 Merge pull request #587 from MITx/feature/victor/forum-anon-user-500
Add some rudimentary error checking to forum views
2012-09-05 06:21:46 -07:00
Rocky Duan
fde77b7a89 fixed user link and back button 2012-08-31 23:46:13 -07:00
Ibrahim Awwal
b13c5acd4f Save the user's selected sort order on the comments service.
Requires cs_comments_service to have the field default_sort_key on users.
2012-08-29 22:13:37 -07:00
Victor Shnayder
f5754f6d1e Add some rudimentary error checking to forum views
[Hopefully fix #34992235]
2012-08-29 13:30:55 -04:00
Arjun Singh
ed6317f37c getting rid of terrible hack in favor of re enabling the dispatcher to sync w/ the comment service 2012-08-23 10:03:36 -07:00
Arjun Singh
7f3a4889b8 make discussions work for new users 2012-08-23 06:48:37 -07:00
David Ormsbee
ec4858801e read the comment service shared key from django config 2012-08-23 08:02:19 -04:00
David Ormsbee
aeee2791ea Merge remote-tracking branch 'rocky/master' into feature/dave/forum_fixes
Conflicts:
	lms/lib/comment_client/utils.py
	lms/templates/discussion/mustache/_content.mustache
2012-08-22 20:00:06 -04:00
David Ormsbee
2e39131b31 Tiny fix to handle when data_or_params isn't passed in 2012-08-22 19:16:28 -04:00
Rocky Duan
3cbaba1961 fixed autosubscribe 2012-08-22 14:11:19 -07:00
Rocky Duan
9b26a20989 fixed search highlighting 2012-08-22 12:04:32 -07:00
Rocky Duan
a90af0c471 render permalink in backend 2012-08-21 23:26:06 -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
4b97e70a4c fixed bug when no data is transmitted otherwise 2012-08-21 17:10:29 -07:00
Rocky Duan
e3a3f7094a added shared key authentication 2012-08-21 15:45:41 -07:00
Rocky Duan
72e6588be4 Merge branch 'master' into refactor 2012-08-21 13:34:20 -07:00
Rocky Duan
2265713028 added shared key authentication 2012-08-21 13:22:48 -07:00
Rocky Duan
9dedd532c4 some progress 2012-08-20 23:43:47 -07:00
David Ormsbee
b6dfa50a73 Adjust settings so we can change the comments service URL from Django config 2012-08-20 17:33:45 -04:00
Rocky Duan
7b5e66b68f python code for time_ago_in_words is unnecessary now 2012-08-20 12:05:02 -07:00
Rocky Duan
e49226e9e1 some refactor 2012-08-19 00:16:04 -07:00
Rocky Duan
0dd5428e24 refactored code to render ajax content 2012-08-18 17:54:43 -07:00
Rocky Duan
1a92cc5c3f callback for models 2012-08-15 15:46:58 -07:00
Rocky Duan
7335c1529e show all content in a course in the forum view 2012-08-15 11:21:31 -07:00
Rocky Duan
e5fe54ca5d display active threads with only relevant contents 2012-08-15 00:46:28 -07:00
Rocky Duan
d4f024ed26 small bug fix 2012-08-14 15:06:54 -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
28f0dd2759 make delete actually working again 2012-08-14 10:24:41 -07:00
Rocky Duan
9d3c9e333f fixed tag autocomplete 2012-08-13 23:58:42 -07:00
Rocky Duan
1f4d2f3d8a fixed updating bug 2012-08-13 23:27:55 -07:00
Rocky Duan
38bdcabe53 reply now works again 2012-08-13 23:23:13 -07:00
Rocky Duan
d6f3492975 replaced comment client sym link 2012-08-12 22:55:55 -07:00
Rocky Duan
2848c1fe38 switched to refactored comment_client 2012-08-11 17:36:58 -07: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
0c311b8f13 search for similar posts without any styling.. 2012-08-07 11:22:41 -04:00
Rocky Duan
0fd2ed99c6 client side function for user operations 2012-08-04 17:59:58 -04:00
Rocky Duan
600beb2849 ajax vote / unvote comments 2012-08-03 14:52:39 -04:00
Rocky Duan
9a31d7a9b4 basic sorting 2012-08-01 19:44:07 -04:00
Rocky Duan
ce15faf6a0 Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 2012-08-01 16:52:06 -04:00
Rocky Duan
17d11a6391 pagination 2012-08-01 16:45:08 -04:00