Commit Graph

658 Commits

Author SHA1 Message Date
Rocky Duan
457b7f468f toggle moderator status 2012-08-14 16:43:33 -07:00
Rocky Duan
97f1e2f5e4 removed debug line 2012-08-14 16:39:22 -07:00
Brittany Cheng
f983867e6b moderator styles 2012-08-14 16:28:45 -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
3c32aff123 disable asc sorting for now 2012-08-14 12:50:22 -07:00
Rocky Duan
0992be3749 make top sort by last_activity_at for now 2012-08-14 12:45:22 -07:00
Rocky Duan
49e840d62b adjust new post button in forum view 2012-08-14 12:43:15 -07:00
Rocky Duan
dd4f89638d hide empty brackets when not filtering through tags 2012-08-13 16:38:18 -07:00
Rocky Duan
62bc1aaef7 make following and recent tags display actual things 2012-08-13 16:32:08 -07:00
Rocky Duan
2dde3b00d5 removed edit button in the bottom bar 2012-08-13 16:23:32 -07:00
Rocky Duan
1742775262 added configuration parameter to turn on / off discussion service 2012-08-13 15:35:19 -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
322828fbff removed unnecessary template 2012-08-12 16:41:16 -07:00
Rocky Duan
44f7b37bfb refactored comment_client working 2012-08-12 12:56:55 -07:00
Rocky Duan
2d256dfe1d attempt to fix sort 2012-08-11 16:35:34 -07:00
Rocky Duan
7030d1f1a2 fixed endorse&edit&delete 2012-08-11 14:38:37 -07:00
Rocky Duan
39590116f7 make some indentation 2012-08-10 18:51:12 -07:00
Rocky Duan
ab6cf914a0 Merge branch 'brittany' of github.com:dementrock/mitx into lol
Conflicts:
	lms/templates/discussion/_thread.html
2012-08-10 17:59:19 -07:00
Brittany Cheng
f44358ab78 merge tom's styles 2012-08-10 17:52:07 -07:00
Mike Chen
2fae27d582 temporarily disable trending and active if no such data is passed to template. 2012-08-09 12:05:19 -04:00
Mike Chen
b449334462 generate permanent link for thread/comment on client side 2012-08-09 12:04:38 -04:00
Tom Giannattasio
5c14a1ce65 added admin controls to main post and comments 2012-08-08 16:42:19 -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
Tom Giannattasio
9b9bb22cda tightened white space; fixed double margin in comments 2012-08-08 14:36:19 -04:00
Brittany Cheng
3ec658df56 merge tom's styles, warning: LOTS OF STUFF BROKE 2012-08-08 12:45:40 -04:00
Mike Chen
eaf8279451 Merge branch 'lol' of github.com:dementrock/mitx into ccp0101/moderation
Conflicts:
	lms/urls.py
2012-08-08 12:04:41 -04:00
Mike Chen
8627a5f33e Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-08 11:20:13 -04:00
Tom Giannattasio
10ff6af3bb discussion sidebar additions; inline text editor example 2012-08-08 10:56:59 -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
f1dabe1575 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into lol 2012-08-07 18:55:34 -04:00
Rocky Duan
f3d44225cc Merge branch 'brittany' of github.com:dementrock/mitx into brittany 2012-08-07 18:51:18 -04:00
Mike Chen
e9c970e399 revert permanent link for comments 2012-08-07 18:45:26 -04:00
Brittany Cheng
67777ef5a2 left nav styles 2012-08-07 16:52:32 -04:00
Rocky Duan
272c7b8b0c Merge branch 'master' into merge 2012-08-07 16:49:54 -04:00
Brittany Cheng
8df3ec3dae Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 16:42:45 -04:00
Rocky Duan
2685a3b637 trending tags 2012-08-07 16:41:01 -04:00
Brittany Cheng
a2f0e31d90 Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 16:21:24 -04:00
Brittany Cheng
9ae21a878a recent activity 2012-08-07 16:21:19 -04:00
Rocky Duan
fddee7defa Merge branch 'brittany' of github.com:dementrock/mitx
Conflicts:
	lms/templates/discussion/_recent_active_posts.html
2012-08-07 16:19:10 -04:00
Brittany Cheng
d934142adf Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 16:16:32 -04:00
Rocky Duan
7ba3bdfd61 show recently active posts user's following 2012-08-07 16:16:23 -04:00
Rocky Duan
6023aca559 scaffold for trending tags 2012-08-07 16:15:43 -04:00
Brittany Cheng
338a6788c8 recent activity 2012-08-07 16:11:24 -04:00
Rocky Duan
5309592f01 scaffold for recent active posts 2012-08-07 15:40:36 -04:00
Tom Giannattasio
8c366e2d59 tweaking the text editor 2012-08-07 14:25:05 -04:00