Commit graph

15358 commits

Author SHA1 Message Date
Raphael
64c81f0551 merge in master, only friend tom 2010-07-15 14:18:22 -07:00
Raphael
862787ea93 RS, DG; person destruction no longer deletes comments 2010-07-15 14:12:01 -07:00
Raphael
50addb8309 Took password out of db:seed:backer 2010-07-15 13:53:43 -07:00
Raphael
2d5d3a2f2d commit more often 2010-07-15 13:29:21 -07:00
Raphael
fd18ac6c4b Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption 2010-07-15 13:06:46 -07:00
maxwell
720550189d MS more cleanup 2010-07-15 10:59:36 -07:00
maxwell
1412265150 MS IZ now we can unsubscribe...probally 2010-07-15 10:43:18 -07:00
maxwell
99446d82c4 MS IZ more fixes 2010-07-15 10:30:51 -07:00
maxwell
f97218c005 MS IZ cleanup of pubsub stuff 2010-07-15 10:24:41 -07:00
maxwell
892eec1959 MS fixed the websocket bug pushing out all updates to single clients. we should get selenium so we can actually test it :( 2010-07-15 09:32:13 -07:00
Raphael
4bd50d47b7 DB seeds now use friending, presidents are not friends. 2010-07-14 12:41:22 -07:00
Raphael
c82f41e740 Merging in master 2010-07-14 12:16:24 -07:00
Raphael
b780ff0610 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-14 12:06:54 -07:00
Raphael
a15ee6feab Changing db seed to friending 2010-07-14 12:06:39 -07:00
Raphael
d7d1af8058 always import the key 2010-07-14 11:55:15 -07:00
Raphael
2e0e904cdb Sending key in friend request response 2010-07-14 11:47:36 -07:00
Raphael
0f7006dfea Profiles do not need to be deleted 2010-07-14 11:32:33 -07:00
Raphael
a7ba1d8920 Assign key before validation 2010-07-14 11:25:34 -07:00
Raphael
335f202e2b RS, IZ; Profiles are now embedded 2010-07-14 11:22:44 -07:00
maxwell
1b63fbbec7 DG MS added pubsub gem, added hub to message queue 2010-07-14 11:01:28 -07:00
Raphael
f680c4b71e RS, IZ; Signature Verification now stubbed out outside of encryption specs, green 2010-07-14 11:01:21 -07:00
ilya
4a0bd5fc0c RS IZ; removed validations on marshaling and removed key deletion on person destroyw 2010-07-13 17:36:18 -07:00
ilya
2862925e2d before validations on create 2010-07-13 15:19:39 -07:00
ilya
6614285644 params string now a method 2010-07-13 15:08:14 -07:00
ilya
0df76daab5 assign key 2010-07-13 14:44:30 -07:00
ilya
4a53d29939 assign key 2010-07-13 14:40:10 -07:00
ilya
d4d1aa0fd5 RS IZ validations of signature are now called on craeeton of a post 2010-07-13 14:34:30 -07:00
maxwell
9e93fd072e DG MS; added subscriber model for ostatus interop 2010-07-13 14:32:27 -07:00
ilya
83ea15c97a merging in master 2010-07-13 12:23:09 -07:00
ilya
964ee65b11 rs iz ; the signature of the signable_accessors are now in the xml 2010-07-13 12:21:11 -07:00
maxwell
0bcbd5b16c DG MS; diaspora xml generate model genereates a valid atom feed for status messages 2010-07-13 12:09:06 -07:00
ilya
add9961ca4 Now signing only xml accessors other than person 2010-07-13 11:41:57 -07:00
ilya
8d525f2d4f fixed warzombie 2010-07-13 11:27:05 -07:00
ilya
7952385cdb added newlines to post 2010-07-13 11:24:57 -07:00
ilya
25940cf567 Removed stray puts 2010-07-13 11:12:49 -07:00
ilya
a219801c2d Now using detached signatures 2010-07-13 11:10:04 -07:00
ilya
6d431e9459 signing tests sort of almost done 2010-07-13 11:01:27 -07:00
ilya
b9146cbb41 RS IZ; now signatures work like in real life 2010-07-12 20:42:22 -07:00
danielvincent
ed8ed9be9e DG MS; started Diaspora::XML for ostatus compliance 2010-07-12 20:15:12 -07:00
Raphael
2f265a8483 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-12 18:31:46 -07:00
ilya
406c00aeb6 RS IZ; using detached signatures and verification things 2010-07-12 18:31:20 -07:00
maxwell
f9f7f0fcc7 DG MS; request makes sure http:// and an ending slash is present on a new request link 2010-07-12 12:33:31 -07:00
ilya
bb146820bf IZ RS, new Gemfile, ignoring the random_seed 2010-07-12 11:43:16 -07:00
maxwell
5ba2e61ab8 MS DG moved xml accessor for profile 2010-07-12 11:37:46 -07:00
ilya
174eb7e8f7 Merging in Master 2010-07-12 11:28:39 -07:00
maxwell
324c085a64 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-12 11:26:29 -07:00
maxwell
18760f13f8 push changes 2010-07-12 11:25:53 -07:00
Raphael
cdb2aecc6e Speeding up db reset a little 2010-07-12 10:47:24 -07:00
Raphael
e420b65591 I am bad at syntax 2010-07-12 10:42:27 -07:00
Raphael
2c4cad2b4c Forgot a comma 2010-07-12 10:37:41 -07:00