Commit graph

2188 commits

Author SHA1 Message Date
danielvincent
39e85754d8 nav should be collapsed into a filter list. comments are more clear. 2010-06-26 00:07:21 -07:00
ilya
a7d46bffab removed socket.js 2010-06-26 02:08:19 -04:00
ilya
f5ecfebcb9 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-25 23:23:44 -04:00
ilya
d4f528bba8 Removed bookmark new page, moved form to index 2010-06-25 23:23:37 -04:00
maxwell
4d65cfab09 MS^2 Added the friends panel to application layout 2010-06-25 19:22:05 -07:00
maxwell
5cade230ac added silly debug toggle 2010-06-25 15:33:23 -07:00
maxwell
a673e48317 DG MS fixed js for statusmessage 2010-06-23 12:07:22 -07:00
maxwell
671772f901 MS DG added tinyMCE, now a blog is better than a status messsage 2010-06-23 11:58:46 -07:00
maxwell
fba4ce9e3b DG MS; fixed flash message visual bug 2010-06-23 11:11:58 -07:00
maxwell
5e5dea85a8 pushing small js fixes 2010-06-23 10:25:49 -07:00
maxwell
60fa7e3ac4 view stuffs 2010-06-23 01:26:00 -07:00
maxwell
94de043862 fixed not hardcoded port for websockets 2010-06-22 17:20:07 -07:00
maxwell
4af10a95fa oops forgot to add jquery_form 2010-06-22 16:44:41 -07:00
maxwell
3064d208eb added firefox websocket stuffs, only loads if it is not safari or chrome 2010-06-22 14:31:16 -07:00
maxwell
f696ffc3a6 fixed up some views, but some stuff feels like it broke 2010-06-21 16:46:19 -07:00
maxwell
a0417d13af fixed merge with master 2010-06-21 14:38:38 -07:00
danielvincent
06271d5821 added dumb partial switcher function in dashboard controller 2010-06-21 14:23:59 -07:00
maxwell
655dd64a54 websockets work 2010-06-21 14:12:05 -07:00
maxwell
7bc165d7a0 added js file 2010-06-20 22:11:37 -07:00
danielvincent
26d675af11 some sass cleanup 2010-06-20 18:36:01 -07:00
danielvincent
c542c08e38 simpler 2010-06-20 17:06:10 -07:00
danielvincent
6647ce34ab status message and bookmark page 2010-06-20 14:52:04 -07:00
danielvincent
aee5f7f04f took out filler elements 2010-06-20 11:49:05 -07:00
danielvincent
df2b9d6ad4 more shuffling 2010-06-19 14:44:08 -07:00
danielvincent
0c392a0cce moved nav to bottom header 2010-06-19 03:01:39 -07:00
danielvincent
d1630b6c45 shrink that header 2010-06-19 00:53:42 -07:00
maxwell
8019fc8d31 working websocket 2010-06-19 00:09:58 -07:00
danielvincent
1223011a4f more semi-drastic changes. 2010-06-19 00:01:25 -07:00
danielvincent
de8d8d5cb5 in the shit 2010-06-18 23:32:47 -07:00
danielvincent
c63eac0fd9 added line delimiters for post stream on dashboard 2010-06-15 22:34:08 -07:00
maxwell
408c2c719d swaped out js for jquery 2010-06-15 09:53:19 -07:00
maxwell
3eef53892c DG MS; Dashboard shows the user's most recent update 2010-06-14 17:48:21 -07:00
danielvincent
63f5fe15d6 nav includes users and status messages 2010-06-14 11:55:52 -07:00
danielvincent
5d273ef049 removed stray rails.png file 2010-06-14 11:51:03 -07:00
danielvincent
98abb75097 added blueprint 2010-06-14 11:50:17 -07:00
danielvincent
eaeafd3240 added authentication via devise 2010-06-12 21:56:50 -07:00
maxwell
e068707158 added nifty templates, and started a user model. session model is next 2010-06-12 15:26:37 -07:00
Raphael Sofaer
0390bbde8a Activerecord this time\! 2010-06-11 10:40:49 -07:00