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 |
|
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 |
|
ilya
|
4d1ce410d7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-20 09:39:32 -07: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 |
|
ilya
|
b31b2de6f5
|
MS IZ aspect add and delete for a person
|
2010-10-19 18:25:59 -07:00 |
|
Joseph Method
|
e3e4a6b319
|
Continuation of previous commit
|
2010-10-17 19:07:54 -04:00 |
|
ilya
|
9727b356e1
|
the invitations add requests which are now correctly auto accepted
|
2010-10-15 17:20:04 -07:00 |
|
ilya
|
9b249281a1
|
moved verify comment sig before any saving goes on
|
2010-10-12 16:01:36 -07:00 |
|
ilya
|
d8439c82ee
|
going calling by webfinger only once
|
2010-10-12 12:21:57 -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
|
0f7807222b
|
DG MS; cleaned up method
|
2010-10-11 11:38:08 -07:00 |
|
danielvincent
|
9162a4a168
|
DG MS; 404 show pages for objects that don't exist for given user
|
2010-10-11 11:32:20 -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 |
|
Raphael
|
d72c4de438
|
Revert "CGI unescape incoming salmons"
This reverts commit 6cbe4075f4.
|
2010-10-08 16:08:35 -07:00 |
|
Raphael
|
f09a54b67f
|
Revert "arguments..."
This reverts commit 8049aa20e8.
|
2010-10-08 16:08:25 -07:00 |
|
Raphael
|
8049aa20e8
|
arguments...
|
2010-10-08 16:01:24 -07:00 |
|
Raphael
|
6cbe4075f4
|
CGI unescape incoming salmons
|
2010-10-08 15:59:32 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
Raphael
|
67fc01aa36
|
Send friend_acceptances correctly
|
2010-10-07 09:49:34 -07:00 |
|
ilya
|
0d2d5b65fb
|
removed the logging statements, now servers communicate sucessfully and only re-encrypt the header for people
|
2010-10-03 18:08:18 -07:00 |
|
ilya
|
3eaf4e0ba1
|
a couple of logger lines to help debug on remote
|
2010-10-03 17:33:31 -07:00 |
|
ilya
|
f9cecd9d89
|
specs are green
|
2010-10-02 13:03:11 -07:00 |
|
ilya
|
b6a912dd02
|
slowly getting specs to pass on with the new api
|
2010-09-30 15:17:53 -07:00 |
|
ilya
|
6eede48f9f
|
started to refactor the salmon spec, changed data in to be parsed data
to be more clear
|
2010-09-28 12:39:55 -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
|
cf0df90dae
|
moved the private key into user where it belongs, two failing cucumber tests
|
2010-09-26 22:08:42 -07:00 |
|
Dorian
|
6ffc03a4c9
|
Big clean up: delete trailing whitespace
|
2010-09-26 12:48:40 -04:00 |
|
Stephen Caudill
|
536cea5e44
|
Remove consecutive empty lines
|
2010-09-25 12:06:39 -04:00 |
|
Thomas Krehbiel
|
10e6ff9df8
|
Fix for sending unlimited duplicate friend requests
|
2010-09-22 18:16:10 -04:00 |
|
danielvincent
|
4a3bfea1ba
|
DG MS; cleaned spec
|
2010-09-21 17:43:46 -07:00 |
|
Raphael
|
11d31901e4
|
IZ, RS, Pulled receiving out of user file, refactored receive method to be clearer
|
2010-09-21 13:59:52 -07:00 |
|
danielvincent
|
ca97d792af
|
DG IZ; fixing querying bug in aspect_by_id
|
2010-09-20 18:08:59 -07:00 |
|
danielvincent
|
9c334e24e4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 17:26:35 -07:00 |
|