Raphael
|
30698d674b
|
Revert redis merge to fix bugs on master
|
2010-12-02 15:20:27 -08:00 |
|
danielvincent
|
8cb2a3a79a
|
resque init, config, gemfile
|
2010-12-02 12:35:26 -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 |
|
maxwell
|
9aa093a0a3
|
api compatabile, but ugly
|
2010-12-02 12:35:25 -08:00 |
|
Alec Leamas
|
308c653945
|
Cleaning up db:first_user patch.
Removing duplicated reset task (what happened?). Hate long lines.
Let user.rb handle all error checks. Clean up.
|
2010-12-02 15:24:10 +01:00 |
|
Alec Leamas
|
1a8e0788c2
|
Add rake task db:first_user.
Purges database and adds a user without development dependencies.
Closes http://bugs.joindiaspora.com/issues/548. Note error handling
for User.build...
|
2010-12-02 12:00:44 +01:00 |
|
maxwell
|
ec05c21472
|
profile now knows about three images sizes, even in federation case
|
2010-11-30 13:40:41 -08:00 |
|
danielvincent
|
828635def9
|
Person#real_name -> Person#name
|
2010-11-30 13:01:53 -08:00 |
|
maxwell
|
4c25724573
|
do no return in em-webfinger, causeing weird splunk errors
|
2010-11-30 11:33:19 -08:00 |
|
Raphael
|
e86a5563ed
|
Override request started log line
|
2010-11-29 14:03:29 -08:00 |
|
maxwell
|
bf79d62317
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-29 13:41:38 -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 |
|
Raphael
|
eccc25e20a
|
Add pending specs for log_overrider... hit a wall when I wanted more information than is being passed to ActiveSupport::Notifier
|
2010-11-29 13:14:27 -08:00 |
|
Sarah Mei
|
5c76062932
|
remove warning when running specs
|
2010-11-28 17:15:50 -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 |
|
danielvincent
|
64f7a20ff4
|
fixed specs, took out that nasty raise.
|
2010-11-27 16:20:46 -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
|
7030ed0fed
|
Putting youtube titles back into status messages
|
2010-11-27 11:43:24 -05:00 |
|
Raphael
|
7100bc14d1
|
Clean up another couple log lines
|
2010-11-26 21:29:59 -05:00 |
|
Raphael
|
d81db97054
|
take out request routed
|
2010-11-26 21:15:03 -05:00 |
|
Raphael
|
0fa93706a6
|
Make request completed log line complete
|
2010-11-26 21:15:02 -05:00 |
|
MrZYX
|
ad6d6d5efa
|
lib/em-websocket.rb is now even more translatable
|
2010-11-27 02:43:49 +01:00 |
|
Raphael
|
fb85ffe406
|
Adding specs for log_overrider
|
2010-11-26 18:38:08 -05:00 |
|
Raphael
|
77d46b2d66
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-26 17:09:38 -05:00 |
|
MrZYX
|
d6f95445c5
|
made em-webfinger errors translatable
|
2010-11-26 19:14:07 +01:00 |
|
Raphael
|
3a24eb900d
|
Refine log lines
|
2010-11-26 13:02:52 -05:00 |
|
Raphael
|
1fb58c53fb
|
Monkeypatching to change rails default logging to something more useful
|
2010-11-25 19:37:05 -05:00 |
|
Raphael
|
a061999e30
|
Don't inspect people in logging statements
|
2010-11-25 18:03:34 -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 |
|
Raphael
|
f4f864a4fb
|
Don't be obnoxious in the chrome frame
|
2010-11-24 21:36:34 -05:00 |
|
danielvincent
|
d334ffb3fa
|
batch inviter takes an invite count for new users. default=10
|
2010-11-23 11:58:00 -08: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 |
|
Sarah Mei
|
90193a16f5
|
fix 1.9 build
|
2010-11-19 23:14:08 -08:00 |
|
zhitomirskiyi
|
8524311c51
|
added the photo rake task
|
2010-11-19 16:46:23 -08:00 |
|
zhitomirskiyi
|
152998311f
|
added the comments as well as loading of app config
|
2010-11-19 11:25:13 -08:00 |
|
zhitomirskiyi
|
481204a157
|
mongo cloudfiles backup task
|
2010-11-19 10:57:28 -08:00 |
|
zhitomirskiyi
|
ff5e32d2b8
|
begining of a rake task for mongo backup
|
2010-11-18 18:38:03 -08:00 |
|
Raphael
|
655e92ebdd
|
Add some scopes for Request, take putses out of specs
|
2010-11-18 18:04:29 -08:00 |
|
Raphael
|
78f2f74186
|
Fix photo exporting, I'm not sure how to use
Kernel::system in this case, so using ``
|
2010-11-18 16:41:34 -08:00 |
|
zhitomirskiyi
|
d0d261fdae
|
zero default invites, the rake task starts people with 5 invites
|
2010-11-18 16:23:35 -08:00 |
|
Raphael
|
5a2b3cd0a7
|
Fix build
|
2010-11-18 16:06:44 -08:00 |
|
maxwell
|
c0d10ef174
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-18 15:36:47 -08:00 |
|
maxwell
|
747ab761a0
|
pushing mailer spec for ilya
|
2010-11-18 15:36:30 -08:00 |
|
zhitomirskiyi
|
0e171e8504
|
added a fixed the pending request query
|
2010-11-18 15:22:14 -08:00 |
|
maxwell
|
970d56a007
|
basic batch inviter
|
2010-11-18 15:17:22 -08:00 |
|
maxwell
|
3db8da992a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 20:14:12 -08:00 |
|
maxwell
|
c08a991130
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 20:14:00 -08:00 |
|
Raphael
|
37a694ed1f
|
Added rescues to many of the webfinger methods and made EM-HTTP-Request follow 3 redirects
|
2010-11-17 18:49:03 -08:00 |
|
Raphael
|
cb23ed1136
|
typo
|
2010-11-17 18:49:03 -08:00 |
|
Raphael
|
4f9547b300
|
Adding logging
|
2010-11-17 16:06:16 -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
|
538c6ce4b9
|
Take handle validations out of em-webfinger
|
2010-11-16 16:18:16 -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 |
|
maxwell
|
0343e7a226
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-03 00:10:11 -07:00 |
|
Sarah Mei
|
034d566564
|
CI has decided it wants a proper shell to launch the virtual display. So FINE. It can have one.
|
2010-11-02 21:49:24 -07:00 |
|
maxwell
|
545577a950
|
em-webfinger ssl should work
|
2010-11-02 19:16:08 -07:00 |
|
maxwell
|
8f5052fe61
|
Revert "Revert "making emwebfinger not try ssl first, for now""
This reverts commit 0db30bb221.
|
2010-11-02 18:59:42 -07:00 |
|
maxwell
|
d482334ca2
|
Revert "Revert "IZ MS webfinger now trys ssl first, then http""
This reverts commit 153265aae8.
|
2010-11-02 18:59:18 -07:00 |
|
Raphael
|
ae039442c3
|
Websocket now uses cookie to authenticate
|
2010-11-02 17:39:50 -07:00 |
|
maxwell
|
153265aae8
|
Revert "IZ MS webfinger now trys ssl first, then http"
This reverts commit af3247b62f.
|
2010-11-02 17:37:45 -07:00 |
|
maxwell
|
0db30bb221
|
Revert "making emwebfinger not try ssl first, for now"
This reverts commit cc2766a0ea.
|
2010-11-02 17:36:58 -07:00 |
|
maxwell
|
cc2766a0ea
|
making emwebfinger not try ssl first, for now
|
2010-11-02 17:33:10 -07:00 |
|
maxwell
|
8c89f8d87a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-02 16:42:52 -07:00 |
|
danielvincent
|
da8124f8a7
|
hcard has searchable field, and is taken in to account when building Person from webfinger
|
2010-11-02 16:12:43 -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
|
af3247b62f
|
IZ MS webfinger now trys ssl first, then http
|
2010-11-02 15:49:41 -07:00 |
|
maxwell
|
449a6f3ea0
|
MS IZ removed a refrence to REDFINGER
|
2010-11-02 15:14:40 -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 |
|