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

449 commits

Author SHA1 Message Date
maxwell
d393458ae8 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-15 16:55:09 -07:00
maxwell
cc712196a6 MS IZ small webfinger bug fixes 2010-07-15 16:54:46 -07:00
Raphael
7fb7c519cc Adding active to friend view 2010-07-15 16:30:56 -07:00
Raphael
e5a5b5a828 Fixing zombies 2010-07-15 16:20:38 -07:00
Raphael
613e2da3e6 Made logging clearer, fixing zombiefriends 2010-07-15 16:11:19 -07:00
Raphael
82e3f6a14e debugging zombiefriends 2010-07-15 16:06:10 -07:00
Raphael
417df7f874 debugging zombiefriends 2010-07-15 16:03:48 -07:00
Raphael
57d9bd1543 Added friending route to dashboards 2010-07-15 15:38:49 -07:00
Raphael
d7e07dfda8 comment specs fixed, comments now signed by post poster 2010-07-15 14:41:39 -07:00
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
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
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
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
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
c073fc6137 MS DG friend deletions dont work, but they do send, prob a parser problem 2010-07-09 19:36:02 -07:00
maxwell
d37461a432 ms dg post deletions now come thru the socket again 2010-07-09 19:27:39 -07:00
danielvincent
ce132dd782 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-09 18:54:59 -07:00
danielvincent
7bfdaac691 added unfriend button to person show page 2010-07-09 18:54:48 -07:00
maxwell
601da95c8c Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-09 18:54:05 -07:00
maxwell
29516d829e MS flash now gives message if you have already friended a given person 2010-07-09 18:53:47 -07:00
danielvincent
aa916d0604 moved User.first out of the application view 2010-07-09 18:50: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
maxwell
d21a3baf32 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-09 11:14:11 -07:00
maxwell
b49f198c4f DG MS cleaned up some of the request stuff 2010-07-09 11:14:00 -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
900f1080a2 DG MS; fixed destroy links for status messages, added link for requests on top nav 2010-07-08 14:38:26 -07: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
0c00e6a512 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-08 10:42:55 -07:00
maxwell
89959bdcb8 MS dont make person request remote for now 2010-07-08 10:42:42 -07:00
Raphael
2a90fb2bdc Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-08 10:28:36 -07:00
Raphael
97b1e8dd5d oops 2010-07-08 10:28:23 -07:00
ilya
6e6763de14 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-08 13:28:17 -04:00
ilya
93c5404cab DG IZ message handler is a singleton' 2010-07-08 13:28:02 -04:00
Raphael
4819ce694b removed emspec from gemfile 2010-07-08 10:27:22 -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
6293f9f585 socket is now a controller 2010-07-08 10:17:41 -07:00
ilya
3ff32e4905 DG IZ; removed views and controller associated with friend object 2010-07-08 12:38:14 -04: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
maxwell
947f1a60e7 RS MS added url for for the socket controller 2010-07-07 18:59:32 -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
cc603a7943 autotest for rafi 2010-07-07 15:27:44 -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
f71b5b51d1 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-06 19:33:00 -04:00
ilya
14e5b23eb5 trying deploying 2010-07-06 19:32:44 -04:00
Raphael
bb325cbf6b cleaned up a little 2010-07-06 12:41:28 -07:00
Raphael
d46e82d004 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-06 12:38:46 -07:00
Raphael
7bdf52e173 comment numbers update uncleanly 2010-07-06 12:38:24 -07: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
3974b01b29 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-06 14:49:08 -04:00
ilya
9cddf26a53 DG IZ fixed views for friend request 2010-07-06 14:48:44 -04:00
Raphael
e971c71451 refactor websocket receive insert javascript 2010-07-06 11:40:19 -07: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
20b056586d warming up the page. colors were too cold and non-human before. 2010-07-05 00:02:16 -07:00
danielvincent
0001797850 moved user's name to the right of their picture 2010-07-03 23:39:05 -07:00
danielvincent
85cee4064b Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	public/javascripts/publisher.js
 2010-07-03 22:45:56 -07:00
danielvincent
e709eba243 publisher as a faux nav element. 2010-07-03 22:43:11 -07:00
Raphael
fffd3aebfc Added remote is true to stream partials, no more redirecting 2010-07-02 15:36:07 -07: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
Raphael
737614e04b google analytics for real 2010-07-01 22:20:57 -07:00
Raphael
418635aa72 Added google to session wall layout 2010-07-01 22:13:55 -07:00
danielvincent
1616f5573d DG MS; fixed position of flash message 2010-07-01 19:55:38 -07:00
danielvincent
4f7579a5db DG MS; fixed delete button bug on stream 2010-07-01 19:49:56 -07:00
danielvincent
88f0244353 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 17:22:30 -07:00
danielvincent
368f550f65 preview text next to diaspora in header 2010-07-01 17:22:24 -07:00
maxwell
2b2864b78d now its just a message for ie 6, 7 2010-07-01 17:12:21 -07:00
maxwell
8d1ec57fa4 beefed it up to ie 7 2010-07-01 17:07:36 -07:00
maxwell
8e94fc5b4f added mean message 2010-07-01 17:05:14 -07:00
maxwell
86c6cdcafa Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:38:51 -07:00
maxwell
ba984009f8 added chrome frame 2010-07-01 16:38:32 -07:00
danielvincent
c27bc09e75 fixed user image bug 2010-07-01 16:35:44 -07:00
danielvincent
b25880f04a Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:25:11 -07:00
danielvincent
03e7071aae fixed nav list/link deal for firefox, html compliance 2010-07-01 16:24:51 -07:00
maxwell
6f17e5f28f added chrome frame for ie lameos 2010-07-01 16:17:32 -07:00
maxwell
b0a3feb30c fixed g analytics 2010-07-01 15:51:17 -07:00