Raphael
30698d674b
Revert redis merge to fix bugs on master
2010-12-02 15:20:27 -08:00
Raphael
cee5e4c26e
Bring in resque recipes and rake tasks
2010-12-02 12:35:26 -08:00
maxwell
be00a2f1b3
webfingering is now syncrounous
2010-12-02 12:35:25 -08:00
Raphael
e63a29be64
Change v_aspect_ids to prune_aspect_ids
2010-12-01 15:38:55 -08:00
Sarah Mei
9fa47c9bfa
Fix a failing spec under 1.9 in receive_spec
2010-11-15 21:19:21 -08:00
danielvincent
aa9966ea26
removed the word friend everywhere minus translation files
2010-11-12 20:22:55 -08:00
danielvincent
a21af7cac6
friend_users -> connect_users in helper_methods
2010-11-12 20:22:54 -08:00
Raphael
0ce37bbfa8
Remove some extra receives in tests
2010-11-05 14:15:40 -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
82c82b8ccc
killed albums
2010-11-04 10:17:19 -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
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
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
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
zhitomirskiyi
f484eb957f
comments now don't imbed the person in the xml
2010-10-28 12:13:39 -07:00
ilya
7083d2aa03
Moving friendships into a 'Contact' proxy object.
2010-10-22 18:11:04 -07:00
Raphael
b404346c40
Stop stubbing signature verification unless it's necessary
2010-10-22 11:01:58 -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
f9919d1cce
Not calling friend_users until it is needed takes a couple seconds off
2010-10-20 17:43:13 -07:00
Raphael
fd8028db33
Revert "Revert "Merge remote branch 'upstream/master'""
...
This reverts commit 1481056af2 .
2010-10-20 09:51:55 -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
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
ilya
ee2d134cb0
receiving spec is green
2010-10-11 19:20:00 -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
6064b2e022
Add a spec, move another to posting
2010-10-08 14:37:22 -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
b6a912dd02
slowly getting specs to pass on with the new api
2010-09-30 15:17:53 -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
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
4c15b1a01c
added license to every single goddamn file. also, put one in the root dir.
2010-09-13 14:23:50 -07:00
Raphael
44a1f82da9
Rename group to aspect
2010-09-13 10:38:38 -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
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
72c41a5ff8
User post now requires a :to field
2010-08-24 15:42:24 -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