nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4712 commits 4 branches 0 tags 121 MiB
Commit graph

581 commits

Author SHA1 Message Date
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
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
zhitomirskiyi
71ebc90714 Merge branch 'secure-command-exec' of http://github.com/himanshuc/diaspora into himanshuc-secure-command-exec 2010-10-31 22:53:10 -07:00
Derrick Camerino
b19cdf2e25 fixing N socketing bug 2010-10-31 03:15:58 -07:00
Sarah Mei
07c216f31b Putting the jasmine back in CI - changing selenium to be an external process. 2010-10-30 16:31:36 -07:00
Sarah Mei
2268cd204c Taking jasmine out of CI for now - selenium server isn't reliably starting up during jasmine:ci 2010-10-30 13:52:52 -07:00
Sarah Mei
08a70e4980 Moved default rake task to default.rake. Now runs cucumber, rspec, and jasmine. 2010-10-30 11:51:54 -07:00
Sarah Mei
d819c98718 can haz working jasmine 2010-10-29 22:21:08 -07:00
Himanshu Chhetri
4db521657d Use FileUtils for all file operations. Also uses Kernel.system to execute shell commands in a secure fashion. 2010-10-29 20:31:45 -07:00
danielvincent
5a9bfa7405 DG IZ; post senders are now verified by diaspora handles 2010-10-29 16:49:59 -07:00
maxwell
15bd24a64f Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/lib/message_handler_spec.rb
	spec/spec_helper.rb
 2010-10-29 16:23:33 -07:00
maxwell
c1c045a4cd mocking 2010-10-29 16:21:39 -07:00
Raphael
5b78a31d29 make_user now makes a user from fixtures 2010-10-29 15:53:21 -07:00
maxwell
7e7c4c3431 refactored message handler spec 2010-10-29 14:26:11 -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
a5eb4bf1a7 Merge branch 'emw-merge' 2010-10-29 11:38:47 -07:00
maxwell
39f66cc5d9 tests are green 2010-10-29 11:19:07 -07:00
maxwell
7c32649df4 rebasing master 2010-10-29 11:18:20 -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
d1de921d46 longer timeout 2010-10-29 11:15:14 -07:00
zhitomirskiyi
483960ae98 MS IZ more begin rescue 2010-10-29 11:15:14 -07:00
maxwell
68a44af856 making a few more cleanup and tests 2010-10-29 11:13:08 -07:00