Commit graph

378 commits

Author SHA1 Message Date
danielvincent
e709eba243 publisher as a faux nav element. 2010-07-03 22:43:11 -07:00
Raphael
cae4f832cf hover fix 2010-07-02 15:28:32 -07:00
Raphael
6ab9904f25 delete js now applies to new things 2010-07-02 15:19:33 -07:00
danielvincent
df3fe6c2a9 DG IZ RS; deletion now gets sent through the websocket 2010-07-02 15:16:28 -07:00
danielvincent
8e6ddb4b2e propagate_delete -> propagate_retraction 2010-07-02 14:40:25 -07:00
Raphael
f9856517db Post deletion now deletes comments 2010-07-02 14:34:58 -07:00
danielvincent
469599a4a9 DG RS IZ; added post deletion propagation 2010-07-02 13:08:53 -07:00
Raphael
de0bff17dd Removed headers 2010-07-02 11:11:59 -07:00
Raphael
76eabef2c1 commenting out sender parsing 2010-07-02 10:53:34 -07:00
danielvincent
24af7753fe DG IZ; fixed failing dashboard controller spec 2010-07-02 10:27:41 -07:00
danielvincent
d39d02c8ec Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-02 10:03:36 -07:00
Raphael
737614e04b google analytics for real 2010-07-01 22:20:57 -07:00
Raphael
418635aa72 Added google to session wall layout 2010-07-01 22:13:55 -07:00
Raphael
8e210cba68 REBOOT 2010-07-01 20:45:45 -07:00
Raphael
ad5c8ba548 dev env 2010-07-01 20:30:19 -07:00
Raphael
a96be34b7b Gave up on bundle lock 2010-07-01 20:11:53 -07:00
Raphael
acdc0adca3 no bundle check 2010-07-01 20:09:21 -07:00
Raphael
ed3c8f426f Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 20:05:03 -07:00
danielvincent
6ce0f4464f reverted publisher javascript refactor. working again in chrome. 2010-07-01 20:04:31 -07:00
Raphael
9c720575ce locking bundler 2010-07-01 20:04:26 -07:00
danielvincent
8d6ac6fbf8 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 19:55:45 -07:00
danielvincent
1616f5573d DG MS; fixed position of flash message 2010-07-01 19:55:38 -07:00
Raphael
0e9af5acfe thin should now stop, testing cap bundler 2010-07-01 19:55:05 -07:00
danielvincent
4f7579a5db DG MS; fixed delete button bug on stream 2010-07-01 19:49:56 -07:00
Raphael
d211d23637 Thin now should stop 2010-07-01 19:35:31 -07:00
Raphael
2f23387b3a changed spacing in seed 2010-07-01 18:13:02 -07:00
Raphael
90b750acb2 Renamed jpegs to jpgs 2010-07-01 18:12:00 -07:00
Raphael
6e2bdf2b14 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 18:08:06 -07:00
Raphael
8a91468a62 Made deploy more readable 2010-07-01 18:07:35 -07:00
danielvincent
88f0244353 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 17:22:30 -07:00
danielvincent
368f550f65 preview text next to diaspora in header 2010-07-01 17:22:24 -07:00
Raphael
80b69fd3ec Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 17:13:17 -07:00
maxwell
2b2864b78d now its just a message for ie 6, 7 2010-07-01 17:12:21 -07:00
Raphael
d9cff39bed Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 17:09:49 -07:00
Raphael
51e36b9659 RS, merged publisher refactor 2010-07-01 17:09:35 -07:00
maxwell
8d1ec57fa4 beefed it up to ie 7 2010-07-01 17:07:36 -07:00
maxwell
8e94fc5b4f added mean message 2010-07-01 17:05:14 -07:00
danielvincent
d0560e6c74 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:57:58 -07:00
danielvincent
d935db7845 newest message font fix 2010-07-01 16:54:27 -07:00
Raphael
a70fbc6a4a Changed cap script 2010-07-01 16:54:12 -07:00
maxwell
86c6cdcafa Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:38:51 -07:00
maxwell
ba984009f8 added chrome frame 2010-07-01 16:38:32 -07:00
danielvincent
c27bc09e75 fixed user image bug 2010-07-01 16:35:44 -07:00
danielvincent
b25880f04a Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:25:11 -07:00
danielvincent
03e7071aae fixed nav list/link deal for firefox, html compliance 2010-07-01 16:24:51 -07:00
maxwell
ce60d6a93d Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:17:41 -07:00
maxwell
6f17e5f28f added chrome frame for ie lameos 2010-07-01 16:17:32 -07:00
ilya
eb0578df93 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 18:52:59 -04:00
ilya
8b12f73581 pins added, typo 2010-07-01 18:52:49 -04:00
maxwell
b0a3feb30c fixed g analytics 2010-07-01 15:51:17 -07:00