maxwell
|
41b918e6e2
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 10:25:37 -07:00 |
|
maxwell
|
45fb44ef36
|
MS IZ added trailing slash for the hub notification
|
2010-07-16 10:25:24 -07:00 |
|
Raphael
|
4178a78b23
|
Logger in receive friend request
|
2010-07-16 10:18:45 -07:00 |
|
Raphael
|
89cf2db10e
|
fixing db seed
|
2010-07-15 15:47:27 -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
|
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
|
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
|
0f7006dfea
|
Profiles do not need to be deleted
|
2010-07-14 11:32:33 -07:00 |
|
maxwell
|
1b63fbbec7
|
DG MS added pubsub gem, added hub to message queue
|
2010-07-14 11:01:28 -07:00 |
|
maxwell
|
0bcbd5b16c
|
DG MS; diaspora xml generate model genereates a valid atom feed for status messages
|
2010-07-13 12:09:06 -07:00 |
|
danielvincent
|
ed8ed9be9e
|
DG MS; started Diaspora::XML for ostatus compliance
|
2010-07-12 20:15:12 -07:00 |
|
maxwell
|
902a8cb349
|
MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change
|
2010-07-10 10:34:46 -07:00 |
|
maxwell
|
a02a833625
|
updated rails for kicks, run bundle install, and run gem install bundler --pre rspec-rails --pre too
|
2010-07-10 00:32:58 -07:00 |
|
maxwell
|
8147602570
|
DG MS friends now are delete
|
2010-07-09 18:10:11 -07:00 |
|
maxwell
|
874ea58678
|
new rake spec for dev database (different default user than tom, friends
with all other boxes)
|
2010-07-09 09:59:48 -07:00 |
|
maxwell
|
408b58cbbf
|
Merge branch 'safe-without-gpg'
|
2010-07-08 21:45:27 -07:00 |
|
maxwell
|
6cc9deaa65
|
merging with head
|
2010-07-08 21:44:14 -07:00 |
|
maxwell
|
583d3d0c82
|
DG MS friending now tests out
|
2010-07-08 21:34:38 -07:00 |
|
maxwell
|
e1834cc887
|
DG MS fixed spec
|
2010-07-08 20:51:12 -07:00 |
|
maxwell
|
06eec9204a
|
DG MS; person request is now request. refactoring as well. user verbiage for request actions
|
2010-07-08 18:28:39 -07:00 |
|
ilya
|
122bbf0cd2
|
Merging dashboards
|
2010-07-08 20:56:25 -04:00 |
|
ilya
|
a5db2cd231
|
Added keyrings to gitignore, symlinked to shared dir in cap scripts
|
2010-07-08 20:54:20 -04:00 |
|
maxwell
|
1fa2dfd6eb
|
DG MS cleaning up friend request
|
2010-07-08 12:05:06 -07:00 |
|
maxwell
|
da4e148fed
|
DG MS; fixing friend request
|
2010-07-08 11:44:18 -07:00 |
|
maxwell
|
11d4a9e2c7
|
rolled back some message handler nonsense
|
2010-07-08 11:16:38 -07:00 |
|
ilya
|
6e6763de14
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-08 13:28:17 -04:00 |
|
ilya
|
93c5404cab
|
DG IZ message handler is a singleton'
|
2010-07-08 13:28:02 -04:00 |
|
maxwell
|
d04093f456
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-08 10:18:03 -07:00 |
|
maxwell
|
58ed75a289
|
MS socket now works in the server, but I can't figure out how to mock this stuff
|
2010-07-07 22:20:15 -07:00 |
|
danielvincent
|
ebfc55ff28
|
DG IZ friend request, has a puts in the receive hook for debugging
|
2010-07-07 21:20:38 -07:00 |
|
danielvincent
|
b496ee567a
|
DG IZ; person request now appends url to pass validations when saved from inbound XML
|
2010-07-07 20:24:50 -07:00 |
|
maxwell
|
a35892428c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-07 20:09:27 -07:00 |
|
danielvincent
|
a33acd134e
|
DG IZ; fixed person requesting (friend requests).
|
2010-07-07 18:10:47 -07:00 |
|
danielvincent
|
3d105e7c1e
|
DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.
|
2010-07-07 16:53:52 -07:00 |
|
maxwell
|
5350b40e3c
|
broken autotest for rafi
|
2010-07-07 15:27:22 -07:00 |
|
ilya
|
79c0e960ad
|
DG IZ; friend now has an active flag
|
2010-07-06 23:43:01 -04:00 |
|
ilya
|
d5d4d4ae84
|
DG IZ; friend requests get saved locally, friend object gets transmitted and saved remotely
|
2010-07-06 21:29:49 -04:00 |
|
ilya
|
a23a2691f3
|
DG IZ; starting fresh with requests
|
2010-07-06 20:09:20 -04:00 |
|
ilya
|
14e5b23eb5
|
trying deploying
|
2010-07-06 19:32:44 -04:00 |
|
ilya
|
1a44cf5ab3
|
DG IZ push to wrapped to check before sending off a friend req
|
2010-07-06 15:11:24 -04:00 |
|
ilya
|
e7ac8bec32
|
rake task reset kills all friend requests
|
2010-07-06 14:57:21 -04:00 |
|
ilya
|
0587688d18
|
DG IZ; friend requests pass through the webhook, need to refactor the parser because now the XML does not make sense, no big deal. P.S. WTF is send_to_seed in message_handler
|
2010-07-06 02:15:49 -04:00 |
|
danielvincent
|
df3fe6c2a9
|
DG IZ RS; deletion now gets sent through the websocket
|
2010-07-02 15:16:28 -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 |
|
maxwell
|
8e94fc5b4f
|
added mean message
|
2010-07-01 17:05:14 -07:00 |
|