maxwell
|
09b79293f0
|
merged master
|
2010-07-08 10:19:58 -07:00 |
|
maxwell
|
d04093f456
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-08 10:18:03 -07:00 |
|
maxwell
|
6293f9f585
|
socket is now a controller
|
2010-07-08 10:17:41 -07:00 |
|
maxwell
|
29eb883f76
|
socket is now a controller
|
2010-07-08 10:14:17 -07:00 |
|
ilya
|
3ff32e4905
|
DG IZ; removed views and controller associated with friend object
|
2010-07-08 12:38:14 -04: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 |
|
maxwell
|
947f1a60e7
|
RS MS added url for for the socket controller
|
2010-07-07 18:59:32 -07:00 |
|
danielvincent
|
69e1d94bfe
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-07 18:11:10 -07:00 |
|
danielvincent
|
a33acd134e
|
DG IZ; fixed person requesting (friend requests).
|
2010-07-07 18:10:47 -07:00 |
|
danielvincent
|
417fed3841
|
DG IZ; fixed person requesting (friend requests).
|
2010-07-07 17:47:09 -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
|
bf0afeede0
|
i really have no clue why this works nwow
|
2010-07-07 16:41:42 -07:00 |
|
Raphael
|
2db3366ef4
|
RS, MS; test FILES are now in EM run blocks, tests are in next_ticks
|
2010-07-07 16:04:31 -07:00 |
|
maxwell
|
cc603a7943
|
autotest for rafi
|
2010-07-07 15:27:44 -07:00 |
|
maxwell
|
5350b40e3c
|
broken autotest for rafi
|
2010-07-07 15:27:22 -07:00 |
|
danielvincent
|
d705d39f70
|
DG IZ; added for action to friend request
|
2010-07-07 13:44:06 -07:00 |
|
Raphael
|
4b6e29a4d2
|
Sorry rspec
|
2010-07-07 10:55:32 -07:00 |
|
Raphael
|
86c31698f6
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-07 10:53:40 -07:00 |
|
Raphael
|
43dcf0bada
|
Breaking specs to test CIJOE
|
2010-07-07 10:53:22 -07:00 |
|
ilya
|
9c779d64fd
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-06 23:43:18 -04:00 |
|
ilya
|
79c0e960ad
|
DG IZ; friend now has an active flag
|
2010-07-06 23:43:01 -04:00 |
|
Raphael
|
ae968bce90
|
rechmoded build
|
2010-07-06 19:24:50 -07:00 |
|
Raphael
|
5e78163df3
|
added bundler to gemfile
|
2010-07-06 19:23:34 -07:00 |
|
Diaspora
|
f8e20eca16
|
|
2010-07-06 19:18:26 -07:00 |
|
Diaspora
|
f7ce67b768
|
|
2010-07-06 19:17:35 -07:00 |
|
root
|
825a447563
|
Merge commit '61ee237'
Conflicts:
script/build
|
2010-07-07 02:13:32 +00:00 |
|
root
|
73445c0780
|
RS MJS Try to change the working directory in a crazy way
|
2010-07-07 02:11:27 +00:00 |
|
root
|
8f9edaf7ca
|
tweaking integrity script
|
2010-07-07 01:44:26 +00:00 |
|
root
|
ddf3a07f76
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-07 01:40:23 +00:00 |
|
root
|
9cbc963539
|
RS, MJS build script for integrity
|
2010-07-07 01:40:11 +00: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
|
f71b5b51d1
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-06 19:33:00 -04:00 |
|
ilya
|
14e5b23eb5
|
trying deploying
|
2010-07-06 19:32:44 -04:00 |
|
Raphael
|
bb325cbf6b
|
cleaned up a little
|
2010-07-06 12:41:28 -07:00 |
|
Raphael
|
d46e82d004
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-06 12:38:46 -07:00 |
|
Raphael
|
7bdf52e173
|
comment numbers update uncleanly
|
2010-07-06 12:38:24 -07:00 |
|
ilya
|
65713a733e
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-06 15:11:36 -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 |
|
Raphael
|
76c9877316
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-06 11:50:20 -07:00 |
|
Raphael
|
d00798e982
|
added preventdefault to publisher
|
2010-07-06 11:49:54 -07:00 |
|
ilya
|
3974b01b29
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-06 14:49:08 -04:00 |
|
ilya
|
9cddf26a53
|
DG IZ fixed views for friend request
|
2010-07-06 14:48:44 -04:00 |
|
Raphael
|
e971c71451
|
refactor websocket receive insert javascript
|
2010-07-06 11:40:19 -07: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 |
|
ilya
|
027d953cf4
|
DG IZ added the FriendRequest model.
|
2010-07-05 23:28:51 -04:00 |
|