Commit Graph

39 Commits

Author SHA1 Message Date
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
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
e5fe54ca5d display active threads with only relevant contents 2012-08-15 00:46:28 -07:00
Rocky Duan
ea07d0697e fixed openclose thread 2012-08-14 17:37:19 -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
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
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
86b53bb248 uh 2012-08-10 17:53:22 -07:00
Rocky Duan
b1e1cd57d8 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-08 10:45:04 -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
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
Mike Chen
af656fcf21 use permissions to check if one can edit or relp 2012-08-06 15:08:47 -04:00
Mike Chen
3f1534eab7 added permission framework. 2012-08-06 12:58:20 -04:00
Mike Chen
30f5bdb429 fixed the order of decorators 2012-08-05 17:38:47 -04:00
Rocky Duan
600beb2849 ajax vote / unvote comments 2012-08-03 14:52:39 -04:00
Rocky Duan
038d7f89e5 ajax editing comments / threads 2012-08-03 14:26:37 -04:00
Rocky Duan
9b2578c79c fix reply & some random stuff 2012-08-03 13:35:15 -04:00
Rocky Duan
e59ea854ca ajax submit new post 2012-08-03 12:29:45 -04:00
Rocky Duan
0b96d0091b ajax reply & why am I on discussion2.. 2012-08-03 12:15:45 -04:00
Rocky Duan
5ba879fc13 refactored some code 2012-08-02 18:23:50 -04:00
Rocky Duan
9a31d7a9b4 basic sorting 2012-08-01 19:44:07 -04:00
Rocky Duan
7d9d790c5d endorse comments 2012-08-01 12:43:57 -04:00
Rocky Duan
e301be4a80 modify anonymity handling; display comments count 2012-07-31 11:54:02 -04:00
Rocky Duan
6f44001813 basic editing functionality 2012-07-31 10:11:51 -04:00
Rocky Duan
941ae0f068 basic error handling 2012-07-30 17:16:44 -04:00
Rocky Duan
8e3251c915 basic tag autocomplete 2012-07-29 17:32:00 -04:00
Rocky Duan
b92a180d25 add tags to threads & view threads by tags 2012-07-29 15:24:15 -04:00
Rocky Duan
0790a3add4 image uploading & render markdown 2012-07-27 17:50:38 -04:00
Rocky Duan
54ea3dba22 show news & options when submit comment 2012-07-25 15:30:05 -04:00
Rocky Duan
bedeac3a55 make course id available in xmodule 2012-07-24 18:51:56 -04:00
Rocky Duan
a06cc229a0 watch/unwatch threads; display current vote 2012-07-24 15:34:17 -04:00
Rocky Duan
fdab215eb4 moved django_comment_client into edx 2012-07-23 16:20:45 -04:00