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

333 commits

Author SHA1 Message Date
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
b33aa9a0fb retracting on a non existant post does not raise a permissions error. 2010-11-04 12:43:26 -07:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
zhitomirskiyi
2da1f860cd validate user ownership on status message destroy 2010-11-03 18:04:10 -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
0ac4c5b04f IZ MS refactored invites to use user.build 2010-11-03 13:16:45 -07:00
zhitomirskiyi
c6e9b94f4f IZ MS moved contact_for to querying and added tests 2010-11-03 10:59:56 -07:00
Raphael
1c67211ebc Move post dispatching to dispatch_post 2010-11-02 19:16:02 -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
Raphael
0b8425cbde user.aspect is gone 2010-11-02 11:02:08 -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
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
danielvincent
f6b4be97a3 requests are almost there 2010-11-01 14:54:40 -07:00
danielvincent
b08c4fb84e removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts) 2010-10-31 12:34:26 -07:00
Derrick Camerino
b19cdf2e25 fixing N socketing bug 2010-10-31 03:15:58 -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
99eb25762d Moving to make_user, a few specs broken 2010-10-29 15:53:21 -07:00
maxwell
39f66cc5d9 tests are green 2010-10-29 11:19:07 -07:00
maxwell
1b48572674 MS tests are now green 2010-10-29 11:16:50 -07:00
zhitomirskiyi
f5d54ff6f8 another silly malicious friend spec 2010-10-28 17:02:55 -07:00
zhitomirskiyi
f484eb957f comments now don't imbed the person in the xml 2010-10-28 12:13:39 -07:00
zhitomirskiyi
63c740fce7 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 2010-10-27 09:53:50 -07:00
Sarah Mei
0c8de9460c Fix for 1.9 (no spaces between method name and parens) 2010-10-27 03:21:17 -07:00
zhitomirskiyi
fa484e95e4 MS IZ refactored querying 2010-10-26 17:05:38 -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
e776389d19 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 2010-10-26 11:19:50 -07:00
danielvincent
060d8f9c7b DG MS; fixed some bugs with posting publicly. 2010-10-25 19:24:48 -07:00
danielvincent
287d633c44 user#post now handles posting to services. 2010-10-25 17:41:59 -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
d1a2ebd236 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-22 11:56:04 -07:00
ilya
9a217d1fa8 MS IZ request acceptance email 2010-10-22 11:55:50 -07:00
Raphael
b404346c40 Stop stubbing signature verification unless it's necessary 2010-10-22 11:01:58 -07:00
Sarah Mei
ffa467b795 more stubbing! yay? 2010-10-22 06:38:46 -07:00
maxwell
6620f33ae2 fixing spec with a mock on mailer 2010-10-22 01:07:57 -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
Sarah Mei
e414b1c553 Fix some comment specs (still one failing). Remove warning from receive spec. 2010-10-21 06:45:15 -07:00
Raphael
e1cdcc68c8 Cut 10 seconds off of visible_posts_spec 2010-10-20 17:48:16 -07:00
Raphael
f9919d1cce Not calling friend_users until it is needed takes a couple seconds off 2010-10-20 17:43:13 -07:00
ilya
554adeae69 MS IZ; querying through for person not in aspect is tested 2010-10-20 16:39:37 -07:00
ilya
02c0bf3c43 fixed the seed script 2010-10-20 14:52:17 -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
4986de2c33 Put reloads back in 2010-10-20 10:35:16 -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
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 2010-10-20 14:59:55 +02:00
maxwell
e7f764ffeb attack vector where you take posts from valid (unknown) diaspora people is now fixed 2010-10-20 00:42:33 -07:00
Raphael
d98ac70155 Clean up some repetition in specs 2010-10-19 23:29:59 -07:00
Raphael
197bd8eb49 make user/receive spec less repetitive 2010-10-19 23:29:59 -07:00
Raphael
74ec629b01 user_friending_spec passes again 2010-10-19 23:29:59 -07:00
ilya
b31b2de6f5 MS IZ aspect add and delete for a person 2010-10-19 18:25:59 -07:00
ilya
4e9e716783 another attack vector spec 2010-10-19 15:42:40 -07:00
ilya
d642928268 invite sends friend request if already friends, and raises if already friends 2010-10-18 16:27:02 -07:00
ilya
a8bf082e35 The invitation now has an optional personal message 2010-10-18 14:35:41 -07:00
Raphael
f90d38bb9c Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge 2010-10-18 12:00:20 -07:00
ilya
4fbe933158 removed pending 2010-10-18 10:57:22 -07:00
ilya
17bd9710dc invitation tests we're evaluating before stubbing 2010-10-18 10:38:59 -07:00
Joseph Method
e3e4a6b319 Continuation of previous commit 2010-10-17 19:07:54 -04:00
maxwell
4d3da589df make the invite test pending until it doesnt take 300 seconds to run 2010-10-16 11:30:14 -07:00
ilya
6a4b21753e removed the random duplicated line 2010-10-15 17:28:11 -07:00
ilya
9727b356e1 the invitations add requests which are now correctly auto accepted 2010-10-15 17:20:04 -07:00
ilya
4a7c4e0848 requests are made on invite but perhaps they should be made on signup so that we have a person 2010-10-14 18:12:18 -07:00
Sarah Mei
007b06c8ea Stub ::Devise.mailer for great justice. And/or fewer strange arity errors. 2010-10-14 00:26:07 -07:00
ilya
d0c6f12ea8 added another attack vector spec 2010-10-13 18:43:22 -07:00
ilya
36b9f66f60 the invited user keeps track of who invited them, limit on invites, 
removed the invites controller test
 2010-10-13 16:52:33 -07:00
ilya
3b8998ab71 Invitations contains the inviters 2010-10-13 13:29:45 -07:00
Sarah Mei
56c6688c81 Take out reloads so specs run on 1.9.2 2010-10-12 20:54:00 -07:00
ilya
a068ee532d almost all green 2010-10-12 11:17:29 -07:00
ilya
a955dd308e user_friending_spec green, did a slight refactor need more 2010-10-12 10:25:43 -07:00
ilya
ee2d134cb0 receiving spec is green 2010-10-11 19:20:00 -07:00
ilya
03df0ff716 parser spec is green 2010-10-11 18:22:19 -07:00
danielvincent
9bfb213465 Merge branch 'invites' of github.com:diaspora/diaspora into invites 2010-10-11 11:52:57 -07:00
Sarah Mei
2a24de2ba7 Changing spec to pending because it hasn't been implemented yet 2010-10-10 13:29:03 -07:00
ilya
3887712115 slight refactor of receiving spec, wrote a spec that exposed malicious friend attack 
vector
 2010-10-09 21:34:53 -07:00
ilya
ef3e627bed the users are now made with people 2010-10-08 15:40:42 -07:00
Raphael
6064b2e022 Add a spec, move another to posting 2010-10-08 14:37:22 -07:00
Sarah Mei
ce9aa3600d Refactor user friending spec 2010-10-08 01:42:48 -06:00
Sarah Mei
511cd8fa1c Clean up reloading in user friending spec. 2010-10-08 01:23:33 -06:00
Raphael
3632143959 Take out pending on spec that exposes issue 150 2010-10-07 17:54:26 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
ilya
7b690f5dcb slight publics controller spec refactor 2010-10-02 13:20:23 -07:00
ilya
7dcde292e1 user posting spec is now green, now stubbing on the apropriate method 2010-10-02 12:34:16 -07:00
ilya
b6a912dd02 slowly getting specs to pass on with the new api 2010-09-30 15:17:53 -07:00
ilya
7852c346f2 mode the visible posts api more general and moved to it on the public controller 2010-09-27 18:31:37 -07:00
ilya
6e407572c4 removed unused repost method, going through the warden object 2010-09-27 17:27:49 -07:00
Sarah Mei
5d1afe21be Refactor user specs to speed up spec runs. 2010-09-26 13:08:30 -07:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
Stephen Caudill
821643deb9 Use the new style of spec_helper require 2010-09-25 11:27:59 -04:00
danielvincent
e9d16cc09b DG IZ; cleanup 2010-09-22 15:48:50 -07:00
danielvincent
6dd7911c8c DG IZ; update_or_repost 2010-09-22 10:52:29 -07:00
danielvincent
4a3bfea1ba DG MS; cleaned spec 2010-09-21 17:43:46 -07:00
danielvincent
107c05ef6f DG MS; validate_aspect_permissions broken out of post method 2010-09-21 16:35:18 -07:00
danielvincent
44db21ffd4 DG MS; cleaned up spec 2010-09-21 15:41:29 -07:00
Raphael
8dd11c0c95 Add a couple specs to friending 2010-09-20 16:41:03 -07:00
danielvincent
5bb4ee5d36 DG IZ; posting now ensures aspect ownership. 2010-09-20 15:15:37 -07:00
danielvincent
af9cda52af DG IZ; always query through the current_user in the controllers. 2010-09-20 13:18:11 -07:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
b2b60af8aa Albums_by_aspect now takes :all 2010-09-13 17:32:29 -07:00
Daniel Vincent Grippi
1b92bcd17c Add albums_by_aspect method to user 2010-09-13 17:26:24 -07:00
Daniel Vincent Grippi
40ecf176e8 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:26:15 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
b05d106aed Remove user_refs from Person, put pendings in the broken photo specs 2010-09-13 12:16:43 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Raphael
a44d40168a Encryption removed from everything other than comments, most irrelevant specs removed 2010-09-10 16:04:09 -07:00
Raphael
aa1f3c6438 Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file 2010-09-10 10:31:23 -07:00
Raphael
86d9a41d25 send_friend_request_to now takes a person and group, rather than a receive url and a group id 2010-09-09 16:06:42 -07:00
Raphael
240dda4eab Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished 2010-09-09 12:21:36 -07:00
Raphael
4fd0853e71 Moving to salmon 2010-09-08 18:29:39 -07:00
Raphael
831609ad15 Make a stranger that you receive a comment from visible 2010-08-27 10:19:10 -07:00
Raphael
2dd2f38442 Attempting to make comments from unknown users save 2010-08-26 19:15:22 -07:00
Raphael
3ed191e972 MS IZ testing on remote 2010-08-26 16:27:01 -07:00
Raphael
94bb754c34 Changed parseing person from xml a little, using it for comments. 2010-08-26 15:06:39 -07:00
Raphael
a29a1bec3e Add some logging to comments 2010-08-26 11:07:26 -07:00
Raphael
abafa03e92 Spec for posting to no group 2010-08-24 15:48:51 -07:00
Raphael
72c41a5ff8 User post now requires a :to field 2010-08-24 15:42:24 -07:00
Raphael
d1c540439e Moved friending out to a lib file, specs all pass 2010-08-24 12:13:10 -07:00
Raphael
10aef7a0a3 Begin rescue on publics controller to make the post for nonexistent user error more readable 2010-08-18 11:46:28 -07:00
Raphael
539316a235 Removing posts relation from person 2010-08-17 23:50:07 -07:00
Raphael
cb152ea3c3 Shortened user receive, moderated groups.first in the socketing 2010-08-17 22:34:01 -07:00
Raphael
55d84b3288 Broke up user spec, put user update back in routes 2010-08-17 22:03:45 -07:00