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 000000000..7d7c6aefe Binary files /dev/null and b/public/images/modern_browsers.png differ diff --git a/public/images/services/facebook_sign_in.png b/public/images/services/facebook_sign_in.png new file mode 100644 index 000000000..4e7766bca Binary files /dev/null and b/public/images/services/facebook_sign_in.png differ diff --git a/public/images/services/twitter_sign_in.png b/public/images/services/twitter_sign_in.png new file mode 100644 index 000000000..297bb0340 Binary files /dev/null and b/public/images/services/twitter_sign_in.png differ diff --git a/public/javascripts/view.js b/public/javascripts/view.js index 5745ecb12..f6a7af982 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -13,7 +13,7 @@ $(document).ready(function(){ $('#flash_notice, #flash_error, #flash_alert').animate({ top: 0 - }).delay(4000).animate({ + }).delay(2000).animate({ top: -100 }, $(this).remove()); diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 7100f57ad..058395e4c 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -829,6 +829,20 @@ label :-moz-border-radius 5px :border-radius 5px + &.closed + &:hover + :background + :color #fafafa + + h4 + :color #777 + + img + :opacity 0.7 + + .content_creation + :display none + form :position relative :top 0 @@ -883,8 +897,6 @@ label :top 15px :bottom 5px :position relative - :background - :color #eee :margin :bottom -12px diff --git a/spec/fixtures/users.yaml b/spec/fixtures/users.yaml index 830409f5d..cf8fcfcf8 100644 --- a/spec/fixtures/users.yaml +++ b/spec/fixtures/users.yaml @@ -1,67 +1,62 @@ --- :users: -<<<<<<< HEAD -- :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-23 08:02:59 Z -======= - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$4r9IZFg5lQJa/V8b9JprIeT798GLSclxM9vzJtNVGBgBw1qGPEe42 + encrypted_password: $2a$10$AAarOlWBKSWTuloEGyDTBOhrY8m0EcJwqj/IcH7s0ovXwBAxQ8Moe serialized_private_key: &id002 | -----BEGIN RSA PRIVATE KEY----- - MIICXAIBAAKBgQCsXQb71gx3LgeAQBrNGFIPiY7QLPkRozxJLw4Kwbc3FcQefmQU - jzGhBLGQTgmVc26CdGuqjzJj6owawp/5cpscpexX0Rd3ODSHqM0mdHAKIuF8IyQL - IRrftu7m6SvxI2uhzqTXtuCG9kJ4pLjEYo1vldBM1PvuE78nshgOfHzDwQIDAQAB - AoGATzNH3DxU6gaKh9Hs/sToIB+TMfEYWZRqRS6MA0FUEMm9nk1xa0kJAvYHKUnS - eYvbAbLBLlQyUVsbGcjIfXS99MDa3/FI0iCwQJ2+DEl2ZA7IGkqNaDBwsD6Vfoqx - Y3RqyDukjL5kfObdy6OiqP5bq+7YFwRstOUF+DduAIooQAECQQDZEGGL/wnAW3bX - vdE2jbwgYf/6q0HENzRFDmLXRXKb3YtvVxrrSfIxbXHvG597XfJ+LE4/OHNnWezs - 9Q8GAsyBAkEAy0f8fcYXdXs8u6YOVI8ZyVXwmYELE70wL6Ojkrm+W11anWwq+kPw - q6VqiInxh/w98TuWBJo0OBxqjQuJCsdXQQJAcZdY9OIqQDedIZl7+oiBgpDGXG9y - ozQgbmLw5qa5K0fsx/9VXvv7elJD5VUXSIAJfm3BJORtwBAXJIm5qvOcAQJBAMjT - GD2FOt3EXy6fEZ82NGp0bZqpIrFggT8/MbUdrVKDuqa1GwxdnGFmrQWxCZ2nc+Zj - UITBdv9MC3PGRqAQaUECQGp/8X828cHno0glsfMqgqUZT0CFp6jgwyyFLm4avhEe - isZr45pbC0PL9OF7lb3VFn7zrzBXLGTP2Jez51mHw2Y= + MIICXAIBAAKBgQDaZg74Sb1edT8HKlgtIruCtygsdqT21Q4fLiEGWAyDI72bl41D + idxqHVQnD9jNUVTzkpnlSNioBDXeQ7+53U9uDgBlsNkWxbIXtOoaV8sBpmNTbkjt + l4Yy2RbO+9PQxSqt4WYZOkXz8vmvwgxjhiQjj4TRDsScalNhpl5fFOrzMQIDAQAB + AoGBAJF6YEhlnj34bbaRL1FJjIwjAyCzG2nMO+7rJFZ8ekE0oo2tIw01HNyWksK+ + XJVPsv3YzqiboK4yt8tJZ8IgOFKE4UGE/72og/pzQ2reUt894nV2tLRimlJVNbvk + AjaFXZoF/yPpNVvBWptSpdVtr995sClenWz4E/k68pC6tOq9AkEA8wo171pXawkx + 3mfc57YVfXZUvQ5QgKIMS6Q8f+ZEn1QdmlqpkyR4HpE/lO3CEwXJ1AEaeQvXTuf0 + ifEc2mrgPwJBAOYLdxqF9mBGHb7UfW3X2AwWatOUij79+IuJEokTI7Wk7tJn0Jje + GU0/piMDyLmLndLnJUcwqkmPJ52Fi0ncUI8CQBTz4mZ6MWMm7cewyJipV/zzAKcz + 3rjYP5sd06FrJqtdwxeVjV0EHd70wriCLuMY8qd2WOPqo2tIEAr8YHJsGF0CQBTx + CkCh3VHaUC7lDR4IviQrjkIAja06VXvuWH+d/Gw2vX7t8HFaFpePqcIaQBWT/iQK + 4rveVEIqBAM0+v8YTUUCQEvdqE8E8fTZrMvJadcSK3rEXq+DgaQ/knqjvABT1LQY + rTazCsjw3mE9x6aAATeWgx7o6Z4wM0/xegVg6xeX0nE= -----END RSA PRIVATE KEY----- pending_request_ids: [] last_sign_in_ip: - invites: 0 + invites: 5 _id: &id001 !ruby/object:BSON::ObjectId data: - 76 - 235 - - 51 - - 129 - - 213 + - 156 + - 179 - 82 - - 57 - - 43 - - 90 + - 222 + - 181 + - 58 + - 130 - 0 - 1 - - 94 + - 91 last_sign_in_at: - username: bob86b506ff + username: bob86a08485 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$4r9IZFg5lQJa/V8b9JprIe + password_salt: $2a$10$AAarOlWBKSWTuloEGyDTBO remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob873ed87b@pivotallabs.com + email: bob875e73fa@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :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: @@ -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