[DRE-commits] [diaspora] 02/07: Merge tag 'upstream/0.5.1.2+debian'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Wed Jul 8 14:12:18 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository diaspora.
commit 3947bb219052cd66c2ac68fbfa7aed81aa7c45b9
Merge: 4b384f0 870f78d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Wed Jul 8 19:09:59 2015 +0530
Merge tag 'upstream/0.5.1.2+debian'
Upstream version 0.5.1.2+debian
# gpg: Signature made Wednesday 08 July 2015 07:09:46 PM IST using RSA key ID 4512C22A
# gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
# gpg: aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
# gpg: aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
# gpg: aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
# gpg: aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"
.gitignore | 1 +
.rubocop.yml | 17 +-
.travis.yml | 1 +
COPYRIGHT | 5 +
Changelog.md | 96 +++
Gemfile | 98 ++-
Procfile | 3 +-
README.md | 1 +
app/assets/images/add_contact_button.png | Bin 253 -> 0 bytes
app/assets/images/ajax-loader_inverted.gif | Bin 1487 -> 0 bytes
app/assets/images/asterisk_white.png | Bin 3010 -> 0 bytes
app/assets/images/branding/asterisk.png | Bin 2353 -> 0 bytes
app/assets/images/branding/asterisk_white.png | Bin 3010 -> 0 bytes
app/assets/images/branding/ball_small.png | Bin 53983 -> 0 bytes
app/assets/images/branding/logo_white.png | Bin 1488 -> 0 bytes
app/assets/images/branding/logo_white2x.png | Bin 3020 -> 0 bytes
app/assets/images/branding/logo_white4x.png | Bin 2723 -> 0 bytes
.../images/{ => branding/logos}/asterisk.png | Bin
.../images/branding/{ => logos}/header-logo.png | Bin
.../images/branding/{ => logos}/header-logo2x.png | Bin
.../branding/{ => logos}/header-logo_hover.png | Bin
app/assets/images/branding/{ => logos}/logo.png | Bin
.../images/branding/{ => logos}/logo_small.png | Bin
.../branding/{ => logos}/powered_by_diaspora.png | Bin
app/assets/images/branding/{ => logos}/white2x.png | Bin
app/assets/images/branding/white_on_grey.png | Bin 3576 -> 0 bytes
app/assets/images/buttons/back_hov at 2x.png | Bin 8548 -> 0 bytes
app/assets/images/buttons/bday at 2x-white.png | Bin 1240 -> 0 bytes
app/assets/images/buttons/bday at 2x.png | Bin 1242 -> 0 bytes
app/assets/images/buttons/close at 2x.png | Bin 8519 -> 0 bytes
app/assets/images/buttons/delete.png | Bin 3347 -> 0 bytes
app/assets/images/buttons/delete_hover.png | Bin 3399 -> 0 bytes
app/assets/images/buttons/done_hov at 2x.png | Bin 8316 -> 0 bytes
app/assets/images/buttons/edit2 at 2x.png | Bin 3562 -> 0 bytes
app/assets/images/buttons/facebook_hov at 2x.png | Bin 3507 -> 0 bytes
app/assets/images/buttons/next_hov at 2x.png | Bin 8667 -> 0 bytes
.../images/buttons/service-icons/fb at 2x-white.png | Bin 1107 -> 0 bytes
app/assets/images/buttons/service-icons/fb at 2x.png | Bin 1129 -> 0 bytes
.../buttons/service-icons/tumblr at 2x-white.png | Bin 1189 -> 0 bytes
.../images/buttons/service-icons/tumblr at 2x.png | Bin 1197 -> 0 bytes
.../buttons/service-icons/twitter at 2x-white.png | Bin 1225 -> 0 bytes
.../images/buttons/service-icons/twitter at 2x.png | Bin 1238 -> 0 bytes
app/assets/images/buttons/templates/Fridge at 2x.png | Bin 3165 -> 0 bytes
app/assets/images/buttons/templates/Typist at 2x.png | Bin 9284 -> 0 bytes
app/assets/images/buttons/templates/Vanilla at 2x.png | Bin 6618 -> 0 bytes
.../images/buttons/templates/Wallpaper at 2x.png | Bin 11928 -> 0 bytes
app/assets/images/buttons/tumblr_hov at 2x.png | Bin 3935 -> 0 bytes
app/assets/images/buttons/twitter_hov at 2x.png | Bin 5414 -> 0 bytes
app/assets/images/down-tick-inset.png | Bin 461 -> 0 bytes
app/assets/images/facebox/closelabel.png | Bin 168 -> 0 bytes
app/assets/images/facebox/loading.gif | Bin 2767 -> 0 bytes
app/assets/images/icons/arrow_down.png | Bin 837 -> 0 bytes
app/assets/images/icons/back_white.png | Bin 317 -> 0 bytes
app/assets/images/icons/bookmark.png | Bin 3152 -> 0 bytes
app/assets/images/icons/check_yes_ok_lighter.png | Bin 359 -> 0 bytes
app/assets/images/icons/check_yes_ok_white.png | Bin 199 -> 0 bytes
app/assets/images/icons/coffee.png | Bin 309 -> 0 bytes
app/assets/images/icons/comment_mobile_grey.png | Bin 770 -> 0 bytes
app/assets/images/icons/compose_mobile2.png | Bin 2438 -> 0 bytes
app/assets/images/icons/create_participation.png | Bin 1330 -> 0 bytes
app/assets/images/icons/deletelabel.png | Bin 203 -> 0 bytes
app/assets/images/icons/destroy_participation.png | Bin 1405 -> 0 bytes
app/assets/images/icons/globe.png | Bin 3300 -> 0 bytes
app/assets/images/icons/heart.png | Bin 775 -> 0 bytes
app/assets/images/icons/home_grey.png | Bin 1371 -> 0 bytes
app/assets/images/icons/ignoreuser.png | Bin 455 -> 0 bytes
app/assets/images/icons/list_white.png | Bin 474 -> 0 bytes
app/assets/images/icons/mail.png | Bin 415 -> 0 bytes
app/assets/images/icons/mail_big.png | Bin 6494 -> 0 bytes
app/assets/images/icons/marker.png | Bin 969 -> 0 bytes
app/assets/images/icons/mention.png | Bin 441 -> 0 bytes
app/assets/images/icons/message.png | Bin 361 -> 0 bytes
app/assets/images/icons/monotone_add_plus.png | Bin 202 -> 0 bytes
app/assets/images/icons/monotone_check_yes.png | Bin 678 -> 0 bytes
.../images/icons/monotone_close_exit_delete.png | Bin 773 -> 0 bytes
.../images/icons/monotone_email_letter_round.png | Bin 997 -> 0 bytes
app/assets/images/icons/monotone_pen_write.png | Bin 715 -> 0 bytes
.../images/icons/monotone_plus_add_round.png | Bin 748 -> 0 bytes
app/assets/images/icons/monotone_question.png | Bin 714 -> 0 bytes
.../images/icons/monotone_wrench_settings.png | Bin 521 -> 0 bytes
app/assets/images/icons/my_activity.png | Bin 663 -> 0 bytes
app/assets/images/icons/padlock-closed.png | Bin 661 -> 0 bytes
app/assets/images/icons/padlock-open.png | Bin 804 -> 0 bytes
app/assets/images/icons/pencil.png | Bin 727 -> 0 bytes
.../images/icons/pencil_mobile_grey_mobile.png | Bin 871 -> 0 bytes
app/assets/images/icons/photo.png | Bin 2801 -> 0 bytes
app/assets/images/icons/plus.png | Bin 365 -> 0 bytes
app/assets/images/icons/question.png | Bin 479 -> 0 bytes
app/assets/images/icons/report.png | Bin 173 -> 0 bytes
app/assets/images/icons/search_grey.png | Bin 311 -> 0 bytes
app/assets/images/icons/search_white.png | Bin 533 -> 0 bytes
app/assets/images/icons/user_grey.png | Bin 3019 -> 0 bytes
app/assets/images/icons/users.png | Bin 497 -> 0 bytes
app/assets/images/invalid_fat at 2x.png | Bin 1818 -> 0 bytes
app/assets/images/{icons => landing}/cog.png | Bin
app/assets/images/landing/github.png | Bin 7345 -> 0 bytes
app/assets/images/landing/lock.png | Bin 1317 -> 0 bytes
app/assets/images/{icons => landing}/pen_write.png | Bin
.../images/{icons => landing}/smiley_laughing.png | Bin
app/assets/images/landing/title.png | Bin 2933 -> 0 bytes
app/assets/images/landing/world.png | Bin 5884 -> 0 bytes
app/assets/images/{ => mobile}/arrow-left.png | Bin
app/assets/images/{ => mobile}/arrow-right.png | Bin
.../images/{icons => mobile}/arrow_down_small.png | Bin
.../images/{icons => mobile}/arrow_up_small.png | Bin
.../{icons => mobile}/asterisk_white_mobile.png | Bin
app/assets/images/{icons => mobile}/camera.png | Bin
.../images/{icons => mobile}/check_yes_ok.png | Bin
.../images/{icons => mobile}/compose_mobile.png | Bin
app/assets/images/{ => mobile}/deletelabel.png | Bin
.../images/{texture => mobile}/hatched-light.jpg | Bin
.../images/{icons => mobile}/heart_mobile_grey.png | Bin
.../images/{icons => mobile}/heart_mobile_red.png | Bin
app/assets/images/{icons => mobile}/mail_white.png | Bin
app/assets/images/{icons => mobile}/menu.png | Bin
.../{icons => mobile}/notifications_white.png | Bin
.../{icons => mobile}/pencil_mobile_grey.png | Bin
.../pencil_mobile_grey_active.png | Bin
.../images/{icons => mobile}/reshare_mobile.png | Bin
.../{icons => mobile}/reshare_mobile_active.png | Bin
app/assets/images/mocks/bp.jpeg | Bin 265555 -> 0 bytes
app/assets/images/mocks/user_pic.jpeg | Bin 6250 -> 0 bytes
app/assets/images/pen_white.png | Bin 1716 -> 0 bytes
app/assets/images/services/facebook_sign_in.png | Bin 4458 -> 0 bytes
app/assets/images/services/twitter_sign_in.png | Bin 2201 -> 0 bytes
app/assets/images/signupimages at 2x_mini.jpg | Bin 121448 -> 0 bytes
app/assets/images/social_media_logos/Readme.txt | 3 +
.../images/social_media_logos/email-16x16.png | Bin 345 -> 0 bytes
.../images/social_media_logos/email-24x24.png | Bin 627 -> 0 bytes
.../images/social_media_logos/email-32x32.png | Bin 889 -> 0 bytes
.../images/social_media_logos/email-48x48.png | Bin 1531 -> 0 bytes
.../images/social_media_logos/facebook-48x48.png | Bin 2075 -> 0 bytes
.../images/social_media_logos/feed-16x16.png | Bin 598 -> 0 bytes
.../images/social_media_logos/feed-24x24.png | Bin 1061 -> 0 bytes
.../images/social_media_logos/feed-32x32.png | Bin 1502 -> 0 bytes
.../images/social_media_logos/feed-48x48.png | Bin 2612 -> 0 bytes
.../images/social_media_logos/tumblr-48x48.png | Bin 2086 -> 0 bytes
.../images/social_media_logos/twitter-48x48.png | Bin 2263 -> 0 bytes
.../images/social_media_logos/website-16x16.png | Bin 742 -> 0 bytes
.../images/social_media_logos/website-24x24.png | Bin 1199 -> 0 bytes
.../images/social_media_logos/website-32x32.png | Bin 1768 -> 0 bytes
.../images/social_media_logos/website-48x48.png | Bin 3105 -> 0 bytes
.../images/social_media_logos/wordpress-48x48.png | Bin 2486 -> 0 bytes
app/assets/images/texture/hatched-dark.png | Bin 59952 -> 0 bytes
app/assets/images/texture/light-bg.png | Bin 4064 -> 0 bytes
app/assets/images/texture/paper.jpg | Bin 68035 -> 0 bytes
app/assets/images/texture/typist.png | Bin 25475 -> 0 bytes
app/assets/images/texture/vanilla.jpg | Bin 20031 -> 0 bytes
app/assets/images/tipsy.gif | Bin 58 -> 0 bytes
app/assets/images/up-tick-inset.png | Bin 435 -> 0 bytes
app/assets/images/user/angela.jpg | Bin 31366 -> 0 bytes
app/assets/javascripts/app/collections/aspects.js | 2 +-
.../javascripts/app/helpers/handlebars-helpers.js | 30 +-
.../javascripts/app/helpers/text_formatter.js | 20 +-
app/assets/javascripts/app/models/aspect.js | 6 +-
.../app/models/{aspect.js => aspect_selection.js} | 6 +-
app/assets/javascripts/app/models/person.js | 2 +-
app/assets/javascripts/app/models/post.js | 8 -
app/assets/javascripts/app/models/stream.js | 2 +-
app/assets/javascripts/app/pages/contacts.js | 33 +-
app/assets/javascripts/app/pages/profile.js | 4 +-
app/assets/javascripts/app/pages/registration.js | 10 +
app/assets/javascripts/app/pages/settings.js | 7 +
.../javascripts/app/pages/single-post-viewer.js | 4 +-
app/assets/javascripts/app/router.js | 10 +
.../javascripts/app/views/aspect_create_view.js | 63 ++
.../app/views/aspect_membership_view.js | 15 +-
.../javascripts/app/views/aspects_list_view.js | 20 +-
app/assets/javascripts/app/views/content_view.js | 3 +-
.../app/views/conversations_form_view.js | 20 +-
.../javascripts/app/views/conversations_view.js | 34 +-
app/assets/javascripts/app/views/help_view.js | 2 +-
.../app/views/notification_dropdown_view.js | 2 +-
app/assets/javascripts/app/views/publisher_view.js | 6 +-
.../single-post-viewer/single_post_moderation.js | 4 +-
.../javascripts/app/views/stream_post_views.js | 4 +-
app/assets/javascripts/inbox.js | 2 +-
app/assets/javascripts/main.js | 9 +-
app/assets/javascripts/mobile/mobile.js | 1 +
app/assets/javascripts/mobile/profile_aspects.js | 12 +-
app/assets/javascripts/mobile/tag_following.js | 65 ++
app/assets/stylesheets/application.scss | 3 +-
app/assets/stylesheets/aspects.scss | 15 -
app/assets/stylesheets/contacts.scss | 1 +
app/assets/stylesheets/footer.scss | 2 +-
app/assets/stylesheets/mobile/mobile.scss | 24 +-
app/assets/stylesheets/mobile/tags.scss | 28 +
app/assets/stylesheets/new_styles/_login.scss | 2 +-
app/assets/stylesheets/new_styles/_settings.scss | 2 +
app/assets/stylesheets/new_styles/_typography.scss | 6 +-
app/assets/stylesheets/publisher.scss | 10 +-
app/assets/stylesheets/single-post-view.scss | 5 +
app/assets/stylesheets/sprites.scss | 4 +-
app/assets/stylesheets/stream_element.scss | 6 +-
.../{autoSuggest.css.erb => autoSuggest.css} | 2 +-
app/assets/stylesheets/vendor/facebox.css | 72 --
.../templates/aspect_create_modal_tpl.jst.hbs | 40 +
app/assets/templates/aspects-list_tpl.jst.hbs | 5 +-
app/assets/templates/header_tpl.jst.hbs | 2 +-
app/assets/templates/profile_header_tpl.jst.hbs | 12 +-
app/assets/templates/reshare_tpl.jst.hbs | 25 +-
app/assets/templates/status-message_tpl.jst.hbs | 14 +-
app/controllers/application_controller.rb | 12 +-
app/controllers/aspects_controller.rb | 47 +-
app/controllers/conversations_controller.rb | 40 +-
app/controllers/home_controller.rb | 8 +-
app/controllers/messages_controller.rb | 3 +-
app/controllers/people_controller.rb | 40 +-
app/controllers/publics_controller.rb | 8 +-
app/controllers/registrations_controller.rb | 4 +-
app/controllers/services_controller.rb | 2 +-
app/controllers/status_messages_controller.rb | 5 -
app/controllers/tag_followings_controller.rb | 6 +
app/controllers/users_controller.rb | 2 +-
app/helpers/layout_helper.rb | 2 -
app/helpers/notifications_helper.rb | 14 +-
app/helpers/notifier_helper.rb | 4 +-
app/helpers/open_graph_helper.rb | 9 +-
app/mailers/maintenance.rb | 9 +-
app/mailers/notification_mailers/also_commented.rb | 6 +-
app/mailers/notification_mailers/base.rb | 24 +-
.../notification_mailers/comment_on_post.rb | 6 +-
app/models/aspect.rb | 4 +
app/models/conversation.rb | 8 +-
app/models/mention.rb | 2 +-
app/models/person.rb | 3 +-
app/models/post.rb | 13 +-
app/models/profile.rb | 43 +-
app/models/reshare.rb | 2 +-
app/models/services/facebook.rb | 4 +-
app/models/services/tumblr.rb | 2 +-
app/models/services/twitter.rb | 14 +-
app/models/services/wordpress.rb | 45 +-
app/models/status_message.rb | 5 +-
app/models/user.rb | 13 +-
app/models/user/connecting.rb | 4 +-
app/models/user/querying.rb | 2 +-
app/presenters/avatar_presenter.rb | 10 +-
app/presenters/contact_presenter.rb | 2 +-
app/presenters/person_presenter.rb | 43 +-
app/presenters/post_interaction_presenter.rb | 30 +
app/presenters/post_presenter.rb | 25 -
app/presenters/profile_presenter.rb | 26 +-
app/presenters/statistics_presenter.rb | 6 +-
app/views/admins/weekly_user_stats.haml | 2 +-
.../_aspect_membership_dropdown.haml | 7 +-
app/views/aspects/create.js.erb | 19 -
app/views/aspects/new.haml | 26 -
app/views/comments/_comment.mobile.haml | 2 +-
app/views/contacts/_aspect_listings.haml | 9 +-
app/views/contacts/_sidebar.html.haml | 18 +-
app/views/conversations/_conversation.haml | 15 +-
app/views/conversations/_conversation.mobile.haml | 12 +-
app/views/conversations/_show.mobile.haml | 2 +-
app/views/conversations/index.haml | 11 +-
app/views/conversations/index.mobile.haml | 7 +-
app/views/devise/passwords/edit.haml | 2 +-
app/views/devise/passwords/new.haml | 2 +-
app/views/errors/error_500.haml | 2 +-
app/views/home/default.haml | 8 +-
app/views/home/{show.html.haml => show.haml} | 2 +-
app/views/home/show.mobile.haml | 6 -
app/views/layouts/_footer.html.haml | 2 +-
app/views/layouts/_header.html.haml | 2 +-
app/views/layouts/application.mobile.haml | 13 +-
app/views/layouts/notifier.html.erb | 2 +-
app/views/notifier/invite.markerb | 2 +-
app/views/notifier/liked.markerb | 4 +
app/views/notifier/mentioned.markerb | 4 +
app/views/notifier/private_message.markerb | 2 +-
app/views/photos/show.mobile.haml | 4 +-
app/views/publisher/_publisher.mobile.haml | 4 +-
app/views/registrations/_form.haml | 10 +-
app/views/registrations/new.mobile.haml | 2 +-
app/views/reshares/_reshare.mobile.haml | 3 +-
app/views/services/_add_remove_services.haml | 25 +
app/views/services/index.html.haml | 2 +-
app/views/sessions/new.html.haml | 2 +-
app/views/sessions/new.mobile.haml | 35 +-
app/views/shared/_add_remove_services.haml | 19 -
app/views/shared/_post_info.mobile.haml | 2 +-
app/views/shared/_post_stats.mobile.haml | 8 +-
app/views/shared/_right_sections.html.haml | 5 +-
app/views/tag_followings/manage.mobile.haml | 18 +
app/views/tags/show.mobile.haml | 7 +
app/views/users/_close_account_modal.haml | 41 +
app/views/users/edit.html.haml | 43 +-
app/views/users/edit.mobile.haml | 60 +-
app/views/users/getting_started.mobile.haml | 4 +-
app/views/users/public.atom.builder | 2 +-
app/workers/base.rb | 19 +-
app/workers/fetch_webfinger.rb | 2 +-
app/workers/http_multi.rb | 2 +-
app/workers/mail/liked.rb | 5 +-
app/workers/notify_local_users.rb | 4 -
app/workers/queue_users_for_removal.rb | 4 +-
app/workers/receive_unencrypted_salmon.rb | 9 +-
config/defaults.yml | 17 +-
config/diaspora.yml.example | 31 +-
config/environments/development.rb | 6 +
config/environments/production.rb | 8 +-
config/eye.rb | 49 ++
config/initializers/devise.rb | 4 +-
config/initializers/jsroutes.rb | 4 +
config/initializers/load_libraries.rb | 4 -
config/initializers/omniauth.rb | 16 +-
config/initializers/open_graph_reader.rb | 1 +
config/initializers/sidekiq.rb | 20 +
config/initializers/silence_assets.rb | 16 -
config/load_config.rb | 44 +-
config/locales/devise/devise.hy.yml | 14 +-
config/locales/diaspora/ar.yml | 6 +-
config/locales/diaspora/art-nvi.yml | 5 -
config/locales/diaspora/az.yml | 1 -
config/locales/diaspora/bg.yml | 4 -
config/locales/diaspora/br.yml | 9 +-
config/locales/diaspora/bs.yml | 4 -
config/locales/diaspora/cs.yml | 51 +-
config/locales/diaspora/cy.yml | 3 -
config/locales/diaspora/da.yml | 132 +--
config/locales/diaspora/de.yml | 17 +-
config/locales/diaspora/de_formal.yml | 14 +-
config/locales/diaspora/el.yml | 5 -
config/locales/diaspora/en.yml | 33 +-
config/locales/diaspora/en_1337.yml | 4 -
config/locales/diaspora/en_pirate.yml | 5 -
config/locales/diaspora/en_shaw.yml | 4 -
config/locales/diaspora/en_valspeak.yml | 5 -
config/locales/diaspora/eo.yml | 4 -
config/locales/diaspora/es-AR.yml | 5 -
config/locales/diaspora/es-CL.yml | 4 -
config/locales/diaspora/es-MX.yml | 5 -
config/locales/diaspora/es.yml | 75 +-
config/locales/diaspora/eu.yml | 4 -
config/locales/diaspora/fi.yml | 21 +-
config/locales/diaspora/fr.yml | 165 ++--
config/locales/diaspora/gd.yml | 3 -
config/locales/diaspora/he.yml | 5 -
config/locales/diaspora/hi.yml | 11 +
config/locales/diaspora/hu.yml | 39 +-
config/locales/diaspora/hy.yml | 933 +++++++++++----------
config/locales/diaspora/ia.yml | 5 -
config/locales/diaspora/id.yml | 2 -
config/locales/diaspora/is.yml | 3 -
config/locales/diaspora/it.yml | 5 -
config/locales/diaspora/ja.yml | 4 -
config/locales/diaspora/ka.yml | 4 -
config/locales/diaspora/ko.yml | 4 -
config/locales/diaspora/lt.yml | 2 -
config/locales/diaspora/mk.yml | 2 -
config/locales/diaspora/ml.yml | 4 -
config/locales/diaspora/nb.yml | 5 -
config/locales/diaspora/nds.yml | 5 -
config/locales/diaspora/ne.yml | 3 -
config/locales/diaspora/nl.yml | 32 +-
config/locales/diaspora/nn.yml | 4 -
config/locales/diaspora/pa.yml | 2 -
config/locales/diaspora/pl.yml | 261 +++---
config/locales/diaspora/pt-BR.yml | 5 -
config/locales/diaspora/pt-PT.yml | 4 -
config/locales/diaspora/ro.yml | 8 +-
config/locales/diaspora/ru.yml | 5 -
config/locales/diaspora/si.yml | 3 -
config/locales/diaspora/sk.yml | 5 -
config/locales/diaspora/sl.yml | 4 -
config/locales/diaspora/sr.yml | 4 -
config/locales/diaspora/sv.yml | 66 +-
config/locales/diaspora/te.yml | 5 -
config/locales/diaspora/tr.yml | 4 -
config/locales/diaspora/uk.yml | 5 -
config/locales/diaspora/vi.yml | 4 -
config/locales/diaspora/zh-CN.yml | 4 -
config/locales/diaspora/zh-TW.yml | 5 -
config/locales/javascript/javascript.cs.yml | 12 +
config/locales/javascript/javascript.da.yml | 12 +
config/locales/javascript/javascript.de.yml | 9 +
config/locales/javascript/javascript.de_formal.yml | 2 +
config/locales/javascript/javascript.en.yml | 14 +
config/locales/javascript/javascript.es.yml | 12 +
config/locales/javascript/javascript.fi.yml | 6 +
config/locales/javascript/javascript.fr.yml | 12 +
config/locales/javascript/javascript.hy.yml | 104 ++-
config/locales/javascript/javascript.nl.yml | 12 +
config/locales/javascript/javascript.pl.yml | 24 +-
config/locales/javascript/javascript.ro.yml | 1 +
config/locales/javascript/javascript.sv.yml | 14 +-
config/logging.rb | 98 +++
config/routes.rb | 9 +-
config/unicorn.rb | 47 +-
...remove_deleted_aspects_from_auto_follow_back.rb | 11 +
.../20150403212139_fix_wrong_only_sharing.rb | 11 +
.../20150531005120_cleanup_default_avatars.rb | 10 +
db/migrate/20150607143809_fix_photo_public_flag.rb | 9 +
db/schema.rb | 2 +-
db/seeds.rb | 72 --
features/desktop/closes_account.feature | 6 +-
features/desktop/connects_users.feature | 4 +-
features/desktop/conversations.feature | 12 +
features/desktop/manages_aspects.feature | 18 +-
features/mobile/activity_stream.feature | 3 +-
.../{desktop => mobile}/closes_account.feature | 11 +-
features/mobile/conversations.feature | 3 +-
features/mobile/drawer.feature | 77 +-
features/mobile/edits_profile.feature | 3 +-
features/mobile/getting_started.feature | 5 +-
features/mobile/home.feature | 12 +
features/mobile/invitations.feature | 5 +-
features/mobile/logged_out_browsing.feature | 10 +-
features/mobile/multiphoto.feature | 6 +-
features/mobile/people_aspects.feature | 3 +-
features/mobile/posts_from_main_page.feature | 9 +-
features/mobile/reactions.feature | 3 +-
features/mobile/reshare.feature | 9 +-
features/mobile/signs_up.feature | 5 +-
features/mobile/tags.feature | 43 +-
features/step_definitions/aspects_steps.rb | 29 +
features/step_definitions/conversations_steps.rb | 18 +
features/step_definitions/custom_web_steps.rb | 8 +-
features/step_definitions/mobile_steps.rb | 20 -
features/support/env.rb | 28 +-
lib/configuration_methods.rb | 9 +-
lib/diaspora/encryptable.rb | 16 +-
lib/diaspora/exceptions.rb | 3 +
lib/diaspora/federated/base.rb | 10 +-
lib/diaspora/federated/relayable_retraction.rb | 11 +-
lib/diaspora/federated/request.rb | 5 +-
lib/diaspora/federated/retraction.rb | 13 +-
lib/diaspora/federated/shareable.rb | 110 +--
lib/diaspora/federated/signed_retraction.rb | 10 +-
lib/diaspora/fetcher/public.rb | 29 +-
lib/diaspora/logging.rb | 10 +
lib/diaspora/markdownify/email.rb | 20 +-
lib/diaspora/message_renderer.rb | 19 +-
lib/diaspora/parser.rb | 9 +-
lib/diaspora/relayable.rb | 3 +-
lib/diaspora/taggable.rb | 9 +
lib/evil_query.rb | 10 +-
lib/federated/generator.rb | 6 +-
lib/federation_logger.rb | 118 ---
lib/h_card.rb | 18 +-
lib/hydra_wrapper.rb | 10 +-
lib/postzord/dispatcher.rb | 21 +-
lib/postzord/receiver.rb | 20 +-
lib/postzord/receiver/local_batch.rb | 8 +-
lib/postzord/receiver/private.rb | 69 +-
lib/postzord/receiver/public.rb | 56 +-
lib/rack/chrome_frame.rb | 2 +-
lib/salmon/encrypted_slap.rb | 9 +-
lib/webfinger.rb | 14 +-
lib/webfinger_profile.rb | 6 +-
script/install.sh | 123 ---
script/install/defaults | 51 --
script/install/functions | 272 ------
script/install/path_sanitizer | 40 -
script/install/remote_var_reader | 13 -
script/install/setup | 177 ----
script/server | 73 +-
spec/controllers/aspects_controller_spec.rb | 105 ++-
spec/controllers/conversations_controller_spec.rb | 38 +-
spec/controllers/home_controller_spec.rb | 26 +-
spec/controllers/people_controller_spec.rb | 5 +
spec/controllers/sessions_controller_spec.rb | 8 +-
spec/controllers/tag_followings_controller_spec.rb | 32 +
spec/factories.rb | 62 +-
spec/helper_methods.rb | 3 +
spec/helpers/notifier_helper_spec.rb | 14 +-
.../javascripts/app/helpers/text_formatter_spec.js | 20 +
.../{aspect_spec.js => aspect_selection_spec.js} | 6 +-
spec/javascripts/app/models/person_spec.js | 48 +-
spec/javascripts/app/models/post_spec.js | 24 -
.../app/pages/single-post-viewer_spec.js | 12 +
.../app/views/aspect_create_view_spec.js | 190 +++++
spec/javascripts/app/views/aspect_view_spec.js | 2 +-
.../javascripts/app/views/bookmarklet_view_spec.js | 2 -
.../app/views/comment_stream_view_spec.js | 2 +-
spec/javascripts/app/views/content_view_spec.js | 15 +
.../app/views/conversations_view_spec.js | 83 +-
spec/javascripts/app/views/poll_view_spec.js | 1 -
spec/javascripts/app/views/publisher_view_spec.js | 8 +-
spec/javascripts/helpers/factory.js | 10 +-
spec/lib/configuration_methods_spec.rb | 71 +-
spec/lib/diaspora/federated/request_spec.rb | 27 +-
spec/lib/diaspora/fetcher/public_spec.rb | 20 +-
spec/lib/diaspora/markdownify_email_spec.rb | 6 +-
spec/lib/diaspora/message_renderer_spec.rb | 45 +-
spec/lib/diaspora/taggable_spec.rb | 59 ++
spec/lib/h_card_spec.rb | 43 +
spec/lib/hcard_spec.rb | 19 -
spec/lib/postzord/receiver/private_spec.rb | 25 +-
spec/lib/postzord/receiver/public_spec.rb | 19 +-
spec/lib/postzord/receiver_spec.rb | 49 +-
spec/lib/rack/chrome_frame_spec.rb | 16 +-
spec/mailers/notifier_spec.rb | 302 +++++--
spec/models/aspect_spec.rb | 7 +
spec/models/conversation_spec.rb | 9 +
spec/models/photo_spec.rb | 18 +-
spec/models/poll_participation_spec.rb | 4 +-
spec/models/post_spec.rb | 96 ++-
spec/models/profile_spec.rb | 63 +-
spec/models/reshare_spec.rb | 13 +
spec/models/services/twitter_spec.rb | 8 +-
spec/models/services/wordpress_spec.rb | 36 +-
spec/models/status_message_spec.rb | 10 +-
spec/models/user_spec.rb | 20 +-
spec/presenters/avatar_presenter_spec.rb | 22 +
spec/presenters/contact_presenter_spec.rb | 21 +-
spec/presenters/person_presenter_spec.rb | 4 +-
spec/presenters/post_ineraction_presenter_spec.rb | 36 +
spec/presenters/statistics_presenter_spec.rb | 138 ++-
spec/support/user_methods.rb | 7 +-
spec/workers/fetch_webfinger_spec.rb | 20 +
spec/workers/gather_o_embed_data_spec.rb | 7 +-
spec/workers/mail/liked_spec.rb | 38 +
spec/workers/queue_users_for_removal_spec.rb | 8 +
tmp/pids/.gitkeep | 0
vendor/assets/javascripts/facebox.js | 309 -------
vendor/assets/javascripts/jquery.elastic.js | 162 ----
517 files changed, 4817 insertions(+), 4191 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git
More information about the Pkg-ruby-extras-commits
mailing list