Raphael
|
7dd8acadf7
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 09:59:24 -07:00 |
|
Raphael
|
05e6dada58
|
Fixing deploy friending
|
2010-07-16 09:59:06 -07:00 |
|
maxwell
|
bf3d34090e
|
MS IZ = AHHH
|
2010-07-15 19:08:25 -07:00 |
|
maxwell
|
9ff4cd015d
|
MS IZ = AHHH
|
2010-07-15 19:05:59 -07:00 |
|
maxwell
|
f927ace140
|
MS IZ = AHHH
|
2010-07-15 19:01:14 -07:00 |
|
maxwell
|
8f59a9d788
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-15 18:42:44 -07:00 |
|
maxwell
|
b903163d3f
|
MS IZ = AHHH
|
2010-07-15 18:42:25 -07:00 |
|
Raphael
|
cae5700222
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-15 18:41:01 -07:00 |
|
Raphael
|
501620e9fb
|
DG RS; fixed some visual bugs. request link now turns red on new request
|
2010-07-15 18:40:55 -07:00 |
|
maxwell
|
65deaba558
|
MS IZ hcard, emptyfiles, routesw
|
2010-07-15 18:36:07 -07:00 |
|
maxwell
|
45abeb2346
|
MS IZ small webfinger bug fixes
|
2010-07-15 17:11:20 -07:00 |
|
maxwell
|
6bab2fedc8
|
MS IZ small webfinger bug fixes
|
2010-07-15 17:06:48 -07:00 |
|
maxwell
|
2dc6b5f46a
|
MS IZ small webfinger bug fixes
|
2010-07-15 17:02:36 -07:00 |
|
maxwell
|
9119d8af93
|
MS IZ small webfinger bug fixes
|
2010-07-15 16:59:22 -07:00 |
|
maxwell
|
5dea277294
|
MS IZ small webfinger bug fixes
|
2010-07-15 16:56:54 -07:00 |
|
maxwell
|
d393458ae8
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-15 16:55:09 -07:00 |
|
maxwell
|
cc712196a6
|
MS IZ small webfinger bug fixes
|
2010-07-15 16:54:46 -07:00 |
|
Raphael
|
7fb7c519cc
|
Adding active to friend view
|
2010-07-15 16:30:56 -07:00 |
|
Raphael
|
e5a5b5a828
|
Fixing zombies
|
2010-07-15 16:20:38 -07:00 |
|
Raphael
|
3ac4f52920
|
fixing db reset
|
2010-07-15 16:16:15 -07:00 |
|
Raphael
|
613e2da3e6
|
Made logging clearer, fixing zombiefriends
|
2010-07-15 16:11:19 -07:00 |
|
Raphael
|
63f27d8a9e
|
Made email relative to subdomain
|
2010-07-15 16:09:15 -07:00 |
|
Raphael
|
82e3f6a14e
|
debugging zombiefriends
|
2010-07-15 16:06:10 -07:00 |
|
Raphael
|
417df7f874
|
debugging zombiefriends
|
2010-07-15 16:03:48 -07:00 |
|
Raphael
|
788f668db0
|
updated bson_ext
|
2010-07-15 15:49:28 -07:00 |
|
Raphael
|
89cf2db10e
|
fixing db seed
|
2010-07-15 15:47:27 -07:00 |
|
Raphael
|
57d9bd1543
|
Added friending route to dashboards
|
2010-07-15 15:38:49 -07:00 |
|
Raphael
|
c2081e6fdf
|
Pull from master
|
2010-07-15 15:10:03 -07:00 |
|
Raphael
|
d7e07dfda8
|
comment specs fixed, comments now signed by post poster
|
2010-07-15 14:41:39 -07:00 |
|
Raphael
|
64c81f0551
|
merge in master, only friend tom
|
2010-07-15 14:18:22 -07:00 |
|
Raphael
|
862787ea93
|
RS, DG; person destruction no longer deletes comments
|
2010-07-15 14:12:01 -07:00 |
|
Raphael
|
50addb8309
|
Took password out of db:seed:backer
|
2010-07-15 13:53:43 -07:00 |
|
Raphael
|
2d5d3a2f2d
|
commit more often
|
2010-07-15 13:29:21 -07:00 |
|
Raphael
|
fd18ac6c4b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
|
2010-07-15 13:06:46 -07:00 |
|
maxwell
|
720550189d
|
MS more cleanup
|
2010-07-15 10:59:36 -07:00 |
|
maxwell
|
1412265150
|
MS IZ now we can unsubscribe...probally
|
2010-07-15 10:43:18 -07:00 |
|
maxwell
|
99446d82c4
|
MS IZ more fixes
|
2010-07-15 10:30:51 -07:00 |
|
maxwell
|
f97218c005
|
MS IZ cleanup of pubsub stuff
|
2010-07-15 10:24:41 -07:00 |
|
maxwell
|
892eec1959
|
MS fixed the websocket bug pushing out all updates to single clients. we should get selenium so we can actually test it :(
|
2010-07-15 09:32:13 -07:00 |
|
Raphael
|
4bd50d47b7
|
DB seeds now use friending, presidents are not friends.
|
2010-07-14 12:41:22 -07:00 |
|
Raphael
|
c82f41e740
|
Merging in master
|
2010-07-14 12:16:24 -07:00 |
|
Raphael
|
b780ff0610
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-14 12:06:54 -07:00 |
|
Raphael
|
a15ee6feab
|
Changing db seed to friending
|
2010-07-14 12:06:39 -07:00 |
|
Raphael
|
d7d1af8058
|
always import the key
|
2010-07-14 11:55:15 -07:00 |
|
Raphael
|
2e0e904cdb
|
Sending key in friend request response
|
2010-07-14 11:47:36 -07:00 |
|
Raphael
|
0f7006dfea
|
Profiles do not need to be deleted
|
2010-07-14 11:32:33 -07:00 |
|
Raphael
|
a7ba1d8920
|
Assign key before validation
|
2010-07-14 11:25:34 -07:00 |
|
Raphael
|
335f202e2b
|
RS, IZ; Profiles are now embedded
|
2010-07-14 11:22:44 -07:00 |
|
maxwell
|
1b63fbbec7
|
DG MS added pubsub gem, added hub to message queue
|
2010-07-14 11:01:28 -07:00 |
|
Raphael
|
f680c4b71e
|
RS, IZ; Signature Verification now stubbed out outside of encryption specs, green
|
2010-07-14 11:01:21 -07:00 |
|