From c9c84794af21d03dcc6b1a6480b7964035935575 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Tue, 23 Nov 2010 03:10:28 -0800 Subject: [PATCH] fixed build. publisher lights up on hover on aspect#index page. updated login page text. --- app/helpers/aspects_helper.rb | 4 +- app/views/aspects/index.html.haml | 2 +- app/views/aspects/show.html.haml | 2 +- app/views/devise/sessions/new.haml | 12 +- .../people/_profile_photo_upload.html.haml | 2 +- app/views/people/_profile_sidebar.html.haml | 6 +- app/views/services/index.html.haml | 4 +- app/views/shared/_contact_list.html.haml | 10 +- app/views/shared/_publisher.haml | 6 +- config/locales/devise/devise.en.yml | 8 +- config/locales/diaspora/en.yml | 2 +- public/images/modern_browsers.png | Bin 0 -> 8813 bytes public/images/services/facebook_sign_in.png | Bin 0 -> 1661 bytes public/images/services/twitter_sign_in.png | Bin 0 -> 2490 bytes public/javascripts/view.js | 2 +- public/stylesheets/sass/application.sass | 16 +- spec/fixtures/users.yaml | 1575 +++++------------ 17 files changed, 452 insertions(+), 1199 deletions(-) create mode 100644 public/images/modern_browsers.png create mode 100644 public/images/services/facebook_sign_in.png create mode 100644 public/images/services/twitter_sign_in.png diff --git a/app/helpers/aspects_helper.rb b/app/helpers/aspects_helper.rb index 2b8cf11e0..c81f49d37 100644 --- a/app/helpers/aspects_helper.rb +++ b/app/helpers/aspects_helper.rb @@ -16,10 +16,10 @@ module AspectsHelper end def add_to_aspect_button(aspect_id, person_id) - link_to image_tag('icons/monotone_plus_add_round.png'), {:action => 'add_to_aspect', :aspect_id => aspect_id, :person_id => person_id}, :remote => true, :class => 'add button' + link_to image_tag('icons/monotone_plus_add_round.png'), {:controller => "aspects", :action => 'add_to_aspect', :aspect_id => aspect_id, :person_id => person_id}, :remote => true, :class => 'add button' end def remove_from_aspect_button(aspect_id, person_id) - link_to image_tag('icons/monotone_check_yes.png'), {:action => 'remove_from_aspect', :aspect_id => aspect_id, :person_id => person_id}, :remote => true, :class => 'added button' + link_to image_tag('icons/monotone_check_yes.png'), {:controller => "aspects", :action => 'remove_from_aspect', :aspect_id => aspect_id, :person_id => person_id}, :remote => true, :class => 'added button' end end diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml index 159f92300..ee4df65af 100644 --- a/app/views/aspects/index.html.haml +++ b/app/views/aspects/index.html.haml @@ -10,7 +10,7 @@ = current_user.diaspora_handle = info_text(t('.handle_explanation')) -.span-15.last +.span-15 = render 'aspects/no_contacts_message', :aspect => @aspect, :contact_count => @contacts.count = render 'shared/publisher', :aspect => @aspect = render 'aspects/no_posts_message', :post_count => @posts.count, :contact_count => @contacts.count diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml index fa0c1721a..5a2ab2334 100644 --- a/app/views/aspects/show.html.haml +++ b/app/views/aspects/show.html.haml @@ -16,7 +16,7 @@ = link_to t('.edit_aspect'), "#", :id => "edit_aspect_trigger" -.span-8.append-1.last +.span-8.append-1 = render 'shared/aspect_contacts', :contacts => @aspect_contacts, :aspect => @aspect .span-15.last diff --git a/app/views/devise/sessions/new.haml b/app/views/devise/sessions/new.haml index e4084c05d..7ef5c2f10 100644 --- a/app/views/devise/sessions/new.haml +++ b/app/views/devise/sessions/new.haml @@ -30,10 +30,14 @@ .span-13.last %h1 - = t('.tech_preview') + = t('.alpha_software') + %h3 - = t('.account_deletion') - %h3 - = t('.risk') + = t('.bugs_and_feedback') + + %h4 + %span.brandon DIASPORA* + = t('.modern_browsers') + = image_tag('modern_browsers.png') diff --git a/app/views/people/_profile_photo_upload.html.haml b/app/views/people/_profile_photo_upload.html.haml index 2a6cae192..67935ef7c 100644 --- a/app/views/people/_profile_photo_upload.html.haml +++ b/app/views/people/_profile_photo_upload.html.haml @@ -11,4 +11,4 @@ %p \...#{t('.or_select_one')} = link_to t('_photos'), person_photos_path(@person) - \. + diff --git a/app/views/people/_profile_sidebar.html.haml b/app/views/people/_profile_sidebar.html.haml index 0f678a460..62e4eef7d 100644 --- a/app/views/people/_profile_sidebar.html.haml +++ b/app/views/people/_profile_sidebar.html.haml @@ -38,13 +38,17 @@ %li %h3 #{t('.bio')} = person.profile.bio + %li - .span-4.last + .span-4 %h3 #{t('.gender')} = person.profile.gender + .span-4.last %h3 #{t('.born')} = "#{time_ago_in_words(person.profile.birthday)} #{t('ago')}" if @person.profile.birthday + + .clearfix %br %br %br diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml index eaf543a78..8a593179e 100644 --- a/app/views/services/index.html.haml +++ b/app/views/services/index.html.haml @@ -23,6 +23,6 @@ = service.nickname = link_to t('.disconnect'), service, :confirm => t('.really_disconnect', :service => service.provider), :method => :delete - %h4= link_to t('.connect_to_twitter'), "/auth/twitter" if SERVICES['twitter']['consumer_key']!= "" - %h4= link_to t('.connect_to_facebook'), "/auth/facebook" if SERVICES['facebook']['app_id'] !="" + %h4= link_to image_tag('services/twitter_sign_in.png'), "/auth/twitter" if SERVICES['twitter']['consumer_key']!= "" + %h4= link_to image_tag('services/facebook_sign_in.png'), "/auth/facebook" if SERVICES['facebook']['app_id'] !="" diff --git a/app/views/shared/_contact_list.html.haml b/app/views/shared/_contact_list.html.haml index 4dab495d9..d58a9adbd 100644 --- a/app/views/shared/_contact_list.html.haml +++ b/app/views/shared/_contact_list.html.haml @@ -47,6 +47,10 @@ $(this).parent().html(html); ContactList.refreshContactCount(); + if( $(".contact_pictures")[0].childElementCount == 0 ) { + $("#no_contacts").fadeIn(200); + } + $(this).fadeTo(200,1); }); @@ -54,7 +58,6 @@ alert("#{t('.cannot_remove')}"); }); - $('.add').live('ajax:loading', function(data, html, xhr) { $(this).fadeTo(200,0.4); }); @@ -66,10 +69,13 @@ $(this).parent().html(html); ContactList.refreshContactCount(); + if( $("#no_contacts").is(':visible') ) { + $("#no_contacts").fadeOut(200); + } + $(this).fadeTo(200,1); }); - $('.added').live('mouseover', function(){ $(this).addClass("remove"); $(this).children("img").attr("src","/images/icons/monotone_close_exit_delete.png"); diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index 2fe28aa78..18dfe753f 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -22,19 +22,19 @@ }); $("#content_creation_button").bind("click", function(evt){ - $("#publisher").find(".content_creation").show(); + $("#publisher").removeClass("closed"); $("#publisher").find("textarea").focus(); }); }); -#publisher +#publisher{:class=>("closed" if aspect == :all)} - if aspect == :all #content_creation_button = image_tag 'icons/monotone_chat_talk.png', :id => 'share_bubble' %h4 share across all of your aspects - .content_creation{:style=>("display:none;" if aspect == :all)} + .content_creation = form_for(StatusMessage.new, :remote => true) do |status| %ul#photodropzone = status.error_messages diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml index 49890bab4..bf6ff716a 100644 --- a/config/locales/devise/devise.en.yml +++ b/config/locales/devise/devise.en.yml @@ -22,9 +22,9 @@ en: sign_in: 'Sign in' have_a_problem: "Have a problem? Find an answer here" remember_me: "Remember me" - tech_preview: "Important, please read: This is a technology preview; do not provide any private information." - account_deletion: "Also, be advised that your account may be deleted until we move into a more stable development period." - risk: "USE AT YOUR OWN RISK!!!" + alpha_software: 'You are about to use alpha software.' + bugs_and_feedback: 'Be advised, you will experience bugs. We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups! We will work as fast as we can to resolve any issues you report.' + modern_browsers: 'only supports modern browsers.' signed_in: 'Signed in successfully.' signed_out: 'Signed out successfully.' passwords: @@ -86,4 +86,4 @@ en: sign_up: 'Sign up' forgot_your_password: 'Forgot your password?' receive_confirmation: "Didn't receive confirmation instructions?" - receive_unlock: "Didn't receive unlock instructions?" \ No newline at end of file + receive_unlock: "Didn't receive unlock instructions?" diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 4ced017ca..798f5ed10 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -308,7 +308,7 @@ en: your_bio: "Your bio" your_photo: "Your photo" update_profile: "Update Profile" - allow_search: "Allow for people to search for you" + allow_search: "Allow for people to search for you within Diaspora" profile_photo_upload: or_select_one: "or select one from your already existing" update: diff --git a/public/images/modern_browsers.png b/public/images/modern_browsers.png new file mode 100644 index 0000000000000000000000000000000000000000..7d7c6aefe68571b24e951b123bd0f6b3a6f7bf14 GIT binary patch literal 8813 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 Hu0mjfITyzy literal 0 HcmV?d00001 diff --git a/public/images/services/twitter_sign_in.png b/public/images/services/twitter_sign_in.png new file mode 100644 index 0000000000000000000000000000000000000000..297bb03404f2d7462ee9355aae38f5f5f3e47fbd GIT binary patch literal 2490 zcmV;r2}SmaP)dbVG7wVRUJ4ZXi@?ZDjy8FEKeU zFgbGL({lg-0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#1y$)1UwV2@^>~ zK~!jg?VEdWl+_u=f8X9WA)72QVM!vF1VSK4AZQ?nK}o}NseS3JN$f zgRQMIo!W~OJ6`ZouvAJ_K&eH%O=zU35Dd9+OGJ}EvYTu++57IdU;kJVc9XpY6B?a; zX3k{ZIp=-eC+|7m`<-)kR{+>vQ7sWi9D|5ebEgWz_KIq$s4!>9f*d_|j-lj_V|e1| zv2!Q@e7>PCTvsDT9K#C=07>!<2 zJRT3v{^4m(e0B`AMuXes=AQD^+;C$tPj22q>4H*zdfz>`#KAid3>9xAeo+*W%jE#P zv+pgwyLbU*^X6iX@D|vxdJPV{BV^y=rMIzo>FtA}CzL%H7|@3PC-uR0k{o`MEpT&+ zmiCUwd$DjaD&G5mR^R=5Ugy>A zFL6`pd;osE=`rd~)-ZEc5shchvh}x5aZ~9nJpS;;UjCggyhMFX4IM@k^;K2OnpeX9 zJ+G59W-M>Ndx+<@J`*QB2?^MN1N-(fead7?=HEi6T!B@Box5IR=L;`>Ej{PX zHuTf??pp_V_K#2V&%f=WuDXUP)2>6K(eP;bS}ruV@b7*5sr;ydIrB8I2tIsDgsYdEB~aA*X6k7? zxX|2;qp^|Gwe@`Y#d&IupCC)EqUw`l7)GU&uTKu*U$o?QG#U*z%qZYj8`hDRoCLu8 zhbzgOI5DbLyT^;&?d{E@=<{Loc(HlBWQ@7?YwIarxgyB6oH@guS9eiXI-mWozJlq( z1uEY@fC2%N(MZ*iqs%Lw&3$(-XHs%f#Ci8GF3A_N^~J`q@N(Yec4#`>p8;Rm>`^(w z^()mX);zY6A1}KTOQ(hBpZ+tI2M_vvC6EgOasg^TuSW9u`2L~=xMTvlF=IdirA&q( z01}jz+(`M#6-+Id=Jypvl2wZSngV!x>{xvBuA7QRt)c4kYU--0D3~!Fhr>aA^+`_G z)iHDWG@POs#IMsQgCL+*sYp&si#>KieJ zAZPaXZl!3>9M-SjNX7dfvh?=bdf)$&1YWO*1jqy#ZFVPakM~lt{ns24pi(Mnce*e+ zoV|U5)IWA0uWtapa=C)>xf3{EU4zZ(WX19y(%RC@hySVMd_x1@*}REPr@KGD1PCBr zszd|P3jULJU(P|*6JUEpf1ZUYMN@b5y{gO~R0`R^ zzo2^1b1iYS>vBugsL9qPM&yVTyCwWp(Uo=ev@y*W7rS{ZmOePbh#j}_&X%YtxeZa(=9L5<&(e8Bi z<5wsYm^&^0MKr*8(egMLdIIf9`S}2Jn9Y=xl~T570XoAdF4!DlHH6a}anEJ-cv*VQ z<;7KRgYq-}Q)5qi@;qcECS38JtLDV#Y+3g(n;(3LUp}&dB%O}ct5)I-xFV2%>k11g zTUf@C&yKTa*KVdw^(R50loR*{_b2SKCHeZt4jkLpj^;ZlKOe6sQZ!>aT9uM(b0*;N zdYL_=0IS=B(gj7|CTgIo3w=s5DLNgUE;lDl z=6*ck(9~r1FRqNt5);TzP2p%4ylH~wfExv!+`pk8s}?!j(i+mgrP)GJVGd2L zrifxR3OQ=I9MLCX4Ray;#3LJ#2{HtkfT^vG#S0hk#JUIhwAC2&WDQrS)2nfk*V=iQ!Y2K(sVlqHpM%x^1{ck;y4Kin5jc`W;@8<8AFx4+YWs z?QSo2A}4+Q<6F?#y0F{r>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + created_at: 2010-11-23 10:51:31 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -69,177 +64,177 @@ data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 51 - - 55 - - 219 - - 91 - - 40 - - 113 -======= - - 51 - - 129 - - 213 + - 156 + - 179 - 82 - - 57 - - 43 - - 90 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + - 222 + - 181 + - 58 + - 130 + - 0 + - 1 + - 92 + gender: + diaspora_handle: + birthday: + last_name: Grimm87416368 + bio: + first_name: Robert87a5f054 + updated_at: 2010-11-23 10:51:31 Z + _id: !ruby/object:BSON::ObjectId + data: + - 76 + - 235 + - 156 + - 179 + - 82 + - 222 + - 181 + - 58 + - 130 + - 0 + - 1 + - 93 + url: http://google-87591367.com/ + serialized_public_key: | + -----BEGIN RSA PUBLIC KEY----- + MIGJAoGBANpmDvhJvV51PwcqWC0iu4K3KCx2pPbVDh8uIQZYDIMjvZuXjUOJ3God + VCcP2M1RVPOSmeVI2KgENd5Dv7ndT24OAGWw2RbFshe06hpXywGmY1NuSO2XhjLZ + Fs7709DFKq3hZhk6RfPy+a/CDGOGJCOPhNEOxJxqU2GmXl8U6vMxAgMBAAE= + -----END RSA PUBLIC KEY----- + + owner_id: *id001 + diaspora_handle: bob86a08485@example.org +- :user: !map:ActiveSupport::HashWithIndifferentAccess + encrypted_password: $2a$10$rbTZ3XYGj67AuJMCd0yL9upnbLee8evhKi8fTWr6eEAkxYN0mapvi + serialized_private_key: *id002 + pending_request_ids: [] + + last_sign_in_ip: + invites: 5 + _id: &id003 !ruby/object:BSON::ObjectId + data: + - 76 + - 235 + - 156 + - 179 + - 82 + - 222 + - 181 + - 58 + - 130 + - 0 + - 1 + - 94 + last_sign_in_at: + username: bob873822c5 + language: en + sign_in_count: 0 + visible_person_ids: [] + + password_salt: $2a$10$rbTZ3XYGj67AuJMCd0yL9u + remember_token: + reset_password_token: + current_sign_in_ip: + remember_created_at: + current_sign_in_at: + invitation_sent_at: + email: bob88f45cfc@pivotallabs.com + invitation_token: + visible_post_ids: [] + + getting_started: true + :person: !map:ActiveSupport::HashWithIndifferentAccess + created_at: 2010-11-23 10:51:31 Z + profile: !map:ActiveSupport::HashWithIndifferentAccess + searchable: true + image_url: + _id: !ruby/object:BSON::ObjectId + data: + - 76 + - 235 + - 156 + - 179 + - 82 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 95 gender: diaspora_handle: birthday: -<<<<<<< HEAD - last_name: Grimm87ed1f78 + last_name: Grimm8810242a bio: - first_name: Robert87777f99 - updated_at: 2010-11-23 08:02:59 Z -======= - last_name: Grimm87fdaf0d - bio: - first_name: Robert8722de40 - updated_at: 2010-11-23 03:22:41 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + first_name: Robert8898d19e + updated_at: 2010-11-23 10:51:31 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 51 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 96 - url: http://google-87b7ddac.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAM+G59ysHdeOSKtae9KyqGTMakj12L56QWQbmRCeSFey66kyw4RzkGG7 - eFMEZXCmOtJkkQUKWP3Txys2YweZaRubxkDeDCSr66rYLQRrgDIrzG6exrVbpeA6 - EEVX+v2IcSmAjqjTyzm7IQyXK4wwKX7kzvRHyWf229sGyk5a4LATAgMBAAE= -======= - - 51 - - 129 - - 213 + - 156 + - 179 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 96 - url: http://google-8777c48f.com/ + url: http://google-88af7ba7.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE - sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2 - 7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE= ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + MIGJAoGBANpmDvhJvV51PwcqWC0iu4K3KCx2pPbVDh8uIQZYDIMjvZuXjUOJ3God + VCcP2M1RVPOSmeVI2KgENd5Dv7ndT24OAGWw2RbFshe06hpXywGmY1NuSO2XhjLZ + Fs7709DFKq3hZhk6RfPy+a/CDGOGJCOPhNEOxJxqU2GmXl8U6vMxAgMBAAE= -----END RSA PUBLIC KEY----- - owner_id: *id001 - diaspora_handle: bob86b506ff@example.org + owner_id: *id003 + diaspora_handle: bob873822c5@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$cy1.lYsH0.g1qrXnrPdW1.0ttEAQdmtSHfZT0.b5ZxSGNI/lCqUHe + encrypted_password: $2a$10$9EV1y2k/90h9aKt04ZZHQuiqPyPzealedli7BM6aEokRJV4iR0na. serialized_private_key: *id002 pending_request_ids: [] last_sign_in_ip: - invites: 0 - _id: &id003 !ruby/object:BSON::ObjectId + invites: 5 + _id: &id004 !ruby/object:BSON::ObjectId data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 51 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 94 - diaspora_handle: bob867d9fc4@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$Y1Q6aU.9mBFFZxrcZYIlD.L.5CdZ8wvSGLJKt69CoBRoVPsKB4uVS - serialized_private_key: &id002 | - -----BEGIN RSA PRIVATE KEY----- - MIICWwIBAAKBgQDPhufcrB3XjkirWnvSsqhkzGpI9di+ekFkG5kQnkhXsuupMsOE - c5Bhu3hTBGVwpjrSZJEFClj908crNmMHmWkbm8ZA3gwkq+uq2C0Ea4AyK8xunsa1 - W6XgOhBFV/r9iHEpgI6o08s5uyEMlyuMMCl+5M70R8ln9tvbBspOWuCwEwIDAQAB - AoGAMRNL/WlOXU0ubiclpPvOypd0gvBwYwryL8Q+/CkSHnsXM5nnlojlmdcFa0xc - 2LjWrC5QBQsfZFcSgGuKG5/xtMJrg84A1VziA1aKTH3SK4M9I5v90T5jKybBcJhm - woQWciOauXSxmEMIF8zsQH33Du96silGtRS1Y21q6bOyL7ECQQD2ta/MIWfPn3wM - EAZrxVXcG4DJ9cQcDJduatKj5JZe6At8Iqpph9W2GU+OoALAQrRA0XRj9jHPE/jJ - 0FYVA1tHAkEA11d+DIV9w/XBb/KF8TdJgbsOpqP+B7opzvkj6fsRDhlzN7abFXlj - vrj/prkamJOwmVNVmokjRKWfZFmw799S1QJAQl/fTCwwoctmtFgbYiNVVkKQA8X7 - XRCGLU7QHQgC7MXBUUSCVKIW/UcSAG1MUC2iEU5I4hv6ipv081b50e11QQJAAhLG - lOpIHrXkCebk4UCuBYC+kF4t2Pcy5dpCPUN8k40tLdElRxynGDQByiIoHmX1olRK - E7XUUBnkIfw3FugojQJAEGOTQi0whDfu563kMupERU6ZkMz//rQKcqAHHujaZLcE - G5N7S5ohbjNUrjQKPejax0+TMKpIlWHx1LBGSKFaKg== - -----END RSA PRIVATE KEY----- - - pending_request_ids: [] - - last_sign_in_ip: - invites: 5 - _id: *id001 - last_sign_in_at: - username: bob867d9fc4 -======= - - 51 - - 129 - - 213 + - 156 + - 179 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 97 last_sign_in_at: - username: bob87667df7 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + username: bob88e4ff24 language: en sign_in_count: 0 visible_person_ids: [] -<<<<<<< HEAD - password_salt: $2a$10$Y1Q6aU.9mBFFZxrcZYIlD. -======= - password_salt: $2a$10$cy1.lYsH0.g1qrXnrPdW1. ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + password_salt: $2a$10$9EV1y2k/90h9aKt04ZZHQu remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: -<<<<<<< HEAD - email: bob87947110@pivotallabs.com -======= - email: bob88bf5388@pivotallabs.com ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + email: bob897136e1@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true -<<<<<<< HEAD -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 08:02:59 Z -======= :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 03:22:41 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + created_at: 2010-11-23 10:51:31 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -247,163 +242,88 @@ data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 51 - - 55 - - 219 - - 91 - - 40 - - 113 -======= - - 51 - - 129 - - 213 + - 156 + - 179 - 82 - - 57 - - 43 - - 90 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 98 gender: diaspora_handle: birthday: -<<<<<<< HEAD - last_name: Grimm8897d77e + last_name: Grimm8991b7c8 bio: - first_name: Robert88082241 - updated_at: 2010-11-23 08:02:59 Z -======= - last_name: Grimm88047129 - bio: - first_name: Robert88736a8c - updated_at: 2010-11-23 03:22:41 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + first_name: Robert89098d9f + updated_at: 2010-11-23 10:51:31 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 51 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 99 - url: http://google-88ca5b88.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAM+G59ysHdeOSKtae9KyqGTMakj12L56QWQbmRCeSFey66kyw4RzkGG7 - eFMEZXCmOtJkkQUKWP3Txys2YweZaRubxkDeDCSr66rYLQRrgDIrzG6exrVbpeA6 - EEVX+v2IcSmAjqjTyzm7IQyXK4wwKX7kzvRHyWf229sGyk5a4LATAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id003 !ruby/object:BSON::ObjectId - data: - - 76 - - 235 - - 117 - - 51 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 97 - diaspora_handle: bob878a464a@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$pVZjeQNn/vvXCB2ohJn2uua6JOZ/0gbs/N.HuKSP6g7QTopwmlIzu -======= - - 51 - - 129 - - 213 + - 156 + - 179 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 99 - url: http://google-886a54f8.com/ + url: http://google-894a6350.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE - sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2 - 7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE= + MIGJAoGBANpmDvhJvV51PwcqWC0iu4K3KCx2pPbVDh8uIQZYDIMjvZuXjUOJ3God + VCcP2M1RVPOSmeVI2KgENd5Dv7ndT24OAGWw2RbFshe06hpXywGmY1NuSO2XhjLZ + Fs7709DFKq3hZhk6RfPy+a/CDGOGJCOPhNEOxJxqU2GmXl8U6vMxAgMBAAE= -----END RSA PUBLIC KEY----- - owner_id: *id003 - diaspora_handle: bob87667df7@example.org + owner_id: *id004 + diaspora_handle: bob88e4ff24@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$yviJRqeekso2Bk5UF9Mgbehl.KFpDpjmEUkx0L8n07UYQDkfbpLDW ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + encrypted_password: $2a$10$BCiLpAx35oBpam/AEcShDOcJQR3l4PyLG5jdtca9sy.SvdR.zSbXG serialized_private_key: *id002 pending_request_ids: [] last_sign_in_ip: -<<<<<<< HEAD invites: 5 - _id: *id003 - last_sign_in_at: - username: bob878a464a -======= - invites: 0 - _id: &id004 !ruby/object:BSON::ObjectId + _id: &id005 !ruby/object:BSON::ObjectId data: - 76 - 235 - - 51 - - 129 - - 213 + - 156 + - 179 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 100 last_sign_in_at: - username: bob88429f01 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + username: bob892bd9c1 language: en sign_in_count: 0 visible_person_ids: [] -<<<<<<< HEAD - password_salt: $2a$10$pVZjeQNn/vvXCB2ohJn2uu -======= - password_salt: $2a$10$yviJRqeekso2Bk5UF9Mgbe ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + password_salt: $2a$10$BCiLpAx35oBpam/AEcShDO remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: -<<<<<<< HEAD - email: bob884ff707@pivotallabs.com -======= - email: bob8961d469@pivotallabs.com ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + email: bob9071b069@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true -<<<<<<< HEAD -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 08:02:59 Z -======= :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 03:22:41 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + created_at: 2010-11-23 10:51:32 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -411,163 +331,88 @@ data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 51 - - 55 - - 219 - - 91 - - 40 - - 113 -======= - - 51 - - 129 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 101 gender: diaspora_handle: birthday: -<<<<<<< HEAD - last_name: Grimm89a984dd + last_name: Grimm907f8701 bio: - first_name: Robert89fcc077 - updated_at: 2010-11-23 08:02:59 Z -======= - last_name: Grimm89c9c9c5 - bio: - first_name: Robert89600186 - updated_at: 2010-11-23 03:22:41 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + first_name: Robert9073b65a + updated_at: 2010-11-23 10:51:32 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 51 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 102 - url: http://google-89cb88a6.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAM+G59ysHdeOSKtae9KyqGTMakj12L56QWQbmRCeSFey66kyw4RzkGG7 - eFMEZXCmOtJkkQUKWP3Txys2YweZaRubxkDeDCSr66rYLQRrgDIrzG6exrVbpeA6 - EEVX+v2IcSmAjqjTyzm7IQyXK4wwKX7kzvRHyWf229sGyk5a4LATAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id004 !ruby/object:BSON::ObjectId - data: - - 76 - - 235 - - 117 - - 51 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 100 - diaspora_handle: bob882fbc0c@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$FbNAlEiJR9bZRnPJvLISmOOZlW4yfpQ5ooJBPmgoVGU3w7vF.5K0. -======= - - 51 - - 129 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 102 - url: http://google-89880236.com/ + url: http://google-90248496.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE - sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2 - 7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE= + MIGJAoGBANpmDvhJvV51PwcqWC0iu4K3KCx2pPbVDh8uIQZYDIMjvZuXjUOJ3God + VCcP2M1RVPOSmeVI2KgENd5Dv7ndT24OAGWw2RbFshe06hpXywGmY1NuSO2XhjLZ + Fs7709DFKq3hZhk6RfPy+a/CDGOGJCOPhNEOxJxqU2GmXl8U6vMxAgMBAAE= -----END RSA PUBLIC KEY----- - owner_id: *id004 - diaspora_handle: bob88429f01@example.org + owner_id: *id005 + diaspora_handle: bob892bd9c1@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$saHU4SJLoOAgkzP5nXHEvOloGSp23ygqbchr6FitYfxbW50zVS9uW ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + encrypted_password: $2a$10$q5bJ9bjaKAkH.eO53gU7vuECv67HZ2/rFTd9UiRNlaIkJU52K1Zei serialized_private_key: *id002 pending_request_ids: [] last_sign_in_ip: -<<<<<<< HEAD invites: 5 - _id: *id004 - last_sign_in_at: - username: bob882fbc0c -======= - invites: 0 - _id: &id005 !ruby/object:BSON::ObjectId + _id: &id006 !ruby/object:BSON::ObjectId data: - 76 - 235 - - 51 - - 129 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 103 last_sign_in_at: - username: bob895ab4a8 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + username: bob90058d7a language: en sign_in_count: 0 visible_person_ids: [] -<<<<<<< HEAD - password_salt: $2a$10$FbNAlEiJR9bZRnPJvLISmO -======= - password_salt: $2a$10$saHU4SJLoOAgkzP5nXHEvO ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + password_salt: $2a$10$q5bJ9bjaKAkH.eO53gU7vu remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: -<<<<<<< HEAD - email: bob89903478@pivotallabs.com -======= - email: bob90db5672@pivotallabs.com ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + email: bob91c58ee9@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true -<<<<<<< HEAD -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 08:02:59 Z -======= :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 03:22:42 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + created_at: 2010-11-23 10:51:32 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -575,163 +420,88 @@ data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 51 - - 55 - - 219 - - 91 - - 40 - - 113 -======= - - 51 - - 129 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 104 gender: diaspora_handle: birthday: -<<<<<<< HEAD - last_name: Grimm9014bcfd + last_name: Grimm91fb17e8 bio: - first_name: Robert90559501 - updated_at: 2010-11-23 08:02:59 Z -======= - last_name: Grimm90711f8f - bio: - first_name: Robert90dfa3f7 - updated_at: 2010-11-23 03:22:42 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + first_name: Robert91f146b2 + updated_at: 2010-11-23 10:51:32 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 51 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 105 - url: http://google-90bee2e2.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAM+G59ysHdeOSKtae9KyqGTMakj12L56QWQbmRCeSFey66kyw4RzkGG7 - eFMEZXCmOtJkkQUKWP3Txys2YweZaRubxkDeDCSr66rYLQRrgDIrzG6exrVbpeA6 - EEVX+v2IcSmAjqjTyzm7IQyXK4wwKX7kzvRHyWf229sGyk5a4LATAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id005 !ruby/object:BSON::ObjectId - data: - - 76 - - 235 - - 117 - - 51 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 103 - diaspora_handle: bob89ca7f5b@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$wg0QeGPKwpw3y4OynIvbIucSDmgvZ7amgin7vhlDMP9qcdIxrxgk. -======= - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 105 - url: http://google-9090fe30.com/ + url: http://google-91106188.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE - sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2 - 7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE= + MIGJAoGBANpmDvhJvV51PwcqWC0iu4K3KCx2pPbVDh8uIQZYDIMjvZuXjUOJ3God + VCcP2M1RVPOSmeVI2KgENd5Dv7ndT24OAGWw2RbFshe06hpXywGmY1NuSO2XhjLZ + Fs7709DFKq3hZhk6RfPy+a/CDGOGJCOPhNEOxJxqU2GmXl8U6vMxAgMBAAE= -----END RSA PUBLIC KEY----- - owner_id: *id005 - diaspora_handle: bob895ab4a8@example.org + owner_id: *id006 + diaspora_handle: bob90058d7a@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$O/jbgsFQHulESnXRTAFRqutj1YttlBN9P.Dq7tGaPPvf41gx9OFL. ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + encrypted_password: $2a$10$POHambB0ZszbZx1jqE7hz.TOSD8OPLNb6rJMyAd1Pgoo9F1MBxaEq serialized_private_key: *id002 pending_request_ids: [] last_sign_in_ip: -<<<<<<< HEAD invites: 5 - _id: *id005 - last_sign_in_at: - username: bob89ca7f5b -======= - invites: 0 - _id: &id006 !ruby/object:BSON::ObjectId + _id: &id007 !ruby/object:BSON::ObjectId data: - 76 - 235 - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 106 last_sign_in_at: - username: bob9033d477 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + username: bob919b38cb language: en sign_in_count: 0 visible_person_ids: [] -<<<<<<< HEAD - password_salt: $2a$10$wg0QeGPKwpw3y4OynIvbIu -======= - password_salt: $2a$10$O/jbgsFQHulESnXRTAFRqu ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + password_salt: $2a$10$POHambB0ZszbZx1jqE7hz. remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: -<<<<<<< HEAD - email: bob90187d25@pivotallabs.com -======= - email: bob91512c00@pivotallabs.com ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + email: bob9272d405@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true -<<<<<<< HEAD -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 08:03:00 Z -======= :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 03:22:42 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + created_at: 2010-11-23 10:51:32 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -739,163 +509,88 @@ data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 -======= - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 107 gender: diaspora_handle: birthday: -<<<<<<< HEAD - last_name: Grimm9100c957 + last_name: Grimm92b349af bio: - first_name: Robert91d04f7a - updated_at: 2010-11-23 08:03:00 Z -======= - last_name: Grimm918abb92 - bio: - first_name: Robert91f79543 - updated_at: 2010-11-23 03:22:42 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + first_name: Robert927e0451 + updated_at: 2010-11-23 10:51:32 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 108 - url: http://google-91ded544.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAM+G59ysHdeOSKtae9KyqGTMakj12L56QWQbmRCeSFey66kyw4RzkGG7 - eFMEZXCmOtJkkQUKWP3Txys2YweZaRubxkDeDCSr66rYLQRrgDIrzG6exrVbpeA6 - EEVX+v2IcSmAjqjTyzm7IQyXK4wwKX7kzvRHyWf229sGyk5a4LATAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id006 !ruby/object:BSON::ObjectId - data: - - 76 - - 235 - - 117 - - 51 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 106 - diaspora_handle: bob90302cbd@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$N8YWCf220R00eCxv71qruOvSfJnjU3MZ9ItvTYSwwy9teNCs1j.3e -======= - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 108 - url: http://google-91972485.com/ + url: http://google-920ccd9b.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE - sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2 - 7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE= + MIGJAoGBANpmDvhJvV51PwcqWC0iu4K3KCx2pPbVDh8uIQZYDIMjvZuXjUOJ3God + VCcP2M1RVPOSmeVI2KgENd5Dv7ndT24OAGWw2RbFshe06hpXywGmY1NuSO2XhjLZ + Fs7709DFKq3hZhk6RfPy+a/CDGOGJCOPhNEOxJxqU2GmXl8U6vMxAgMBAAE= -----END RSA PUBLIC KEY----- - owner_id: *id006 - diaspora_handle: bob9033d477@example.org + owner_id: *id007 + diaspora_handle: bob919b38cb@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$ac5Ng2x18LSP8Irx5APJdu8mpzQOhXOeOM0DPpo.A8uZfmTkHY19e ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + encrypted_password: $2a$10$7OnvUmUoKTd2z28ZY4unWO4OdlYLecjLLZRprGwG/S0LUnQa1kehu serialized_private_key: *id002 pending_request_ids: [] last_sign_in_ip: -<<<<<<< HEAD invites: 5 - _id: *id006 - last_sign_in_at: - username: bob90302cbd -======= - invites: 0 - _id: &id007 !ruby/object:BSON::ObjectId + _id: &id008 !ruby/object:BSON::ObjectId data: - 76 - 235 - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 109 last_sign_in_at: - username: bob911e44d4 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + username: bob92218d03 language: en sign_in_count: 0 visible_person_ids: [] -<<<<<<< HEAD - password_salt: $2a$10$N8YWCf220R00eCxv71qruO -======= - password_salt: $2a$10$ac5Ng2x18LSP8Irx5APJdu ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + password_salt: $2a$10$7OnvUmUoKTd2z28ZY4unWO remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: -<<<<<<< HEAD - email: bob911a6739@pivotallabs.com -======= - email: bob92671116@pivotallabs.com ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + email: bob93bb138e@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true -<<<<<<< HEAD -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 08:03:00 Z -======= :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 03:22:42 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + created_at: 2010-11-23 10:51:32 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -903,163 +598,88 @@ data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 -======= - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 110 gender: diaspora_handle: birthday: -<<<<<<< HEAD - last_name: Grimm923a04b0 + last_name: Grimm93c026c9 bio: - first_name: Robert928d26da - updated_at: 2010-11-23 08:03:00 Z -======= - last_name: Grimm92e35205 - bio: - first_name: Robert92db6820 - updated_at: 2010-11-23 03:22:42 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + first_name: Robert937b205e + updated_at: 2010-11-23 10:51:32 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 111 - url: http://google-928d12c8.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAM+G59ysHdeOSKtae9KyqGTMakj12L56QWQbmRCeSFey66kyw4RzkGG7 - eFMEZXCmOtJkkQUKWP3Txys2YweZaRubxkDeDCSr66rYLQRrgDIrzG6exrVbpeA6 - EEVX+v2IcSmAjqjTyzm7IQyXK4wwKX7kzvRHyWf229sGyk5a4LATAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id007 !ruby/object:BSON::ObjectId - data: - - 76 - - 235 - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 109 - diaspora_handle: bob910dcc30@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$OVzwf.dHCZlTHWLjAEY91OFb8a/cRD3YkQEWwV4M.rPP5LR2XgL46 -======= - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 111 - url: http://google-923191e4.com/ + url: http://google-9366caee.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE - sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2 - 7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE= + MIGJAoGBANpmDvhJvV51PwcqWC0iu4K3KCx2pPbVDh8uIQZYDIMjvZuXjUOJ3God + VCcP2M1RVPOSmeVI2KgENd5Dv7ndT24OAGWw2RbFshe06hpXywGmY1NuSO2XhjLZ + Fs7709DFKq3hZhk6RfPy+a/CDGOGJCOPhNEOxJxqU2GmXl8U6vMxAgMBAAE= -----END RSA PUBLIC KEY----- - owner_id: *id007 - diaspora_handle: bob911e44d4@example.org + owner_id: *id008 + diaspora_handle: bob92218d03@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$pzJ9iEUHaX8hCyP.sYJA4em2jmhflMP8BlbRqV0BdAd4ySuMIA5Nm ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + encrypted_password: $2a$10$/tD4TepJrr88Q.zL6TICJOr3Zhh23i97I03GpnLS6tfNwZk.LvLBO serialized_private_key: *id002 pending_request_ids: [] last_sign_in_ip: -<<<<<<< HEAD invites: 5 - _id: *id007 - last_sign_in_at: - username: bob910dcc30 -======= - invites: 0 - _id: &id008 !ruby/object:BSON::ObjectId + _id: &id009 !ruby/object:BSON::ObjectId data: - 76 - 235 - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 112 last_sign_in_at: - username: bob92e2a817 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + username: bob93787fca language: en sign_in_count: 0 visible_person_ids: [] -<<<<<<< HEAD - password_salt: $2a$10$OVzwf.dHCZlTHWLjAEY91O -======= - password_salt: $2a$10$pzJ9iEUHaX8hCyP.sYJA4e ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + password_salt: $2a$10$/tD4TepJrr88Q.zL6TICJO remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: -<<<<<<< HEAD - email: bob9241b6ce@pivotallabs.com -======= - email: bob936df514@pivotallabs.com ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + email: bob94c9858f@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true -<<<<<<< HEAD -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 08:03:00 Z -======= :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 03:22:42 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + created_at: 2010-11-23 10:51:32 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -1067,163 +687,88 @@ data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 -======= - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 113 gender: diaspora_handle: birthday: -<<<<<<< HEAD - last_name: Grimm93572cb5 + last_name: Grimm942af802 bio: - first_name: Robert9334ab75 - updated_at: 2010-11-23 08:03:00 Z -======= - last_name: Grimm931041f1 - bio: - first_name: Robert933a0614 - updated_at: 2010-11-23 03:22:42 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + first_name: Robert9434af60 + updated_at: 2010-11-23 10:51:32 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 114 - url: http://google-93888f53.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAM+G59ysHdeOSKtae9KyqGTMakj12L56QWQbmRCeSFey66kyw4RzkGG7 - eFMEZXCmOtJkkQUKWP3Txys2YweZaRubxkDeDCSr66rYLQRrgDIrzG6exrVbpeA6 - EEVX+v2IcSmAjqjTyzm7IQyXK4wwKX7kzvRHyWf229sGyk5a4LATAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id008 !ruby/object:BSON::ObjectId - data: - - 76 - - 235 - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 112 - diaspora_handle: bob92a84451@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$ScX4hDPEXy8dI2MvilARFO2nDo3PQaFGuYrTLE4lCJ4YWHJQAXcjS -======= - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 114 - url: http://google-93681413.com/ + url: http://google-94e249d7.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE - sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2 - 7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE= + MIGJAoGBANpmDvhJvV51PwcqWC0iu4K3KCx2pPbVDh8uIQZYDIMjvZuXjUOJ3God + VCcP2M1RVPOSmeVI2KgENd5Dv7ndT24OAGWw2RbFshe06hpXywGmY1NuSO2XhjLZ + Fs7709DFKq3hZhk6RfPy+a/CDGOGJCOPhNEOxJxqU2GmXl8U6vMxAgMBAAE= -----END RSA PUBLIC KEY----- - owner_id: *id008 - diaspora_handle: bob92e2a817@example.org + owner_id: *id009 + diaspora_handle: bob93787fca@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$aOMrEZnL9IyRJ1bkzQdxCujWR9AF7Q6jNc7PkqwJlNH2rUiLz5ltK ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + encrypted_password: $2a$10$Rlla6EbKx.vHPFtoezNwRuUsXq7lbcSkrrUAWMQLLkdEiTLEGwbVO serialized_private_key: *id002 pending_request_ids: [] last_sign_in_ip: -<<<<<<< HEAD invites: 5 - _id: *id008 - last_sign_in_at: - username: bob92a84451 -======= - invites: 0 - _id: &id009 !ruby/object:BSON::ObjectId + _id: &id010 !ruby/object:BSON::ObjectId data: - 76 - 235 - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 115 last_sign_in_at: - username: bob9396970f ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + username: bob9431a68b language: en sign_in_count: 0 visible_person_ids: [] -<<<<<<< HEAD - password_salt: $2a$10$ScX4hDPEXy8dI2MvilARFO -======= - password_salt: $2a$10$aOMrEZnL9IyRJ1bkzQdxCu ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + password_salt: $2a$10$Rlla6EbKx.vHPFtoezNwRu remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: -<<<<<<< HEAD - email: bob93239865@pivotallabs.com -======= - email: bob9440233b@pivotallabs.com ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + email: bob954a2246@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true -<<<<<<< HEAD -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 08:03:00 Z -======= :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 03:22:42 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + created_at: 2010-11-23 10:51:32 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -1231,163 +776,88 @@ data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 -======= - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 116 gender: diaspora_handle: birthday: -<<<<<<< HEAD - last_name: Grimm941c32cf + last_name: Grimm954bfcbc bio: - first_name: Robert94f06768 - updated_at: 2010-11-23 08:03:00 Z -======= - last_name: Grimm94b2b4d0 - bio: - first_name: Robert943e2645 - updated_at: 2010-11-23 03:22:42 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + first_name: Robert95754d7f + updated_at: 2010-11-23 10:51:32 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 117 - url: http://google-947a4701.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAM+G59ysHdeOSKtae9KyqGTMakj12L56QWQbmRCeSFey66kyw4RzkGG7 - eFMEZXCmOtJkkQUKWP3Txys2YweZaRubxkDeDCSr66rYLQRrgDIrzG6exrVbpeA6 - EEVX+v2IcSmAjqjTyzm7IQyXK4wwKX7kzvRHyWf229sGyk5a4LATAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id009 !ruby/object:BSON::ObjectId - data: - - 76 - - 235 - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 115 - diaspora_handle: bob93876ba3@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$vxMxLozMdv/ufLb5x1OEyeoOY6mtM7soOhBseJJ2P/jfeg1DYFpE. -======= - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 117 - url: http://google-94723257.com/ + url: http://google-952d460f.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE - sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2 - 7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE= + MIGJAoGBANpmDvhJvV51PwcqWC0iu4K3KCx2pPbVDh8uIQZYDIMjvZuXjUOJ3God + VCcP2M1RVPOSmeVI2KgENd5Dv7ndT24OAGWw2RbFshe06hpXywGmY1NuSO2XhjLZ + Fs7709DFKq3hZhk6RfPy+a/CDGOGJCOPhNEOxJxqU2GmXl8U6vMxAgMBAAE= -----END RSA PUBLIC KEY----- - owner_id: *id009 - diaspora_handle: bob9396970f@example.org + owner_id: *id010 + diaspora_handle: bob9431a68b@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$BOw4AZqQh1BuGobw0Yjm7usu7Vawwe.8/GeHZqinTv6fKf8uTho16 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + encrypted_password: $2a$10$0UqK69Ayb/BFiVTOBAziyOcmaZEUseSrOeclpwkecXkjoxUqWZeHq serialized_private_key: *id002 pending_request_ids: [] last_sign_in_ip: -<<<<<<< HEAD invites: 5 - _id: *id009 - last_sign_in_at: - username: bob93876ba3 -======= - invites: 0 - _id: &id010 !ruby/object:BSON::ObjectId + _id: &id011 !ruby/object:BSON::ObjectId data: - 76 - 235 - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 118 last_sign_in_at: - username: bob94eedf8e ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + username: bob9580125b language: en sign_in_count: 0 visible_person_ids: [] -<<<<<<< HEAD - password_salt: $2a$10$vxMxLozMdv/ufLb5x1OEye -======= - password_salt: $2a$10$BOw4AZqQh1BuGobw0Yjm7u ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + password_salt: $2a$10$0UqK69Ayb/BFiVTOBAziyO remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: -<<<<<<< HEAD - email: bob945371dc@pivotallabs.com -======= - email: bob95b12902@pivotallabs.com ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + email: bob965d2983@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true -<<<<<<< HEAD -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 08:03:00 Z -======= :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 03:22:42 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + created_at: 2010-11-23 10:51:32 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -1395,287 +865,44 @@ data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 -======= - - 51 - - 130 - - 213 + - 156 + - 180 - 82 - - 57 - - 43 - - 90 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 119 gender: diaspora_handle: birthday: -<<<<<<< HEAD - last_name: Grimm9587d9a5 + last_name: Grimm968e7541 bio: - first_name: Robert95f0439f - updated_at: 2010-11-23 08:03:00 Z -======= - last_name: Grimm958fa009 - bio: - first_name: Robert9595379d - updated_at: 2010-11-23 03:22:42 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + first_name: Robert963ee73d + updated_at: 2010-11-23 10:51:32 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 235 -<<<<<<< HEAD - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 + - 156 + - 180 + - 82 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - 120 - url: http://google-951b0b44.com/ + url: http://google-96554f97.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAM+G59ysHdeOSKtae9KyqGTMakj12L56QWQbmRCeSFey66kyw4RzkGG7 - eFMEZXCmOtJkkQUKWP3Txys2YweZaRubxkDeDCSr66rYLQRrgDIrzG6exrVbpeA6 - EEVX+v2IcSmAjqjTyzm7IQyXK4wwKX7kzvRHyWf229sGyk5a4LATAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id010 !ruby/object:BSON::ObjectId - data: - - 76 - - 235 - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 118 - diaspora_handle: bob94f0ec6b@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$BzTWhaVgvvB/IpWHpEZ3d.bmv0t5VXCtIOu1eqMUWYWFBMh4C39IK -======= - - 51 - - 130 - - 213 - - 82 - - 57 - - 43 - - 90 - - 0 - - 1 - - 120 - url: http://google-950a0f66.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE - sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2 - 7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: *id010 - diaspora_handle: bob94eedf8e@example.org -- :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$JVCtL1.u/PQRxXEb/cOlueIv/WskopchVd5JUv6livW2HTqja.5Gq ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed - serialized_private_key: *id002 - pending_request_ids: [] - - last_sign_in_ip: -<<<<<<< HEAD - invites: 5 - _id: *id010 - last_sign_in_at: - username: bob94f0ec6b -======= - invites: 0 - _id: &id011 !ruby/object:BSON::ObjectId - data: - - 76 - - 235 - - 51 - - 130 - - 213 - - 82 - - 57 - - 43 - - 90 - - 0 - - 1 - - 121 - last_sign_in_at: - username: bob956b4c23 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed - language: en - sign_in_count: 0 - visible_person_ids: [] - -<<<<<<< HEAD - password_salt: $2a$10$BzTWhaVgvvB/IpWHpEZ3d. -======= - password_salt: $2a$10$JVCtL1.u/PQRxXEb/cOlue ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed - remember_token: - reset_password_token: - current_sign_in_ip: - remember_created_at: - current_sign_in_at: - invitation_sent_at: -<<<<<<< HEAD - email: bob956abea5@pivotallabs.com -======= - email: bob96970228@pivotallabs.com ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed - invitation_token: - visible_post_ids: [] - - getting_started: true -<<<<<<< HEAD -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 08:03:00 Z -======= - :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 03:22:42 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed - profile: !map:ActiveSupport::HashWithIndifferentAccess - searchable: true - image_url: - _id: !ruby/object:BSON::ObjectId - data: - - 76 - - 235 -<<<<<<< HEAD - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 -======= - - 51 - - 130 - - 213 - - 82 - - 57 - - 43 - - 90 ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed - - 0 - - 1 - - 122 - gender: - diaspora_handle: - birthday: -<<<<<<< HEAD - last_name: Grimm963be886 - bio: - first_name: Robert9665b010 - updated_at: 2010-11-23 08:03:00 Z -======= - last_name: Grimm967e5b5d - bio: - first_name: Robert96512d67 - updated_at: 2010-11-23 03:22:42 Z ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed - _id: !ruby/object:BSON::ObjectId - data: - - 76 - - 235 -<<<<<<< HEAD - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 123 - url: http://google-96685714.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAM+G59ysHdeOSKtae9KyqGTMakj12L56QWQbmRCeSFey66kyw4RzkGG7 - eFMEZXCmOtJkkQUKWP3Txys2YweZaRubxkDeDCSr66rYLQRrgDIrzG6exrVbpeA6 - EEVX+v2IcSmAjqjTyzm7IQyXK4wwKX7kzvRHyWf229sGyk5a4LATAgMBAAE= - -----END RSA PUBLIC KEY----- - - owner_id: &id011 !ruby/object:BSON::ObjectId - data: - - 76 - - 235 - - 117 - - 52 - - 55 - - 219 - - 91 - - 40 - - 113 - - 0 - - 1 - - 121 - diaspora_handle: bob95aa81c1@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$4oW4dUuMs6ELZFxTmD9ok./M84AdkUl0ExNQgUwYFZxq3JBE/TsFG - serialized_private_key: *id002 - pending_request_ids: [] - - last_sign_in_ip: - invites: 5 - _id: *id011 - last_sign_in_at: - username: bob95aa81c1 - language: en - sign_in_count: 0 - visible_person_ids: [] - - password_salt: $2a$10$4oW4dUuMs6ELZFxTmD9ok. - remember_token: - reset_password_token: - current_sign_in_ip: - remember_created_at: - current_sign_in_at: - invitation_sent_at: - email: bob962bf01f@pivotallabs.com - invitation_token: - visible_post_ids: [] - - getting_started: true -======= - - 51 - - 130 - - 213 - - 82 - - 57 - - 43 - - 90 - - 0 - - 1 - - 123 - url: http://google-9657e899.com/ - serialized_public_key: | - -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE - sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2 - 7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE= + MIGJAoGBANpmDvhJvV51PwcqWC0iu4K3KCx2pPbVDh8uIQZYDIMjvZuXjUOJ3God + VCcP2M1RVPOSmeVI2KgENd5Dv7ndT24OAGWw2RbFshe06hpXywGmY1NuSO2XhjLZ + Fs7709DFKq3hZhk6RfPy+a/CDGOGJCOPhNEOxJxqU2GmXl8U6vMxAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id011 - diaspora_handle: bob956b4c23@example.org ->>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed + diaspora_handle: bob9580125b@example.org