Commit Graph

4042 Commits

Author SHA1 Message Date
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
8bf4bc2d5e Merge branch 'discussion2' of github.com:dementrock/mitx 2012-08-03 16:09:23 -04:00
Rocky Duan
042ccf9754 make everything inline (ajax) for now 2012-08-03 16:09:13 -04:00
Rocky Duan
79497287d7 moved some stuff & ajax link to page 2012-08-03 15:55:21 -04:00
Brittany Cheng
53b6c9944c reply and edit margins 2012-08-03 15:22:26 -04:00
Rocky Duan
3c681a207f fixed vote bug 2012-08-03 15:07:57 -04:00
Rocky Duan
6f798fd196 Merge branch 'discussion2' of github.com:dementrock/mitx 2012-08-03 14:59:30 -04:00
Rocky Duan
b2c1904c7a ajax endorse 2012-08-03 14:59:23 -04:00
Rocky Duan
600beb2849 ajax vote / unvote comments 2012-08-03 14:52:39 -04:00
Brittany Cheng
356c44c5bf voting styles 2012-08-03 14:48:50 -04:00
Brittany Cheng
cbb39406b6 sort styles 2012-08-03 14:37:14 -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
a587cb5a3c Merge branch 'discussion2' of github.com:dementrock/mitx 2012-08-03 13:43:15 -04:00
Rocky Duan
7d1b577b80 show discussion & reply fix 2012-08-03 13:43:07 -04:00
Brittany Cheng
0a2aafab08 follow button style 2012-08-03 13:40:04 -04:00
Brittany Cheng
4ac3eebcfb Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-08-03 13:39:23 -04:00
Rocky Duan
2077729d7c Merge branch 'discussion2' of github.com:dementrock/mitx 2012-08-03 13:38:18 -04:00
Brittany Cheng
ec258a6346 follow button 2012-08-03 13:36:14 -04:00
Rocky Duan
9b2578c79c fix reply & some random stuff 2012-08-03 13:35:15 -04:00
Brittany Cheng
b73e329dd8 follow button 2012-08-03 13:33:40 -04:00
Rocky Duan
fd922cf755 slight changes 2012-08-03 12:49:35 -04:00
Rocky Duan
5224856286 Merge branch 'discussion2' 2012-08-03 12:45:48 -04:00
Rocky Duan
8297f7b569 slight changes 2012-08-03 12:45:30 -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
Rocky Duan
89c28115b4 some archived stuff for later 2012-08-03 11:03:58 -04:00
Rocky Duan
f7e9746eb3 Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 2012-08-03 10:16:45 -04:00
Rocky Duan
7ab137328f Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-08-03 10:16:35 -04:00
Brittany Cheng
dac28f800b Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-08-03 10:11:43 -04:00
Rocky Duan
51961c1cf1 Merge branch 'master' into discussion2 2012-08-02 18:41:15 -04:00
Rocky Duan
cc477138cd some refactoring on error handling 2012-08-02 18:41:07 -04:00
Rocky Duan
5ba879fc13 refactored some code 2012-08-02 18:23:50 -04:00
Brittany Cheng
839463e9c2 Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 2012-08-02 18:11:26 -04:00
Brittany Cheng
2238137df8 sort styles 2012-08-02 18:09:37 -04:00
Brittany Cheng
3b312a2c92 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-08-02 17:46:40 -04:00
Rocky Duan
833b89502c add class for selected sort option 2012-08-02 17:45:34 -04:00
Brittany Cheng
cf4ac2ef89 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-08-02 17:21:08 -04:00
Rocky Duan
4749f3a575 Merge branch 'master' into discussion2 2012-08-02 17:20:23 -04:00
Rocky Duan
f579730f16 should have done this long time ago 2012-08-02 17:20:12 -04:00
Rocky Duan
d183e91f3f Merge branch 'master' into discussion2 2012-08-02 17:08:24 -04:00
Rocky Duan
6a23e910c2 small fic 2012-08-02 17:08:05 -04:00
Brittany Cheng
f649084ab2 rocky's coffee edits 2012-08-02 17:05:00 -04:00
Rocky Duan
88a98ef548 refactored discussion.coffee into separate files 2012-08-02 17:03:10 -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
55ce53f984 reply styles 2012-08-02 15:50:14 -04:00