Raphael
|
0e77577fbd
|
Websocket now uses redis
|
2010-12-10 11:25:38 -08:00 |
|
danielvincent
|
46793179db
|
people#show displays shows public posts for non-contacts as well
|
2010-12-08 16:53:24 -08:00 |
|
Raphael
|
6aa7648787
|
Put send_contact_request_to back into the app
|
2010-12-06 13:45:12 -08:00 |
|
danielvincent
|
f9e4a744a5
|
put spec helper methods in spec_helper
|
2010-12-03 15:50:17 -08:00 |
|
danielvincent
|
71cae6b89f
|
Move request mail into resque
|
2010-12-03 11:51:04 -08:00 |
|
Raphael
|
2e87bece60
|
Final fixes for person socketing
|
2010-12-02 19:03:15 -08:00 |
|
Raphael
|
2ec5fae2e8
|
Require needed files for resque-worker
|
2010-12-02 16:56:14 -08:00 |
|
Raphael
|
8798f05ff7
|
Revert "Revert redis merge to fix bugs on master"
This reverts commit 30698d674b.
|
2010-12-02 15:33:26 -08:00 |
|
Raphael
|
30698d674b
|
Revert redis merge to fix bugs on master
|
2010-12-02 15:20:27 -08:00 |
|
Raphael
|
db0106f13c
|
Rename EMWebfinger to Webfinger, clean up some related things
|
2010-12-02 12:35:25 -08:00 |
|
maxwell
|
be00a2f1b3
|
webfingering is now syncrounous
|
2010-12-02 12:35:25 -08:00 |
|
danielvincent
|
828635def9
|
Person#real_name -> Person#name
|
2010-11-30 13:01:53 -08:00 |
|
maxwell
|
4ef7c4d6d1
|
make the build pass (we no longer socket photos at all) and also more test fixing around request. we were saving requests to early in the cycle, most likely cruft before it was refactored.
|
2010-11-29 13:39:48 -08:00 |
|
danielvincent
|
c35be73978
|
added pending specs. traced the whole comment thing -- it works, but i couldn't figure out how to make these pending specs pass (re: should_receive)
|
2010-11-28 18:51:27 -05:00 |
|
danielvincent
|
05174436c0
|
comments should only be dispatched out to remote people from owner. for local people on the same pod, the comment has already been verified by the comment's authority (post owner).
|
2010-11-28 18:51:27 -05:00 |
|
danielvincent
|
f59c6e2427
|
refactored comments to work like status_messages in the controller. weird stuff was happening when using EM::next_tick; holding off on that for now.
|
2010-11-27 23:06:34 -05:00 |
|
Raphael
|
1ec1ada70b
|
Take out giant log line
|
2010-11-27 21:33:12 -05:00 |
|
maxwell
|
c65c62906c
|
pushing so dan can look at how to stub EM:next_tick correctly
|
2010-11-27 16:20:46 -05:00 |
|
maxwell
|
62b4e85b0b
|
DG MS move dispatch post to EM::next_tick in controller so the post response returns to the poster much faster. also fixed a bug in the logs refrencing an object that did not exsist
|
2010-11-27 16:20:46 -05:00 |
|
Raphael
|
7100bc14d1
|
Clean up another couple log lines
|
2010-11-26 21:29:59 -05:00 |
|
Raphael
|
3a24eb900d
|
Refine log lines
|
2010-11-26 13:02:52 -05:00 |
|
Raphael
|
73c7a1d339
|
Fix build, add more logging
|
2010-11-25 11:40:36 -05:00 |
|
Raphael
|
b4297ba858
|
Add logging statement to receive
|
2010-11-25 09:39:36 -05:00 |
|
zhitomirskiyi
|
1519fd46bf
|
Sending a request to someone who requested you autoaccepts the request
|
2010-11-22 12:21:26 -08:00 |
|
maxwell
|
769c0e1055
|
DG MS trying to finish statusmessage refactor
|
2010-11-21 16:13:01 -08:00 |
|
maxwell
|
9b7d2ed0f6
|
DG MS; status messages can now have photos.
|
2010-11-21 16:13:01 -08:00 |
|
Raphael
|
0daffb7fed
|
Add a couple specs, refactor in connecting
|
2010-11-21 14:09:39 -05:00 |
|
Raphael
|
655e92ebdd
|
Add some scopes for Request, take putses out of specs
|
2010-11-18 18:04:29 -08:00 |
|
Raphael
|
5a2b3cd0a7
|
Fix build
|
2010-11-18 16:06:44 -08:00 |
|
zhitomirskiyi
|
0e171e8504
|
added a fixed the pending request query
|
2010-11-18 15:22:14 -08:00 |
|
Raphael
|
4853a55d9b
|
Don't expect raises from user receive
|
2010-11-17 15:35:25 -08:00 |
|
Raphael
|
6c97899d5d
|
Add logging statements, rescue callbacks in em-webfinger
|
2010-11-17 13:55:58 -08:00 |
|
Raphael
|
2d347ec36d
|
Delete an accepted friend request
|
2010-11-16 16:47:06 -08:00 |
|
Raphael
|
7876da8fb8
|
Refactor raises in requesting to validations in request, move to better controller structure
|
2010-11-16 16:18:16 -08:00 |
|
Sarah Mei
|
9fa47c9bfa
|
Fix a failing spec under 1.9 in receive_spec
|
2010-11-15 21:19:21 -08:00 |
|
danielvincent
|
ed50fe7f1f
|
Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes.
|
2010-11-12 20:22:56 -08:00 |
|
danielvincent
|
aa9966ea26
|
removed the word friend everywhere minus translation files
|
2010-11-12 20:22:55 -08:00 |
|
Raphael
|
98fe1d357b
|
accept_friend_request no longer takes ids
|
2010-11-09 14:15:02 -08:00 |
|
Raphael
|
6dd58fe875
|
Specs pass again, invitations moved to Invitation model, refactor possibly complete
|
2010-11-09 14:07:26 -08:00 |
|
Raphael
|
71ab919ad3
|
Remove urls from requests, invitations are broken
|
2010-11-09 14:07:26 -08:00 |
|
zhitomirskiyi
|
7d39f8ae5f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-08 15:36:11 -08:00 |
|
zhitomirskiyi
|
a6dff4f78e
|
removing the posts from the aspect on unfriending
|
2010-11-08 15:35:37 -08:00 |
|
Raphael
|
70af10ee62
|
user#friends is now a many-foreign_key assoc, rather than a many-in
|
2010-11-08 15:19:23 -08:00 |
|
maxwell
|
26e1cfe955
|
MS RS actually fix the photo bug. without breaking the specs
|
2010-11-08 14:26:43 -08:00 |
|
maxwell
|
4d2820e31c
|
MS RS fixed photo show bug
|
2010-11-08 14:05:01 -08:00 |
|
maxwell
|
cc92f61583
|
mailer queue now works
|
2010-11-05 11:58:25 -07:00 |
|
zhitomirskiyi
|
d793bdc3c7
|
inital commit for mailqueue
|
2010-11-05 11:46:43 -07:00 |
|
danielvincent
|
f4dba54ff3
|
posting to a person with a user on the same pod will send internally, skipping the http queue and encryption.
|
2010-11-04 15:33:16 -07:00 |
|
danielvincent
|
d5cc0ed6dc
|
separating object receiving in user#receive
|
2010-11-04 15:33:16 -07:00 |
|
danielvincent
|
82c82b8ccc
|
killed albums
|
2010-11-04 10:17:19 -07:00 |
|
zhitomirskiyi
|
8246882067
|
MS IZ fixed some permissions in photo controller
|
2010-11-03 16:42:33 -07:00 |
|
Raphael
|
03b272db60
|
Requests are no longer tracked by id across servers, DELETED USELESS PUTS IN EM-WEBFINGER SPEC
|
2010-11-03 15:26:58 -07:00 |
|
zhitomirskiyi
|
3578daa14e
|
IZ MS more photo controller specs
|
2010-11-03 12:21:32 -07:00 |
|
zhitomirskiyi
|
c6e9b94f4f
|
IZ MS moved contact_for to querying and added tests
|
2010-11-03 10:59:56 -07:00 |
|
Raphael
|
ae039442c3
|
Websocket now uses cookie to authenticate
|
2010-11-02 17:39:50 -07:00 |
|
maxwell
|
34f190ce75
|
MS IZ added a check for person in webfinger response in receive_salmon method
|
2010-11-02 16:10:17 -07:00 |
|
maxwell
|
3251b8ba2e
|
MS IZ fixed a hole where another user could update another friends post
|
2010-11-02 13:58:27 -07:00 |
|
maxwell
|
c3d0c78bd1
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
lib/diaspora/user/receiving.rb
|
2010-11-02 12:46:08 -07:00 |
|
maxwell
|
19bbf8ce4d
|
IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive
|
2010-11-02 12:38:30 -07:00 |
|
danielvincent
|
a3ce5f1cd7
|
REMOVED IMPORTER
|
2010-11-02 11:17:47 -07:00 |
|
Raphael
|
c031416ca8
|
Merge branch 'master' into HEAD
Conflicts:
lib/diaspora/user/receiving.rb
pkg/ubuntu/dist
|
2010-11-02 10:54:37 -07:00 |
|
maxwell
|
9e1c6174bf
|
IZ MS remove two unused methods from diaspora_parser
|
2010-11-02 10:06:41 -07:00 |
|
maxwell
|
15d6cff837
|
MS IZ everything now uses diaspora handle. this feels so good
|
2010-11-01 18:42:42 -07:00 |
|
maxwell
|
3c8b40c427
|
IZ MS retractions now use diaspora handle
|
2010-11-01 17:11:06 -07:00 |
|
maxwell
|
06445901f8
|
IZ MS retrations for posts now green
|
2010-11-01 17:11:06 -07:00 |
|
maxwell
|
3aab691c78
|
updating requests for me now that person is taken out of requests
|
2010-11-01 14:54:40 -07:00 |
|
maxwell
|
922aa85fb7
|
MS IZ refactor green
|
2010-11-01 14:54:40 -07:00 |
|
danielvincent
|
f6b4be97a3
|
requests are almost there
|
2010-11-01 14:54:40 -07:00 |
|
Derrick Camerino
|
b19cdf2e25
|
fixing N socketing bug
|
2010-10-31 03:15:58 -07:00 |
|
danielvincent
|
5a9bfa7405
|
DG IZ; post senders are now verified by diaspora handles
|
2010-10-29 16:49:59 -07:00 |
|
maxwell
|
f75bd6bc2e
|
whoops, taking out queue stuff untill i finish
|
2010-10-29 13:05:35 -07:00 |
|
maxwell
|
c6fbcd28f7
|
stubbing out the hub publish method
|
2010-10-29 12:09:10 -07:00 |
|
maxwell
|
6d139ab946
|
more tests pass
|
2010-10-29 11:17:39 -07:00 |
|
maxwell
|
1b48572674
|
MS tests are now green
|
2010-10-29 11:16:50 -07:00 |
|
maxwell
|
b8a9025616
|
bad merge in receive
|
2010-10-29 11:16:11 -07:00 |
|
maxwell
|
a5ba14f89c
|
nope that last fix I was too tired. the problem is when someone sends me a request saying it is a response from me
|
2010-10-29 11:16:11 -07:00 |
|
maxwell
|
09c4def70b
|
bug; when someone sends you an unknown request, your server crashes.
|
2010-10-29 11:16:11 -07:00 |
|
maxwell
|
9f314f44d9
|
typo
|
2010-10-29 11:15:14 -07:00 |
|
zhitomirskiyi
|
483960ae98
|
MS IZ more begin rescue
|
2010-10-29 11:15:14 -07:00 |
|
maxwell
|
8fe339b03b
|
EM websocket cleanly merged with master. webfingering is now async
|
2010-10-29 11:05:17 -07:00 |
|
zhitomirskiyi
|
f484eb957f
|
comments now don't imbed the person in the xml
|
2010-10-28 12:13:39 -07:00 |
|
zhitomirskiyi
|
0b2e00b7d6
|
MS IZ the mailer will not be setup unless turned on in the APP_CONFIG
|
2010-10-26 17:46:19 -07:00 |
|
zhitomirskiyi
|
fa484e95e4
|
MS IZ refactored querying
|
2010-10-26 17:05:38 -07:00 |
|
zhitomirskiyi
|
acdbbe4dfc
|
no mail for debugging for now
|
2010-10-26 15:34:02 -07:00 |
|
zhitomirskiyi
|
c0c8c6253c
|
added a logging line for debugging
|
2010-10-26 15:13:16 -07:00 |
|
zhitomirskiyi
|
1024b8a3a7
|
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
Conflicts:
app/controllers/aspects_controller.rb
|
2010-10-26 14:57:52 -07:00 |
|
zhitomirskiyi
|
8acdf21234
|
MS IZ got rid of the requests for me scope in the user
|
2010-10-26 14:49:37 -07:00 |
|
zhitomirskiyi
|
917d1838de
|
MS IZ specs are green
|
2010-10-25 18:55:51 -07:00 |
|
ilya
|
c27f05ed42
|
Initial refactor done, need to stop mapping user.friends to people so much
|
2010-10-22 18:11:04 -07:00 |
|
ilya
|
7083d2aa03
|
Moving friendships into a 'Contact' proxy object.
|
2010-10-22 18:11:04 -07:00 |
|
ilya
|
cbd3487705
|
moved the nailer to the end so setup of mailer doesnt mess with the communitcation
|
2010-10-22 12:00:14 -07:00 |
|
ilya
|
9a217d1fa8
|
MS IZ request acceptance email
|
2010-10-22 11:55:50 -07:00 |
|
maxwell
|
5701c3a873
|
should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now
|
2010-10-22 00:49:01 -07:00 |
|
ilya
|
80cd4761f3
|
started the new invitation email
|
2010-10-22 00:49:01 -07:00 |
|
ilya
|
554adeae69
|
MS IZ; querying through for person not in aspect is tested
|
2010-10-20 16:39:37 -07:00 |
|
ilya
|
8fddb4ecf5
|
MS IZ added test concerning people in multiple aspects
|
2010-10-20 13:19:32 -07:00 |
|
ilya
|
992bd42b55
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
spec/models/aspect_spec.rb
|
2010-10-20 11:30:06 -07:00 |
|
Raphael
|
0758f9245f
|
Clean up specs a little, fix unfriending
|
2010-10-20 10:28:08 -07:00 |
|
Raphael
|
fd8028db33
|
Revert "Revert "Merge remote branch 'upstream/master'""
This reverts commit 1481056af2.
|
2010-10-20 09:51:55 -07:00 |
|
ilya
|
4d1ce410d7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-20 09:39:32 -07:00 |
|