Rocky Duan
|
a9b171c81f
|
Merge branch 'discussion3' of github.com:dementrock/mitx
Conflicts:
lms/static/coffee/src/discussion/templates.coffee
|
2012-08-07 12:05:46 -04:00 |
|
Tom Giannattasio
|
d5302a0bd0
|
thread updates: follow/unfollow, grid tweaks
|
2012-08-07 12:00:17 -04:00 |
|
Rocky Duan
|
0863e34619
|
display actual username
|
2012-08-07 11:40:58 -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 |
|
Tom Giannattasio
|
00a72cf86a
|
updated thread styles: voting, actions, comments, sort
|
2012-08-07 11:27:13 -04:00 |
|
Brittany Cheng
|
1fb0e352b4
|
blank slate
|
2012-08-07 11:10:24 -04:00 |
|
Rocky Duan
|
77900bd761
|
simple blank slate
|
2012-08-06 23:17:38 -04:00 |
|
Rocky Duan
|
5679b0da5d
|
sort by activity
|
2012-08-06 22:25:15 -04:00 |
|
Rocky Duan
|
fe02d04f07
|
use raw title
|
2012-08-06 21:46:33 -04:00 |
|
Mike Chen
|
6bc69ff97b
|
added permanent link for comments
|
2012-08-06 18:38:04 -04:00 |
|
Tom Giannattasio
|
6cdd3a7ec2
|
started thread styles
|
2012-08-06 18:17:21 -04:00 |
|
Mike Chen
|
50228fc2d6
|
added permanent link for threads
|
2012-08-06 18:09:35 -04:00 |
|
Mike Chen
|
16e86fe5b0
|
show searched tag
|
2012-08-06 17:28:58 -04:00 |
|
Tom Giannattasio
|
0ec7e3d3cd
|
added "top" sort type
|
2012-08-06 17:04:07 -04:00 |
|
Tom Giannattasio
|
fa7d1745dc
|
removed extraneous elements (page title, search within)
|
2012-08-06 17:03:49 -04:00 |
|
Mike Chen
|
dc29570189
|
Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation
|
2012-08-06 16:16:44 -04:00 |
|
Rocky Duan
|
39ae9343e8
|
merged brittany's branch & fixed stuff
|
2012-08-06 16:15:36 -04:00 |
|
Mike Chen
|
fca5ab9a08
|
added delete link
|
2012-08-06 16:01:41 -04:00 |
|
Mike Chen
|
7e8b1992f0
|
show endorsed checkmark based on permissions
|
2012-08-06 15:51:33 -04:00 |
|
Rocky Duan
|
427a871456
|
Merge branch 'discussion2' of github.com:dementrock/mitx
|
2012-08-06 15:21:54 -04:00 |
|
Rocky Duan
|
1805ed8a7c
|
search highlighting
|
2012-08-06 15:21:48 -04:00 |
|
Brittany Cheng
|
5e9dfabfda
|
comment info
|
2012-08-06 14:33:37 -04:00 |
|
Mike Chen
|
3f1534eab7
|
added permission framework.
|
2012-08-06 12:58:20 -04:00 |
|
Brittany Cheng
|
27eaffe246
|
sort styles
|
2012-08-06 11:47:16 -04:00 |
|
Rocky Duan
|
20926e839b
|
fixed ajax retrieved search bar in forum view
|
2012-08-05 14:57:35 -04:00 |
|
Rocky Duan
|
cacd58ca9f
|
fixed sort bug
|
2012-08-04 19:50:50 -04:00 |
|
Rocky Duan
|
a1575799ba
|
Merge branch 'discussion2' of github.com:dementrock/mitx
|
2012-08-04 18:04:07 -04:00 |
|
Rocky Duan
|
9308e39d4e
|
bug fix
|
2012-08-04 18:03:59 -04:00 |
|
Rocky Duan
|
7cd0914541
|
minor changes
|
2012-08-04 16:06:15 -04:00 |
|
Brittany Cheng
|
5643903efc
|
small change in html
|
2012-08-03 17:40:51 -04:00 |
|
Rocky Duan
|
d507ac6cc0
|
should be like this
|
2012-08-03 16:23:19 -04:00 |
|
Rocky Duan
|
79497287d7
|
moved some stuff & ajax link to page
|
2012-08-03 15:55:21 -04:00 |
|
Rocky Duan
|
600beb2849
|
ajax vote / unvote comments
|
2012-08-03 14:52:39 -04:00 |
|
Brittany Cheng
|
5d30c2de06
|
sort arrows
|
2012-08-03 14:28:04 -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 |
|
Brittany Cheng
|
15fa639e8b
|
merge conflict
|
2012-08-03 12:31:28 -04:00 |
|
Brittany Cheng
|
69475c63c8
|
move follow, remove hover
|
2012-08-03 12:30:21 -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 |
|
Brittany Cheng
|
2238137df8
|
sort styles
|
2012-08-02 18:09:37 -04:00 |
|
Rocky Duan
|
833b89502c
|
add class for selected sort option
|
2012-08-02 17:45:34 -04:00 |
|
Rocky Duan
|
f579730f16
|
should have done this long time ago
|
2012-08-02 17:20:12 -04:00 |
|
Rocky Duan
|
bad84669b7
|
Merge branch 'master' into discussion2
|
2012-08-02 16:01:41 -04:00 |
|
Rocky Duan
|
0375710d22
|
i meant sort before...this time it's search ajax
|
2012-08-02 16:01:27 -04:00 |
|
Brittany Cheng
|
4a605ab9c8
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-08-02 15:43:51 -04:00 |
|
Brittany Cheng
|
7f0282a222
|
paginator styles
|
2012-08-02 15:43:05 -04:00 |
|
Rocky Duan
|
7b65663e2b
|
ajax search in inline view
|
2012-08-02 15:34:29 -04:00 |
|
Rocky Duan
|
381fe9514b
|
make cancel/submit work and hide watch discussion
|
2012-08-02 15:12:55 -04:00 |
|
Rocky Duan
|
fd1e91aef2
|
display show comments button
|
2012-08-02 15:02:10 -04:00 |
|