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
|
f97218c005
|
MS IZ cleanup of pubsub stuff
|
2010-07-15 10:24:41 -07:00 |
|
Raphael
|
c82f41e740
|
Merging in master
|
2010-07-14 12:16:24 -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
|
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 |
|
ilya
|
add9961ca4
|
Now signing only xml accessors other than person
|
2010-07-13 11:41:57 -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 |
|
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 |
|
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
|
18760f13f8
|
push changes
|
2010-07-12 11:25:53 -07:00 |
|
ilya
|
3dfb55ee85
|
IZ MS pulled in master: this is now the authoritative branch; waiting for dan to fix gpg so we can move on
|
2010-07-11 00:04:08 -04:00 |
|
ilya
|
72e7514535
|
MS fixed your key fingerprint bug. ROML sux. all things which are marshalled as a class need to be after the other fields, because those fields were ignored. also, ids were no long being marshalled correctlyw
|
2010-07-10 23:30:24 -04:00 |
|
maxwell
|
902a8cb349
|
MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change
|
2010-07-10 10:34:46 -07:00 |
|
ilya
|
1bed575b90
|
Added the Key Fingerprint validation to the person model(defaults to empty string)
|
2010-07-10 06:09:53 -04:00 |
|
ilya
|
7eba033c0d
|
Revert "RS IZ Friday night, key_fingerprint serialization weirdness"
This reverts commit c6e16835df9c5d46d0ec5e0f1860da1ef4c0986a.
|
2010-07-10 05:29:57 -04:00 |
|
ilya
|
8c75761ba1
|
RS IZ Friday night, key_fingerprint serialization weirdness
|
2010-07-10 02:25:48 -04:00 |
|
maxwell
|
d37461a432
|
ms dg post deletions now come thru the socket again
|
2010-07-09 19:27:39 -07:00 |
|
maxwell
|
23057869e1
|
DG MS debugging friend request
|
2010-07-09 18:41:39 -07:00 |
|
maxwell
|
8147602570
|
DG MS friends now are delete
|
2010-07-09 18:10:11 -07:00 |
|
ilya
|
eec66395c1
|
Removed key password
|
2010-07-09 20:22:01 -04:00 |
|
ilya
|
91e96973ef
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
|
2010-07-09 19:17:14 -04:00 |
|
ilya
|
2f5ec3d7c4
|
added a bunch of public keys to test ring
|
2010-07-09 19:17:07 -04:00 |
|
maxwell
|
f5fd0b011a
|
DG MS; upon friend deletion, all connected posts and comments are purged
|
2010-07-09 16:08:00 -07:00 |
|
ilya
|
7eec041846
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
|
2010-07-09 18:15:22 -04:00 |
|
ilya
|
8c45dd4702
|
testing signing
|
2010-07-09 18:15:17 -04:00 |
|
ilya
|
b802db9194
|
writing signing
|
2010-07-09 17:41:01 -04:00 |
|
maxwell
|
cf352b6f8d
|
DG MS; cannot friend request an existing friend.
|
2010-07-09 14:35:42 -07:00 |
|
maxwell
|
b052ddeb84
|
DG MS; database seed scripts now ensure all friends are set to true
|
2010-07-09 14:13:39 -07:00 |
|
maxwell
|
48adc9ebc1
|
DG MS; person object now properly stored with request object save
|
2010-07-09 14:07:35 -07:00 |
|
ilya
|
cfaf13ac7d
|
Use pregenerated keys
|
2010-07-09 13:45:00 -04:00 |
|
maxwell
|
c7e1bc3a46
|
DG MS debugging friend requests
|
2010-07-09 10:18:29 -07:00 |
|
maxwell
|
c2c64d9938
|
MS DG more friend request tests pass
|
2010-07-08 23:14:54 -07:00 |
|
maxwell
|
408b58cbbf
|
Merge branch 'safe-without-gpg'
|
2010-07-08 21:45:27 -07:00 |
|
maxwell
|
6cc9deaa65
|
merging with head
|
2010-07-08 21:44:14 -07:00 |
|
maxwell
|
583d3d0c82
|
DG MS friending now tests out
|
2010-07-08 21:34:38 -07:00 |
|
maxwell
|
e1834cc887
|
DG MS fixed spec
|
2010-07-08 20:51:12 -07:00 |
|
maxwell
|
06eec9204a
|
DG MS; person request is now request. refactoring as well. user verbiage for request actions
|
2010-07-08 18:28:39 -07:00 |
|
ilya
|
895742824d
|
Sped up specs, fixed env
|
2010-07-08 21:23:08 -04:00 |
|
ilya
|
122bbf0cd2
|
Merging dashboards
|
2010-07-08 20:56:25 -04:00 |
|
ilya
|
a5db2cd231
|
Added keyrings to gitignore, symlinked to shared dir in cap scripts
|
2010-07-08 20:54:20 -04:00 |
|
ilya
|
9e8426ceb4
|
RS, IZ; Users now have keys, keyring now in db folder
|
2010-07-08 19:57:10 -04:00 |
|
maxwell
|
db1811eb61
|
DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket
|
2010-07-08 14:14:03 -07:00 |
|
maxwell
|
1fa2dfd6eb
|
DG MS cleaning up friend request
|
2010-07-08 12:05:06 -07:00 |
|
maxwell
|
da4e148fed
|
DG MS; fixing friend request
|
2010-07-08 11:44:18 -07:00 |
|
maxwell
|
1885b5b6b9
|
MS DG fixed friend request
|
2010-07-08 11:30:58 -07:00 |
|
maxwell
|
09b79293f0
|
merged master
|
2010-07-08 10:19:58 -07:00 |
|
maxwell
|
d04093f456
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-08 10:18:03 -07:00 |
|
maxwell
|
58ed75a289
|
MS socket now works in the server, but I can't figure out how to mock this stuff
|
2010-07-07 22:20:15 -07:00 |
|
danielvincent
|
ebfc55ff28
|
DG IZ friend request, has a puts in the receive hook for debugging
|
2010-07-07 21:20:38 -07:00 |
|
maxwell
|
a35892428c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-07 20:09:27 -07:00 |
|
danielvincent
|
a33acd134e
|
DG IZ; fixed person requesting (friend requests).
|
2010-07-07 18:10:47 -07:00 |
|
danielvincent
|
3d105e7c1e
|
DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.
|
2010-07-07 16:53:52 -07:00 |
|
maxwell
|
5350b40e3c
|
broken autotest for rafi
|
2010-07-07 15:27:22 -07:00 |
|
danielvincent
|
d705d39f70
|
DG IZ; added for action to friend request
|
2010-07-07 13:44:06 -07:00 |
|
ilya
|
79c0e960ad
|
DG IZ; friend now has an active flag
|
2010-07-06 23:43:01 -04:00 |
|
ilya
|
d5d4d4ae84
|
DG IZ; friend requests get saved locally, friend object gets transmitted and saved remotely
|
2010-07-06 21:29:49 -04:00 |
|
ilya
|
a23a2691f3
|
DG IZ; starting fresh with requests
|
2010-07-06 20:09:20 -04:00 |
|
ilya
|
14e5b23eb5
|
trying deploying
|
2010-07-06 19:32:44 -04:00 |
|
ilya
|
1a44cf5ab3
|
DG IZ push to wrapped to check before sending off a friend req
|
2010-07-06 15:11:24 -04:00 |
|
ilya
|
0587688d18
|
DG IZ; friend requests pass through the webhook, need to refactor the parser because now the XML does not make sense, no big deal. P.S. WTF is send_to_seed in message_handler
|
2010-07-06 02:15:49 -04:00 |
|
ilya
|
027d953cf4
|
DG IZ added the FriendRequest model.
|
2010-07-05 23:28:51 -04:00 |
|
danielvincent
|
df3fe6c2a9
|
DG IZ RS; deletion now gets sent through the websocket
|
2010-07-02 15:16:28 -07:00 |
|
danielvincent
|
8e6ddb4b2e
|
propagate_delete -> propagate_retraction
|
2010-07-02 14:40:25 -07:00 |
|
Raphael
|
f9856517db
|
Post deletion now deletes comments
|
2010-07-02 14:34:58 -07:00 |
|
danielvincent
|
469599a4a9
|
DG RS IZ; added post deletion propagation
|
2010-07-02 13:08:53 -07:00 |
|
maxwell
|
9631977597
|
RS MS comments propagate, and show up IN REAL TIME
|
2010-06-30 17:29:32 -07:00 |
|
maxwell
|
e696ef7023
|
comments now go go go and are tested RS MS
|
2010-06-30 16:24:44 -07:00 |
|
maxwell
|
4077e4248e
|
pushing for cap deploy
|
2010-06-30 14:23:40 -07:00 |
|
maxwell
|
fcdba64828
|
pushing to test comment passing
|
2010-06-30 13:54:09 -07:00 |
|
Raphael
|
340a57ea6d
|
RS; figured out recursive serialization with ROXML, posts and comments now serialize with their persons
|
2010-06-30 08:06:30 -07:00 |
|
maxwell
|
fcbe8e42a0
|
RS MS slightly less explosive end if you call real name on someone that doesn't have a profile
|
2010-06-29 20:54:53 -07:00 |
|
maxwell
|
448fcf8f89
|
MS RS fixed real name, now profiles are created with a new friend
|
2010-06-29 20:33:55 -07:00 |
|
maxwell
|
638b71ae28
|
Added a spec to person, cleaned up some putses
|
2010-06-29 17:45:13 -07:00 |
|
maxwell
|
77c0bb5c4e
|
urls are now unique, and a user can not add a friend with the exact same url
|
2010-06-29 16:04:15 -07:00 |
|
maxwell
|
19e03c7077
|
person now has a url, and they cant add themselves any longer.... you need to add a url to your old development user, and we need to set it in the field
|
2010-06-29 12:33:00 -07:00 |
|
maxwell
|
46ab63de36
|
added will pagination action.
|
2010-06-28 21:56:58 -07:00 |
|
ilya
|
0fa11806ba
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-28 21:32:18 -04:00 |
|
ilya
|
b5b9c647d7
|
DG IZ Created the profile model & friend view now shows the information
|
2010-06-28 21:32:09 -04:00 |
|
maxwell
|
3dce5f1b34
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-28 16:15:48 -07:00 |
|