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 |
|
maxwell
|
ba984009f8
|
added chrome frame
|
2010-07-01 16:38:32 -07:00 |
|
Raphael
|
63b3d0186a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 21:19:32 -07:00 |
|
danielvincent
|
f759f5d1b7
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 18:04:14 -07:00 |
|
danielvincent
|
12bbdb38a7
|
DG IZ deploying with correct names
|
2010-06-30 18:03:25 -07:00 |
|
maxwell
|
9631977597
|
RS MS comments propagate, and show up IN REAL TIME
|
2010-06-30 17:29:32 -07:00 |
|
Raphael
|
877f321d51
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 16:26:25 -07:00 |
|
maxwell
|
40697167da
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 16:24:57 -07:00 |
|
maxwell
|
e696ef7023
|
comments now go go go and are tested RS MS
|
2010-06-30 16:24:44 -07:00 |
|
danielvincent
|
65321ed096
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 16:00:40 -07:00 |
|
danielvincent
|
fbd1195113
|
DG IZ; rake task for backer, can now pass in arguments [backer_num, password]
|
2010-06-30 16:00:29 -07:00 |
|
Raphael
|
5f927abffe
|
RS, slight clarification in common
|
2010-06-30 15:27:35 -07:00 |
|
Raphael
|
aa083735fa
|
Moved url mapping to push_to
|
2010-06-30 15:18:42 -07:00 |
|
maxwell
|
940b967bbb
|
fuck
|
2010-06-30 14:29:52 -07:00 |
|
maxwell
|
4077e4248e
|
pushing for cap deploy
|
2010-06-30 14:23:40 -07:00 |
|
maxwell
|
fcdba64828
|
pushing to test comment passing
|
2010-06-30 13:54:09 -07:00 |
|
danielvincent
|
585906d3d4
|
DG IZ; db rake tasks ouput text; delete is now purge
|
2010-06-30 13:47:26 -07:00 |
|
danielvincent
|
6d84eb2b6f
|
DG IZ; added rake db:reset, which aliases a delete and seed to the db
|
2010-06-30 13:36:15 -07:00 |
|
danielvincent
|
bb97aa9202
|
DG IZ; rake db:seed, rake db:delete
|
2010-06-30 11:57:11 -07:00 |
|
maxwell
|
638b71ae28
|
Added a spec to person, cleaned up some putses
|
2010-06-29 17:45:13 -07:00 |
|
maxwell
|
1b2745e788
|
added socket renderer spec and slight refactor
|
2010-06-29 11:50:15 -07:00 |
|
maxwell
|
f4a8671854
|
fixed the remote socket updating bug? we will see
|
2010-06-28 16:15:30 -07:00 |
|
maxwell
|
d9a6bb7ba2
|
merged my socket changes
|
2010-06-28 14:52:43 -07:00 |
|
maxwell
|
5cf2e3c3ea
|
commiting so i can pull
|
2010-06-28 14:47:23 -07:00 |
|
ilya
|
25198a7e86
|
IZ, RS; Moved XML parser to lib
|
2010-06-28 15:56:46 -04:00 |
|
Maxwell Salzberg
|
2bbfcb0bb1
|
putting debug in for master so I can check deployed servers out
|
2010-06-26 14:16:19 -07:00 |
|