[DRE-commits] [diaspora] 01/14: Merge tag 'upstream/0.6.0.0+debian'

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Mon Sep 19 15:51:30 UTC 2016


This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora.

commit c9fd6067d927a2aeee6802c23b4ed35461370039
Merge: adcc348 7aeadae
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Sep 19 15:41:02 2016 +0530

    Merge tag 'upstream/0.6.0.0+debian'
    
    Upstream version 0.6.0.0+debian
    
    # gpg: Signature made Monday 19 September 2016 03:41:01 PM IST using RSA key ID CE1F9C674512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>" [ultimate]
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>" [ultimate]
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>" [ultimate]

 .codeclimate.yml                                   |   36 +
 .eslintrc                                          |  258 ++
 .gitignore                                         |   24 +-
 .haml-lint.yml                                     |    5 +
 .hound.yml                                         |    9 -
 .jshintignore                                      |    1 -
 .jshintrc                                          |    1 -
 .pronto.yml                                        |    4 +
 .rubocop.yml                                       |    4 +-
 .ruby-version                                      |    2 +-
 .scss-lint.yml                                     |  231 ++
 .travis.yml                                        |   20 +-
 CODE_OF_CONDUCT.md                                 |   80 +-
 Changelog.md                                       |  221 ++
 Gemfile                                            |  158 +-
 Gemfile.lock                                       |  767 +++---
 Guardfile                                          |    9 +-
 README.md                                          |   18 +-
 app/assets/images/ajax-loader.gif                  |  Bin 1737 -> 0 bytes
 .../logos}/asterisk_white_mobile.png               |  Bin
 app/assets/images/branding/logos/header-logo.png   |  Bin 3769 -> 0 bytes
 .../images/branding/logos/header-logo_hover.png    |  Bin 3931 -> 0 bytes
 .../images/branding/logos/powered_by_diaspora.png  |  Bin 1681 -> 0 bytes
 app/assets/images/branding/logos/white2x.png       |  Bin 3020 -> 0 bytes
 app/assets/images/dandelion.jpg                    |  Bin 0 -> 40773 bytes
 app/assets/images/favicon.ico                      |  Bin 1150 -> 0 bytes
 app/assets/images/fonts/Roboto-Bold.ttf            |  Bin 163448 -> 0 bytes
 app/assets/images/fonts/Roboto-Light.ttf           |  Bin 162636 -> 0 bytes
 app/assets/images/fonts/Roboto-Regular.ttf         |  Bin 158604 -> 0 bytes
 app/assets/images/fonts/diaspora-custom.ttf        |  Bin 0 -> 1796 bytes
 .../images/fonts/svg-icons/compose_mobile.svg      |   21 +
 app/assets/images/header-bg-long.jpg               |  Bin 571 -> 0 bytes
 app/assets/images/header-bg.png                    |  Bin 4644 -> 0 bytes
 app/assets/images/icons/mail_grey.png              |  Bin 898 -> 0 bytes
 app/assets/images/icons/mail_grey_hover.png        |  Bin 265 -> 0 bytes
 app/assets/images/icons/notifications_grey.png     |  Bin 1179 -> 0 bytes
 .../images/icons/notifications_grey_hover.png      |  Bin 449 -> 0 bytes
 .../images/img/glyphicons-halflings-blue.png       |  Bin 4207 -> 0 bytes
 app/assets/images/img/glyphicons-halflings-red.png |  Bin 4129 -> 0 bytes
 app/assets/images/landing/cog.png                  |  Bin 1014 -> 0 bytes
 app/assets/images/landing/pen_write.png            |  Bin 715 -> 0 bytes
 app/assets/images/landing/smiley_laughing.png      |  Bin 1226 -> 0 bytes
 app/assets/images/mobile/arrow-left.png            |  Bin 2414 -> 0 bytes
 app/assets/images/mobile/arrow-right.png           |  Bin 2439 -> 0 bytes
 app/assets/images/mobile/arrow_down_small.png      |  Bin 455 -> 0 bytes
 app/assets/images/mobile/arrow_up_small.png        |  Bin 460 -> 0 bytes
 app/assets/images/mobile/camera.png                |  Bin 1217 -> 0 bytes
 app/assets/images/mobile/check_yes_ok.png          |  Bin 273 -> 0 bytes
 app/assets/images/mobile/compose_mobile.png        |  Bin 1520 -> 0 bytes
 app/assets/images/mobile/deletelabel.png           |  Bin 203 -> 0 bytes
 app/assets/images/mobile/hatched-light.jpg         |  Bin 22819 -> 0 bytes
 app/assets/images/mobile/heart_mobile_grey.png     |  Bin 1317 -> 0 bytes
 app/assets/images/mobile/heart_mobile_red.png      |  Bin 1320 -> 0 bytes
 app/assets/images/mobile/mail_white.png            |  Bin 992 -> 0 bytes
 app/assets/images/mobile/menu.png                  |  Bin 262 -> 0 bytes
 app/assets/images/mobile/notifications_white.png   |  Bin 2357 -> 0 bytes
 app/assets/images/mobile/pencil_mobile_grey.png    |  Bin 1316 -> 0 bytes
 .../images/mobile/pencil_mobile_grey_active.png    |  Bin 871 -> 0 bytes
 app/assets/images/mobile/reshare_mobile.png        |  Bin 764 -> 0 bytes
 app/assets/images/mobile/reshare_mobile_active.png |  Bin 761 -> 0 bytes
 .../Readme.txt                                     |    0
 .../facebook-16x16.png                             |  Bin
 .../facebook-24x24.png                             |  Bin
 .../facebook-32x32.png                             |  Bin
 .../tumblr-16x16.png                               |  Bin
 .../tumblr-24x24.png                               |  Bin
 .../tumblr-32x32.png                               |  Bin
 .../twitter-16x16.png                              |  Bin
 .../twitter-24x24.png                              |  Bin
 .../twitter-32x32.png                              |  Bin
 .../wordpress-16x16.png                            |  Bin
 .../wordpress-24x24.png                            |  Bin
 .../wordpress-32x32.png                            |  Bin
 app/assets/images/static-loader.png                |  Bin 306 -> 0 bytes
 app/assets/javascripts/api/authorization_page.js   |    5 +
 app/assets/javascripts/app/app.js                  |   29 +-
 .../app/collections/aspect_memberships.js          |    6 +-
 .../app/collections/aspect_selections.js           |   31 +
 app/assets/javascripts/app/collections/aspects.js  |   26 +-
 app/assets/javascripts/app/collections/comments.js |   11 +-
 app/assets/javascripts/app/collections/pods.js     |   10 +
 app/assets/javascripts/app/collections/posts.js    |    1 -
 app/assets/javascripts/app/collections/reshares.js |    1 -
 .../javascripts/app/helpers/handlebars-helpers.js  |   20 +-
 app/assets/javascripts/app/helpers/locations.js    |   25 +
 app/assets/javascripts/app/helpers/modal_helper.js |   13 +
 .../javascripts/app/helpers/text_formatter.js      |   10 +-
 app/assets/javascripts/app/models.js               |    3 -
 .../javascripts/app/models/aspect_membership.js    |    8 +-
 app/assets/javascripts/app/models/comment.js       |    1 -
 app/assets/javascripts/app/models/contact.js       |    9 +-
 app/assets/javascripts/app/models/person.js        |    9 +-
 app/assets/javascripts/app/models/pod.js           |   15 +
 .../javascripts/app/models/post/interactions.js    |   44 +-
 .../javascripts/app/models/status_message.js       |    1 -
 .../javascripts/app/models/stream_aspects.js       |    7 +-
 .../javascripts/app/pages/admin_dashboard.js       |   75 +
 app/assets/javascripts/app/pages/admin_pods.js     |   52 +
 app/assets/javascripts/app/pages/contacts.js       |   85 +-
 .../javascripts/app/pages/getting_started.js       |   20 +
 app/assets/javascripts/app/pages/profile.js        |   86 +-
 app/assets/javascripts/app/pages/settings.js       |    4 +-
 .../javascripts/app/pages/single-post-viewer.js    |   13 +-
 app/assets/javascripts/app/router.js               |  266 ++-
 app/assets/javascripts/app/views.js                |   47 +-
 .../javascripts/app/views/aspect_create_view.js    |   82 +-
 .../app/views/aspect_membership_view.js            |  176 +-
 app/assets/javascripts/app/views/aspect_view.js    |    2 +-
 .../javascripts/app/views/aspects_dropdown_view.js |    4 +-
 .../javascripts/app/views/aspects_list_view.js     |   16 +-
 .../javascripts/app/views/bookmarklet_view.js      |   22 +-
 .../javascripts/app/views/comment_stream_view.js   |   55 +-
 .../javascripts/app/views/contact_stream_view.js   |  104 +-
 app/assets/javascripts/app/views/contact_view.js   |   65 +-
 app/assets/javascripts/app/views/content_view.js   |   29 +-
 .../app/views/conversations_form_view.js           |    3 +-
 .../javascripts/app/views/conversations_view.js    |    8 +-
 app/assets/javascripts/app/views/feedback_view.js  |   20 +-
 .../javascripts/app/views/flash_messages_view.js   |   20 +
 app/assets/javascripts/app/views/gallery_view.js   |   42 +
 app/assets/javascripts/app/views/header_view.js    |   44 +-
 app/assets/javascripts/app/views/help_view.js      |   12 +-
 app/assets/javascripts/app/views/hovercard_view.js |   66 +-
 .../javascripts/app/views/infinite_stream_view.js  |   13 +-
 .../javascripts/app/views/likes_info_view.js       |   12 +-
 .../javascripts/app/views/location_stream.js       |   28 +-
 app/assets/javascripts/app/views/location_view.js  |   27 -
 app/assets/javascripts/app/views/locator.js        |   33 +
 .../javascripts/app/views/no_posts_info_view.js    |    3 +
 .../app/views/notification_dropdown_view.js        |   69 +-
 .../javascripts/app/views/notifications_view.js    |   54 +-
 app/assets/javascripts/app/views/photo_view.js     |    4 +-
 app/assets/javascripts/app/views/photo_viewer.js   |   10 -
 app/assets/javascripts/app/views/photos_view.js    |   20 +-
 app/assets/javascripts/app/views/pod_entry_view.js |   84 +
 app/assets/javascripts/app/views/poll_view.js      |    5 +-
 .../javascripts/app/views/preview_post_view.js     |   41 +
 .../javascripts/app/views/profile_header_view.js   |   58 +-
 .../javascripts/app/views/profile_sidebar_view.js  |   12 +-
 .../app/views/publisher/aspect_selector_view.js    |   14 +-
 .../app/views/publisher/getting_started_view.js    |   61 +-
 .../app/views/publisher/mention_view.js            |  223 ++
 .../app/views/publisher/services_view.js           |   10 +-
 .../app/views/publisher/uploader_view.js           |  100 +-
 app/assets/javascripts/app/views/publisher_view.js |  410 ++--
 .../javascripts/app/views/reshares_info_view.js    |   36 +
 .../javascripts/app/views/search_base_view.js      |  125 +
 app/assets/javascripts/app/views/search_view.js    |   85 +-
 app/assets/javascripts/app/views/sidebar.js        |   10 +-
 .../single_post_comment_stream.js                  |    8 +-
 .../single-post-viewer/single_post_content_view.js |   35 +-
 .../single-post-viewer/single_post_interactions.js |    1 +
 .../single-post-viewer/single_post_moderation.js   |   12 +-
 .../javascripts/app/views/stream/shortcuts.js      |   28 +-
 .../javascripts/app/views/stream_faces_view.js     |   33 -
 .../javascripts/app/views/stream_post_views.js     |   36 +-
 app/assets/javascripts/app/views/stream_view.js    |   13 +-
 .../app/views/tag_following_action_view.js         |    4 +-
 .../app/views/tag_following_list_view.js           |    2 +-
 .../javascripts/app/views/tag_following_view.js    |    4 +-
 app/assets/javascripts/app/views/tags_view.js      |    4 +-
 app/assets/javascripts/aspects-dropdown.js         |   78 -
 app/assets/javascripts/bookmarklet.js              |   56 +
 app/assets/javascripts/browser_detection.js        |    9 -
 app/assets/javascripts/contact-list.js             |   13 +-
 app/assets/javascripts/diaspora.js                 |    5 +-
 app/assets/javascripts/helpers/i18n.js             |   24 +-
 app/assets/javascripts/helpers/markdown_editor.js  |  162 ++
 app/assets/javascripts/jasmine-load-all.js         |    2 +-
 app/assets/javascripts/jsxc.js                     |    1 -
 app/assets/javascripts/main.js                     |   25 +-
 app/assets/javascripts/mentions.js                 |   49 -
 app/assets/javascripts/mobile/mobile.js            |  297 +--
 .../javascripts/mobile/mobile_application.js       |   17 +
 app/assets/javascripts/mobile/mobile_comments.js   |  233 ++
 app/assets/javascripts/mobile/mobile_drawer.js     |   24 +
 .../javascripts/mobile/mobile_file_uploader.js     |   15 +-
 .../javascripts/mobile/mobile_post_actions.js      |  115 +
 app/assets/javascripts/mobile/profile_aspects.js   |    1 -
 app/assets/javascripts/mobile/publisher.js         |   49 +
 .../javascripts/pages/users-getting-started.js     |    8 +-
 app/assets/javascripts/widgets/flash-messages.js   |   39 -
 app/assets/javascripts/widgets/infinite-scroll.js  |   62 -
 app/assets/javascripts/widgets/lightbox.js         |  193 --
 app/assets/javascripts/widgets/timeago.js          |   17 +-
 app/assets/stylesheets/_application.scss           |  114 +
 app/assets/stylesheets/_flash_messages.scss        |   67 +-
 app/assets/stylesheets/_mixins.scss                |   25 +-
 app/assets/stylesheets/admin.scss                  |   80 +-
 app/assets/stylesheets/animations.scss             |   23 +
 app/assets/stylesheets/application.scss            |   98 -
 app/assets/stylesheets/aspects.scss                |   15 +-
 app/assets/stylesheets/autocomplete.scss           |   87 -
 app/assets/stylesheets/base.scss                   |  117 +
 app/assets/stylesheets/bookmarklet.scss            |    4 +-
 app/assets/stylesheets/bootstrap-complete.scss     |   11 +-
 app/assets/stylesheets/bootstrap-fix.scss          |   24 -
 app/assets/stylesheets/bootstrap-headerfix.scss    |   52 -
 app/assets/stylesheets/bootstrap-variables.scss    |  866 +++++++
 app/assets/stylesheets/card-footer.scss            |   29 +
 app/assets/stylesheets/chat.scss                   |    7 +
 .../{new_styles/_code.scss => code.scss}           |    0
 app/assets/stylesheets/color-variables.scss        |   33 +
 .../color_themes/_color_theme_override.scss        |   25 +
 .../_color_theme_override_origwhite.scss           |   26 +
 .../color_themes/dark_green/_style.scss            |   18 +
 .../color_themes/dark_green/desktop.scss           |    2 +
 .../color_themes/dark_green/mobile.scss            |    2 +
 .../color_themes/egyptian_blue/_style.scss         |   18 +
 .../color_themes/egyptian_blue/desktop.scss        |    2 +
 .../color_themes/egyptian_blue/mobile.scss         |    2 +
 .../stylesheets/color_themes/magenta/_style.scss   |   18 +
 .../stylesheets/color_themes/magenta/desktop.scss  |    2 +
 .../stylesheets/color_themes/magenta/mobile.scss   |    2 +
 .../stylesheets/color_themes/original/_style.scss  |    8 +
 .../stylesheets/color_themes/original/desktop.scss |    2 +
 .../stylesheets/color_themes/original/mobile.scss  |    2 +
 .../color_themes/original_white/_style.scss        |   14 +
 .../color_themes/original_white/desktop.scss       |    3 +
 .../color_themes/original_white/mobile.scss        |    3 +
 app/assets/stylesheets/colors.scss                 |   36 +-
 app/assets/stylesheets/comments.scss               |   20 +-
 app/assets/stylesheets/contacts.scss               |   43 +-
 app/assets/stylesheets/conversations.scss          |  194 +-
 app/assets/stylesheets/entypo.scss                 |  322 ---
 app/assets/stylesheets/error_pages.scss            |  102 +-
 app/assets/stylesheets/facebox.scss                |   32 -
 app/assets/stylesheets/footer.scss                 |   35 +-
 app/assets/stylesheets/forms.scss                  |  100 +
 app/assets/stylesheets/gallery.scss                |   61 +
 app/assets/stylesheets/getting-started.scss        |   28 +-
 app/assets/stylesheets/header.scss                 |  503 +---
 app/assets/stylesheets/help.scss                   |    4 +-
 app/assets/stylesheets/home.scss                   |  138 +-
 app/assets/stylesheets/hovercard.scss              |   34 +-
 app/assets/stylesheets/icons.scss                  |   13 +
 app/assets/stylesheets/interactions.scss           |   65 +
 app/assets/stylesheets/invitations.scss            |    3 +-
 app/assets/stylesheets/leftnavbar.scss             |  127 -
 app/assets/stylesheets/lightbox.scss               |  147 --
 app/assets/stylesheets/login.scss                  |   16 +
 app/assets/stylesheets/map.scss                    |   21 +
 app/assets/stylesheets/markdown-content.scss       |    4 +
 app/assets/stylesheets/markdown-editor.scss        |  141 ++
 app/assets/stylesheets/media-box.scss              |    8 +-
 app/assets/stylesheets/mentions.scss               |   19 +-
 app/assets/stylesheets/mobile/comments.scss        |  106 +
 app/assets/stylesheets/mobile/conversations.scss   |   63 +
 app/assets/stylesheets/mobile/header.scss          |  181 +-
 app/assets/stylesheets/mobile/mobile.scss          |  648 ++---
 .../mobile/openid_connect_error_page.scss          |    9 +
 app/assets/stylesheets/mobile/settings.scss        |   47 +
 app/assets/stylesheets/mobile/stream_element.scss  |   16 +
 app/assets/stylesheets/navbar_left.scss            |  200 ++
 app/assets/stylesheets/new_styles/_animations.scss |    7 -
 app/assets/stylesheets/new_styles/_base.scss       |  102 -
 app/assets/stylesheets/new_styles/_buttons.scss    |   31 -
 app/assets/stylesheets/new_styles/_forms.scss      |  105 -
 .../stylesheets/new_styles/_interactions.scss      |   60 -
 app/assets/stylesheets/new_styles/_login.scss      |   16 -
 app/assets/stylesheets/new_styles/_navs.scss       |   15 -
 app/assets/stylesheets/new_styles/_poll.scss       |   39 -
 .../stylesheets/new_styles/_registration.scss      |   52 -
 app/assets/stylesheets/new_styles/_settings.scss   |   22 -
 app/assets/stylesheets/new_styles/_spinner.scss    |   38 -
 app/assets/stylesheets/new_styles/_typography.scss |   23 -
 app/assets/stylesheets/notifications.scss          |  101 +-
 .../stylesheets/openid_connect_error_page.scss     |    7 +
 app/assets/stylesheets/people.scss                 |   22 +-
 app/assets/stylesheets/poll.scss                   |   60 +
 .../poltergeist_disable_transition.scss            |    9 +
 app/assets/stylesheets/post-content.scss           |    2 +
 app/assets/stylesheets/profile.scss                |   67 +-
 app/assets/stylesheets/publisher.scss              |  228 +-
 app/assets/stylesheets/registration.scss           |   53 +
 app/assets/stylesheets/report.scss                 |   21 +-
 app/assets/stylesheets/rtl.scss                    |  231 +-
 app/assets/stylesheets/settings.scss               |   38 +
 app/assets/stylesheets/sidebar.scss                |   75 +-
 app/assets/stylesheets/single-post-view.scss       |   78 +-
 app/assets/stylesheets/sizes.scss                  |    2 -
 app/assets/stylesheets/spinner.scss                |   28 +
 app/assets/stylesheets/sprites.scss                |    6 +-
 app/assets/stylesheets/statistics.scss             |    8 +-
 app/assets/stylesheets/stream-faces.scss           |    7 -
 app/assets/stylesheets/stream.scss                 |   33 +-
 app/assets/stylesheets/stream_element.scss         |  156 +-
 app/assets/stylesheets/tag.scss                    |   37 +-
 app/assets/stylesheets/terms.scss                  |    3 +
 app/assets/stylesheets/timeago.scss                |    3 +
 app/assets/stylesheets/typeahead.scss              |   34 +
 app/assets/stylesheets/typography.scss             |   23 +
 app/assets/stylesheets/user_applications.scss      |   35 +
 app/assets/stylesheets/vendor/autoSuggest.css      |  223 +-
 .../templates/activity-streams-photo_tpl.jst.hbs   |    3 -
 .../templates/aspect_create_modal_tpl.jst.hbs      |   73 +-
 .../aspect_membership_dropdown_tpl.jst.hbs         |   52 +
 app/assets/templates/aspect_tpl.jst.hbs            |   16 +-
 app/assets/templates/aspects-list_tpl.jst.hbs      |    2 +-
 app/assets/templates/comment-stream_tpl.jst.hbs    |   20 +-
 app/assets/templates/comment_tpl.jst.hbs           |    6 +-
 app/assets/templates/contact_tpl.jst.hbs           |    2 +-
 app/assets/templates/feedback_tpl.jst.hbs          |   38 +-
 app/assets/templates/flash_messages_tpl.jst.hbs    |    5 +
 app/assets/templates/header_tpl.jst.hbs            |  209 +-
 app/assets/templates/help_tpl.jst.hbs              |    6 +-
 app/assets/templates/hovercard_tpl.jst.hbs         |    4 +-
 app/assets/templates/likes-info_tpl.jst.hbs        |    6 +-
 app/assets/templates/no_posts_info_tpl.jst.hbs     |    5 +
 app/assets/templates/photo-viewer_tpl.jst.hbs      |    7 -
 app/assets/templates/photo_tpl.jst.hbs             |   60 +-
 app/assets/templates/pod_table_entry_tpl.jst.hbs   |   41 +
 app/assets/templates/pod_table_tpl.jst.hbs         |   14 +
 app/assets/templates/poll_creator_tpl.jst.hbs      |   26 +-
 app/assets/templates/poll_tpl.jst.hbs              |   53 +-
 app/assets/templates/profile_header_tpl.jst.hbs    |   91 +-
 app/assets/templates/profile_sidebar_tpl.jst.hbs   |    2 +-
 app/assets/templates/reshare_tpl.jst.hbs           |    9 +-
 app/assets/templates/reshares-info_tpl.jst.hbs     |   23 +
 app/assets/templates/search_suggestion_tpl.jst.hbs |   13 +
 .../single-post-actions_tpl.jst.hbs                |   20 +-
 .../single-post-content_tpl.jst.hbs                |  165 +-
 .../single-post-interactions_tpl.jst.hbs           |   20 +-
 .../single-post-moderation_tpl.jst.hbs             |   14 +-
 .../templates/single-post-viewer_tpl.jst.hbs       |    8 +-
 .../templates/status-message-location_tpl.jst.hbs  |    7 +-
 app/assets/templates/status-message_tpl.jst.hbs    |   14 +-
 app/assets/templates/stream-element_tpl.jst.hbs    |   58 +-
 app/assets/templates/stream-faces_tpl.jst.hbs      |    5 -
 .../templates/tag_following_action_tpl.jst.hbs     |    4 +-
 .../templates/tag_following_list_tpl.jst.hbs       |    2 +-
 app/assets/templates/tag_following_tpl.jst.hbs     |    4 +-
 app/controllers/admin/pods_controller.rb           |   32 +
 app/controllers/admins_controller.rb               |    5 +
 .../openid_connect/authorizations_controller.rb    |  255 ++
 .../api/openid_connect/clients_controller.rb       |   52 +
 .../api/openid_connect/discovery_controller.rb     |   61 +
 .../api/openid_connect/id_tokens_controller.rb     |   36 +
 .../openid_connect/token_endpoint_controller.rb    |   60 +
 .../openid_connect/user_applications_controller.rb |   11 +
 .../api/openid_connect/user_info_controller.rb     |   26 +
 app/controllers/api/v0/base_controller.rb          |   13 +
 app/controllers/application_controller.rb          |    9 +
 app/controllers/aspect_memberships_controller.rb   |    2 +-
 app/controllers/aspects_controller.rb              |   10 +-
 app/controllers/blocks_controller.rb               |    4 +-
 app/controllers/comments_controller.rb             |   27 +-
 app/controllers/contacts_controller.rb             |   53 +-
 app/controllers/conversations_controller.rb        |    4 +-
 app/controllers/help_controller.rb                 |    3 -
 app/controllers/home_controller.rb                 |    9 +-
 app/controllers/invitations_controller.rb          |   75 +-
 app/controllers/messages_controller.rb             |   12 +-
 app/controllers/notifications_controller.rb        |   13 +-
 app/controllers/people_controller.rb               |   88 +-
 app/controllers/photos_controller.rb               |   45 +-
 app/controllers/posts_controller.rb                |   51 +-
 app/controllers/profiles_controller.rb             |    5 +-
 app/controllers/registrations_controller.rb        |   40 +-
 app/controllers/reshares_controller.rb             |    3 +-
 app/controllers/social_relay_controller.rb         |    7 +
 app/controllers/status_messages_controller.rb      |   34 +-
 app/controllers/tags_controller.rb                 |   10 +-
 app/controllers/users_controller.rb                |  198 +-
 app/helpers/application_helper.rb                  |   12 +-
 app/helpers/aspect_global_helper.rb                |   45 -
 app/helpers/contacts_helper.rb                     |   12 +-
 app/helpers/error_messages_helper.rb               |    2 +-
 app/helpers/getting_started_helper.rb              |   12 -
 app/helpers/gon_helper.rb                          |    8 +
 app/helpers/interim_stream_hackiness_helper.rb     |   22 +-
 app/helpers/invitation_codes_helper.rb             |    6 +-
 app/helpers/language_helper.rb                     |    2 +
 app/helpers/layout_helper.rb                       |    9 +-
 app/helpers/meta_data_helper.rb                    |   53 +
 app/helpers/mobile_helper.rb                       |   44 +-
 app/helpers/open_graph_helper.rb                   |   85 -
 app/helpers/people_helper.rb                       |    9 +-
 app/helpers/publisher_helper.rb                    |   19 +-
 app/helpers/report_helper.rb                       |   18 +-
 app/helpers/sessions_helper.rb                     |   10 +-
 app/helpers/user_applications_helper.rb            |    9 +
 app/helpers/users_helper.rb                        |   35 +
 .../notification_mailers/private_message.rb        |    3 +-
 app/mailers/report_mailer.rb                       |   14 +-
 app/models/account_deletion.rb                     |   14 +-
 app/models/api/openid_connect/authorization.rb     |   90 +
 .../api/openid_connect/o_auth_access_token.rb      |   49 +
 .../api/openid_connect/o_auth_application.rb       |  119 +
 .../pairwise_pseudonymous_identifier.rb            |   45 +
 app/models/aspect_visibility.rb                    |    1 +
 app/models/comment.rb                              |   52 +-
 app/models/comment_signature.rb                    |    7 +
 app/models/contact.rb                              |  106 +-
 app/models/conversation.rb                         |   54 +-
 app/models/invitation.rb                           |  151 --
 app/models/invitation_code.rb                      |    6 +-
 app/models/like.rb                                 |   25 +-
 app/models/like_signature.rb                       |    7 +
 app/models/location.rb                             |    3 -
 app/models/mention.rb                              |   15 +-
 app/models/message.rb                              |   78 +-
 app/models/notification.rb                         |   85 +-
 app/models/notifications/also_commented.rb         |   36 +-
 app/models/notifications/comment_on_post.rb        |   31 +-
 app/models/notifications/liked.rb                  |   37 +-
 app/models/notifications/mentioned.rb              |   40 +-
 app/models/notifications/private_message.rb        |   39 +-
 app/models/notifications/request_accepted.rb       |    8 -
 app/models/notifications/reshared.rb               |   29 +-
 app/models/notifications/started_sharing.rb        |   30 +-
 app/models/participation.rb                        |   24 +-
 app/models/person.rb                               |  136 +-
 app/models/photo.rb                                |   51 +-
 app/models/pod.rb                                  |  140 +-
 app/models/poll.rb                                 |    8 +-
 app/models/poll_answer.rb                          |    8 +-
 app/models/poll_participation.rb                   |   42 +-
 app/models/poll_participation_signature.rb         |    7 +
 app/models/post.rb                                 |   69 +-
 app/models/profile.rb                              |   34 +-
 app/models/report.rb                               |   46 +-
 app/models/reshare.rb                              |   48 +-
 app/models/service.rb                              |    4 +-
 app/models/services/facebook.rb                    |   12 +-
 app/models/services/tumblr.rb                      |   16 +-
 app/models/services/twitter.rb                     |   12 +-
 app/models/share_visibility.rb                     |   37 +-
 app/models/signature_order.rb                      |    3 +
 app/models/status_message.rb                       |  106 +-
 app/models/user.rb                                 |  163 +-
 app/models/user/connecting.rb                      |   95 +-
 app/models/user/querying.rb                        |  161 +-
 app/models/user/social_actions.rb                  |   24 +-
 app/presenters/avatar_presenter.rb                 |   18 +-
 app/presenters/base_presenter.rb                   |    7 +
 app/presenters/contact_presenter.rb                |    8 +-
 app/presenters/hovercard_presenter.rb              |   39 -
 app/presenters/person_presenter.rb                 |   94 +-
 app/presenters/pod_presenter.rb                    |   20 +
 app/presenters/post_presenter.rb                   |   72 +-
 app/presenters/profile_presenter.rb                |    7 +
 app/presenters/social_relay_presenter.rb           |   24 +
 app/presenters/statistics_presenter.rb             |    7 -
 app/presenters/tag_stream_presenter.rb             |   25 +
 app/presenters/user_application_presenter.rb       |   47 +
 app/presenters/user_applications_presenter.rb      |   20 +
 app/serializers/export/post_serializer.rb          |    3 -
 app/serializers/export/user_serializer.rb          |    1 +
 app/serializers/notification_serializer.rb         |   20 +
 app/serializers/user_info_serializer.rb            |   24 +
 app/services/comment_service.rb                    |   43 +-
 app/services/notification_service.rb               |   21 +
 app/services/post_service.rb                       |   81 +-
 app/services/status_message_creation_service.rb    |   99 +-
 app/views/admins/_admin_bar.haml                   |   27 +-
 app/views/admins/_user_entry.haml                  |   28 +-
 app/views/admins/dashboard.html.haml               |   10 +
 app/views/admins/pods.html.haml                    |   14 +
 app/views/admins/stats.html.haml                   |  110 +-
 app/views/admins/user_search.html.haml             |  107 +-
 app/views/admins/weekly_user_stats.haml            |   29 +-
 .../authorizations/_grants_list.haml               |   31 +
 .../openid_connect/authorizations/new.html.haml    |   13 +
 .../api/openid_connect/error/_error.html.haml      |   11 +
 app/views/api/openid_connect/error/error.html.haml |    1 +
 .../api/openid_connect/error/error.mobile.haml     |    8 +
 .../_add_remove_applications.haml                  |   14 +
 .../user_applications/_grants_list.haml            |   30 +
 .../user_applications/index.html.haml              |   14 +
 .../user_applications/index.mobile.haml            |    9 +
 .../_aspect_membership_dropdown.haml               |   32 +-
 .../_aspect_membership_dropdown.mobile.haml        |   12 +-
 app/views/aspects/_aspect_listings.haml            |    1 +
 app/views/aspects/_aspect_stream.haml              |   19 +-
 app/views/aspects/_no_contacts_message.haml        |   17 +-
 app/views/aspects/_no_posts_message.haml           |    6 -
 app/views/comments/_comment.mobile.haml            |   28 +-
 app/views/comments/_new_comment.mobile.haml        |   17 +-
 app/views/comments/_post_stats.mobile.haml         |   13 +
 app/views/comments/index.mobile.haml               |    4 +-
 app/views/comments/new.mobile.haml                 |    2 +-
 app/views/contacts/_aspect_listings.haml           |   50 +-
 app/views/contacts/_header.html.haml               |   39 +-
 app/views/contacts/_sidebar.html.haml              |    7 +-
 app/views/contacts/index.html.haml                 |   17 +-
 app/views/contacts/index.mobile.haml               |   22 +-
 app/views/contacts/spotlight.haml                  |   24 +-
 app/views/conversations/_conversation.haml         |    6 +-
 app/views/conversations/_conversation.mobile.haml  |    2 +-
 app/views/conversations/_conversation_subject.haml |    4 +-
 app/views/conversations/_message.haml              |   15 +
 app/views/conversations/_messages.haml             |   22 +
 app/views/conversations/_new.haml                  |   40 +-
 app/views/conversations/_show.haml                 |   34 +-
 app/views/conversations/_show.mobile.haml          |   35 +-
 app/views/conversations/create.js.erb              |    7 +-
 app/views/conversations/index.haml                 |   40 +-
 app/views/conversations/index.mobile.haml          |   22 +-
 app/views/conversations/new.mobile.haml            |   25 +-
 app/views/conversations/show.js.erb                |    1 -
 app/views/devise/passwords/edit.haml               |   37 +-
 app/views/devise/passwords/edit.mobile.haml        |   12 +-
 app/views/devise/passwords/new.haml                |   20 +-
 app/views/devise/passwords/new.mobile.haml         |    4 +-
 app/views/errors/error_404.haml                    |    4 +-
 app/views/errors/error_422.haml                    |   15 +-
 app/views/errors/error_500.haml                    |    8 +-
 app/views/errors/not_public.haml                   |   14 -
 app/views/home/default.haml                        |   91 +-
 app/views/home/podmin.haml                         |   61 +
 app/views/invitations/new.html.haml                |   41 +-
 app/views/layouts/_drawer.mobile.haml              |   35 +
 app/views/layouts/_footer.html.haml                |    8 +-
 app/views/layouts/_header.html.haml                |   29 +-
 app/views/layouts/_header.mobile.haml              |   39 +
 app/views/layouts/_header_not_connected.haml       |    4 +
 app/views/layouts/_open_graph.haml                 |    5 -
 app/views/layouts/application.html.haml            |   55 +-
 app/views/layouts/application.mobile.haml          |   77 +-
 app/views/layouts/error_page.haml                  |    2 +-
 app/views/likes/_likes.haml                        |    3 +-
 app/views/messages/_message.haml                   |   14 -
 app/views/node_info/_statistic.haml                |    6 +-
 app/views/node_info/_statistics.haml               |   31 +-
 app/views/notifications/_notification.haml         |   10 +-
 app/views/notifications/_notification.mobile.haml  |    2 +-
 app/views/notifications/index.html.haml            |  126 +-
 app/views/notifications/index.mobile.haml          |   23 +-
 app/views/people/_add_contact.haml                 |   12 +-
 app/views/people/_aspect_membership_dropdown.haml  |    1 -
 app/views/people/_person.html.haml                 |    9 +-
 app/views/people/_person.mobile.haml               |   17 +-
 app/views/people/_relationship_action.haml         |    6 +-
 app/views/people/contacts.haml                     |   31 +-
 app/views/people/index.html.haml                   |   22 +-
 app/views/people/show.html.haml                    |   39 +-
 app/views/people/show.mobile.haml                  |   49 +-
 app/views/people/tag_index.js.erb                  |    1 -
 app/views/photos/_index.mobile.haml                |    5 +-
 app/views/photos/_new_profile_photo.haml           |   19 +-
 app/views/photos/_new_profile_photo.mobile.haml    |   54 -
 app/views/photos/_photo.haml                       |   14 -
 app/views/photos/edit.html.haml                    |   15 -
 app/views/photos/show.mobile.haml                  |   35 +-
 app/views/posts/_photo.html.haml                   |    2 +-
 app/views/posts/destroy.js.erb                     |    2 -
 app/views/posts/show.html.haml                     |    5 +-
 app/views/posts/show.mobile.haml                   |    4 +-
 app/views/profiles/_edit.haml                      |   69 -
 app/views/profiles/_edit.mobile.haml               |   57 -
 app/views/profiles/_edit_private.haml              |   69 +
 app/views/profiles/_edit_public.haml               |   44 +-
 app/views/profiles/_edit_public.mobile.haml        |   71 -
 app/views/profiles/edit.haml                       |   28 +-
 app/views/profiles/edit.mobile.haml                |   22 +-
 app/views/publisher/_aspect_dropdown.html.haml     |   20 +-
 app/views/publisher/_publisher.html.haml           |  108 +-
 app/views/publisher/_publisher.mobile.haml         |   32 +-
 app/views/registrations/_form.haml                 |   96 +-
 app/views/registrations/new.haml                   |   12 +-
 app/views/registrations/new.mobile.haml            |   56 +-
 app/views/report/index.html.haml                   |   67 +-
 app/views/report/report_email.markerb              |    7 +-
 app/views/reshares/_reshare.mobile.haml            |   16 +-
 app/views/services/index.html.haml                 |   31 +-
 app/views/services/index.mobile.haml               |   20 +
 app/views/sessions/_form.haml                      |   44 +
 app/views/sessions/new.html.haml                   |   29 +-
 app/views/sessions/new.mobile.haml                 |   55 +-
 app/views/shared/_invitations.haml                 |   14 +-
 app/views/shared/_modal.haml                       |   29 +-
 app/views/shared/_nsfw_shield.mobile.haml          |    6 +
 app/views/shared/_photo_area.mobile.haml           |    3 -
 app/views/shared/_post_info.mobile.haml            |   48 +-
 app/views/shared/_post_stats.mobile.haml           |   21 -
 app/views/shared/_public_explain.haml              |   41 +-
 app/views/shared/_right_sections.html.haml         |  100 -
 app/views/shared/_settings_nav.haml                |   20 +-
 app/views/shared/_settings_nav.mobile.haml         |   16 +-
 app/views/shared/_stream.haml                      |    4 +-
 app/views/shared/_stream_element.mobile.haml       |   39 +-
 app/views/simple_captcha/_simple_captcha.haml      |    2 +-
 .../simple_captcha/_simple_captcha.mobile.haml     |    5 +-
 app/views/status_messages/_poll.mobile.haml        |   25 +
 .../status_messages/_status_message.mobile.haml    |    6 +-
 app/views/status_messages/bookmarklet.html.haml    |   12 +-
 app/views/status_messages/new.html.haml            |   12 -
 app/views/streams/main_stream.html.haml            |  193 +-
 app/views/streams/main_stream.mobile.haml          |    8 +-
 app/views/tags/show.haml                           |   32 +-
 app/views/tags/update.js.erb                       |    3 -
 app/views/terms/default.haml                       |  458 ++--
 app/views/users/_blocked_person.haml               |   12 +
 app/views/users/_close_account_modal.haml          |   69 +-
 app/views/users/_edit.haml                         |  212 ++
 app/views/users/_privacy_settings.haml             |   28 +
 app/views/users/edit.html.haml                     |  215 +-
 app/views/users/edit.mobile.haml                   |  204 +-
 app/views/users/getting_started.haml               |   37 +-
 app/views/users/getting_started.mobile.haml        |   32 +-
 app/views/users/privacy_settings.html.haml         |   52 +-
 app/views/users/privacy_settings.mobile.haml       |   15 +
 app/workers/base.rb                                |   22 +-
 app/workers/clean_cached_files.rb                  |    8 +-
 app/workers/deferred_dispatch.rb                   |    9 +-
 app/workers/deferred_retraction.rb                 |   18 +
 app/workers/delete_account.rb                      |    2 +-
 app/workers/delete_post_from_service.rb            |    8 +-
 app/workers/export_photos.rb                       |    2 +-
 app/workers/export_user.rb                         |    2 +-
 app/workers/fetch_profile_photo.rb                 |    2 +-
 app/workers/fetch_public_posts.rb                  |    2 +-
 app/workers/fetch_webfinger.rb                     |    2 +-
 app/workers/gather_o_embed_data.rb                 |    2 +-
 app/workers/gather_open_graph_data.rb              |    2 +-
 app/workers/http_multi.rb                          |   43 -
 app/workers/mail/also_commented.rb                 |    2 +-
 app/workers/mail/comment_on_post.rb                |    2 +-
 app/workers/mail/confirm_email.rb                  |    2 +-
 app/workers/mail/invite_email.rb                   |    2 +-
 app/workers/mail/liked.rb                          |    2 +-
 app/workers/mail/mentioned.rb                      |    2 +-
 app/workers/mail/private_message.rb                |    2 +-
 app/workers/mail/report_worker.rb                  |    6 +-
 app/workers/mail/reshared.rb                       |    2 +-
 app/workers/mail/started_sharing.rb                |    2 +-
 app/workers/notify_local_users.rb                  |   19 -
 app/workers/post_to_service.rb                     |    2 +-
 app/workers/process_photo.rb                       |    2 +-
 app/workers/publish_to_hub.rb                      |    2 +-
 app/workers/queue_users_for_removal.rb             |   10 +-
 app/workers/receive.rb                             |   19 -
 app/workers/receive_base.rb                        |   34 +
 app/workers/receive_encrypted_salmon.rb            |   19 -
 app/workers/receive_local.rb                       |   14 +
 app/workers/receive_local_batch.rb                 |   16 -
 app/workers/receive_private.rb                     |   15 +
 app/workers/receive_public.rb                      |   13 +
 app/workers/receive_unencrypted_salmon.rb          |   16 -
 app/workers/recurring_pod_check.rb                 |    9 +
 app/workers/remove_old_user.rb                     |    4 +-
 app/workers/resend_invitation.rb                   |   15 -
 app/workers/reset_password.rb                      |    2 +-
 app/workers/send_base.rb                           |   29 +
 app/workers/send_private.rb                        |   13 +
 app/workers/send_public.rb                         |   13 +
 config.ru                                          |    7 +-
 config/.jshint.json                                |   68 -
 config/.jshint_ignore                              |    4 -
 config/application.rb                              |   19 +-
 config/certs/README                                |    7 +
 config/color_themes.yml                            |    6 +
 config/database.yml.example                        |   22 +-
 config/defaults.yml                                |   52 +-
 config/diaspora.yml.example                        |  214 +-
 config/eye.rb                                      |    4 +-
 config/initializers/assets.rb                      |    7 +
 config/initializers/color_themes.rb                |   19 +
 config/initializers/cors.rb                        |   10 +-
 config/initializers/diaspora_federation.rb         |   88 +-
 config/initializers/entypo.rb                      |    1 +
 config/initializers/filter_parameter_logging.rb    |    2 +-
 config/initializers/haml.rb                        |    4 +-
 config/initializers/load_libraries.rb              |    3 -
 config/initializers/mailer_config.rb               |   14 +-
 config/initializers/omniauth.rb                    |    1 -
 config/initializers/prosody.rb                     |   22 +
 config/initializers/set_up_image_redirects.rb      |    1 -
 config/initializers/sidekiq.rb                     |    6 +
 config/initializers/will_paginate.rb               |    4 +-
 config/locales/devise/devise.ar.yml                |  109 +-
 config/locales/devise/devise.da.yml                |   10 +-
 config/locales/devise/devise.de.yml                |   54 +-
 config/locales/devise/devise.de_formal.yml         |   72 +-
 config/locales/devise/devise.en.yml                |  191 +-
 config/locales/devise/devise.es-AR.yml             |   44 +-
 config/locales/devise/devise.es-CL.yml             |   12 +
 config/locales/devise/devise.es.yml                |   24 +-
 config/locales/devise/devise.fr.yml                |   24 +-
 config/locales/devise/devise.hy.yml                |   26 +-
 config/locales/devise/devise.is.yml                |    4 +-
 config/locales/devise/devise.ja.yml                |   48 +-
 config/locales/devise/devise.nl.yml                |    2 +-
 config/locales/devise/devise.pt-BR.yml             |   50 +-
 config/locales/devise/devise.sv.yml                |    2 +-
 config/locales/devise/devise.zh-TW.yml             |   51 +-
 config/locales/diaspora/af.yml                     |    5 +-
 config/locales/diaspora/ar.yml                     |  328 +--
 config/locales/diaspora/art-nvi.yml                |   76 +-
 config/locales/diaspora/ast.yml                    |   55 +-
 config/locales/diaspora/az.yml                     |   57 +-
 config/locales/diaspora/be.yml                     |   49 +-
 config/locales/diaspora/bg.yml                     |  289 ---
 config/locales/diaspora/br.yml                     |  304 +--
 config/locales/diaspora/bs.yml                     |  311 ---
 config/locales/diaspora/cs.yml                     |  349 +--
 config/locales/diaspora/cy.yml                     |  177 +-
 config/locales/diaspora/da.yml                     |  550 ++---
 config/locales/diaspora/de.yml                     |  531 ++---
 config/locales/diaspora/de_formal.yml              |  513 ++--
 config/locales/diaspora/el.yml                     |  315 ---
 config/locales/diaspora/en.yml                     |  471 ++--
 config/locales/diaspora/en_1337.yml                |  289 +--
 config/locales/diaspora/en_pirate.yml              |  236 +-
 config/locales/diaspora/en_shaw.yml                |  264 +--
 config/locales/diaspora/en_valspeak.yml            |  347 +--
 config/locales/diaspora/eo.yml                     |  312 +--
 config/locales/diaspora/es-AR.yml                  |  514 ++--
 config/locales/diaspora/es-BO.yml                  |   44 +-
 config/locales/diaspora/es-CL.yml                  |  312 +--
 config/locales/diaspora/es-CO.yml                  |  163 +-
 config/locales/diaspora/es-MX.yml                  |  300 ---
 config/locales/diaspora/es.yml                     |  445 +---
 config/locales/diaspora/et.yml                     |   10 -
 config/locales/diaspora/eu.yml                     |  313 ---
 config/locales/diaspora/fa.yml                     |   49 +-
 config/locales/diaspora/fi.yml                     |  375 +--
 config/locales/diaspora/fil.yml                    |  131 +-
 config/locales/diaspora/fr.yml                     |  470 ++--
 config/locales/diaspora/fy.yml                     |   43 +-
 config/locales/diaspora/ga.yml                     |   49 +-
 config/locales/diaspora/gd.yml                     |   86 +-
 config/locales/diaspora/he.yml                     |  313 ---
 config/locales/diaspora/hi.yml                     |   13 +-
 config/locales/diaspora/hu.yml                     |  317 ---
 config/locales/diaspora/hy.yml                     |  611 ++---
 config/locales/diaspora/ia.yml                     |  355 +--
 config/locales/diaspora/id.yml                     |  233 +-
 config/locales/diaspora/io.yml                     |   60 +-
 config/locales/diaspora/is.yml                     |  415 +---
 config/locales/diaspora/it.yml                     |  461 +---
 config/locales/diaspora/ja.yml                     | 1086 ++++++---
 config/locales/diaspora/ka.yml                     |  284 +--
 config/locales/diaspora/kk.yml                     |   20 +-
 config/locales/diaspora/kn.yml                     |   17 +-
 config/locales/diaspora/ko.yml                     |  309 ---
 config/locales/diaspora/lt.yml                     |  224 +-
 config/locales/diaspora/lv.yml                     |   57 +-
 config/locales/diaspora/mk.yml                     |  213 +-
 config/locales/diaspora/ml.yml                     |  309 ---
 config/locales/diaspora/ms.yml                     |  164 +-
 config/locales/diaspora/nb.yml                     |  325 ---
 config/locales/diaspora/nds.yml                    |  302 ---
 config/locales/diaspora/ne.yml                     |   24 +-
 config/locales/diaspora/nl.yml                     |  451 ++--
 config/locales/diaspora/nn.yml                     |  306 ---
 config/locales/diaspora/pa.yml                     |  139 --
 config/locales/diaspora/pl.yml                     |  363 +--
 config/locales/diaspora/pt-BR.yml                  |  604 ++---
 config/locales/diaspora/pt-PT.yml                  |  300 ---
 config/locales/diaspora/ro.yml                     |  293 +--
 config/locales/diaspora/ru.yml                     |  380 +--
 config/locales/diaspora/sc.yml                     |   86 +-
 config/locales/diaspora/si.yml                     |  102 +-
 config/locales/diaspora/sk.yml                     |  313 ---
 config/locales/diaspora/sl.yml                     |  313 ---
 config/locales/diaspora/sr.yml                     |  190 +-
 config/locales/diaspora/sv.yml                     |  458 ++--
 config/locales/diaspora/ta.yml                     |   38 +-
 config/locales/diaspora/te.yml                     |  302 ---
 config/locales/diaspora/tr.yml                     |  311 +--
 config/locales/diaspora/uk.yml                     |  328 ---
 config/locales/diaspora/ur-PK.yml                  |  116 -
 config/locales/diaspora/vi.yml                     |  295 ---
 config/locales/diaspora/wo.yml                     |   62 +-
 config/locales/diaspora/yi.yml                     |   20 +-
 config/locales/diaspora/zh-CN.yml                  |  281 ---
 config/locales/diaspora/zh-TW.yml                  | 1028 ++++----
 config/locales/javascript/javascript.ar.yml        |   29 +-
 config/locales/javascript/javascript.art-nvi.yml   |   19 +-
 config/locales/javascript/javascript.bg.yml        |   22 +-
 config/locales/javascript/javascript.br.yml        |   35 +-
 config/locales/javascript/javascript.bs.yml        |   34 +-
 config/locales/javascript/javascript.cs.yml        |   41 +-
 config/locales/javascript/javascript.cy.yml        |   21 +-
 config/locales/javascript/javascript.da.yml        |  136 +-
 config/locales/javascript/javascript.de.yml        |  139 +-
 config/locales/javascript/javascript.de_formal.yml |  144 +-
 config/locales/javascript/javascript.el.yml        |   33 +-
 config/locales/javascript/javascript.en.yml        |  136 +-
 config/locales/javascript/javascript.en_1337.yml   |   22 +-
 config/locales/javascript/javascript.en_pirate.yml |    5 +-
 config/locales/javascript/javascript.en_shaw.yml   |   23 +-
 .../locales/javascript/javascript.en_valspeak.yml  |   44 +-
 config/locales/javascript/javascript.eo.yml        |   36 +-
 config/locales/javascript/javascript.es-AR.yml     |  136 +-
 config/locales/javascript/javascript.es-CL.yml     |   30 +-
 config/locales/javascript/javascript.es-MX.yml     |   34 +-
 config/locales/javascript/javascript.es.yml        |  124 +-
 config/locales/javascript/javascript.et.yml        |   22 +-
 config/locales/javascript/javascript.eu.yml        |   31 +-
 config/locales/javascript/javascript.fi.yml        |   45 +-
 config/locales/javascript/javascript.fil.yml       |    4 +-
 config/locales/javascript/javascript.fr.yml        |  130 +-
 config/locales/javascript/javascript.fy.yml        |   18 +-
 config/locales/javascript/javascript.ga.yml        |    4 +-
 config/locales/javascript/javascript.he.yml        |   34 +-
 config/locales/javascript/javascript.hu.yml        |   35 +-
 config/locales/javascript/javascript.hy.yml        |  121 +-
 config/locales/javascript/javascript.ia.yml        |   92 +-
 config/locales/javascript/javascript.id.yml        |   22 +-
 config/locales/javascript/javascript.is.yml        |   87 +-
 config/locales/javascript/javascript.it.yml        |   34 +-
 config/locales/javascript/javascript.ja.yml        |  228 +-
 config/locales/javascript/javascript.ka.yml        |   22 +-
 config/locales/javascript/javascript.ko.yml        |   34 +-
 config/locales/javascript/javascript.lt.yml        |   22 +-
 config/locales/javascript/javascript.ml.yml        |   34 +-
 config/locales/javascript/javascript.ms.yml        |   28 +-
 config/locales/javascript/javascript.nb.yml        |   34 +-
 config/locales/javascript/javascript.nds.yml       |   27 +-
 config/locales/javascript/javascript.ne.yml        |   12 +-
 config/locales/javascript/javascript.nl.yml        |  100 +-
 config/locales/javascript/javascript.nn.yml        |   31 +-
 config/locales/javascript/javascript.pl.yml        |   34 +-
 config/locales/javascript/javascript.pt-BR.yml     |  145 +-
 config/locales/javascript/javascript.pt-PT.yml     |   34 +-
 config/locales/javascript/javascript.ro.yml        |   25 +-
 config/locales/javascript/javascript.ru.yml        |   72 +-
 config/locales/javascript/javascript.si.yml        |   23 +-
 config/locales/javascript/javascript.sk.yml        |   34 +-
 config/locales/javascript/javascript.sl.yml        |   31 +-
 config/locales/javascript/javascript.sr.yml        |   22 +-
 config/locales/javascript/javascript.sv.yml        |  105 +-
 config/locales/javascript/javascript.te.yml        |   30 +-
 config/locales/javascript/javascript.tr.yml        |   60 +-
 config/locales/javascript/javascript.uk.yml        |   34 +-
 config/locales/javascript/javascript.vi.yml        |   33 +-
 config/locales/javascript/javascript.wo.yml        |   13 +-
 config/locales/javascript/javascript.zh-CN.yml     |   31 +-
 config/locales/javascript/javascript.zh-TW.yml     |  188 +-
 config/logging.rb                                  |    3 +-
 config/routes.rb                                   |  117 +-
 config/schedule.yml                                |   11 +
 config/selenium.yml                                |   90 -
 config/sidekiq.yml                                 |   18 +-
 config/vines/README                                |    7 -
 db/migrate/20150523004437_enable_color_themes.rb   |    9 +
 .../20150613202109_create_o_auth_applications.rb   |   30 +
 .../20150630221004_add_public_to_profiles.rb       |    5 +
 db/migrate/20150708153926_create_authorizations.rb |   18 +
 .../20150708153928_create_o_auth_access_tokens.rb  |   14 +
 db/migrate/20150714055110_create_id_tokens.rb      |   14 +
 ...113_create_pairwise_pseudonymous_identifiers.rb |   15 +
 db/migrate/20150731123114_add_status_to_pods.rb    |   14 +
 ...150828132451_remove_duplicate_and_empty_pods.rb |   24 +
 .../20151003142048_update_report_item_types.rb     |    7 +
 ...1210213023_remove_signatures_from_relayables.rb |    9 +
 db/migrate/20160124234712_extend_pods.rb           |   77 +
 ...0225232049_link_share_visibilities_with_user.rb |   79 +
 .../20160302025129_cleanup_aspect_visibility.rb    |   27 +
 db/migrate/20160307142216_cleanup_handles.rb       |    7 +
 ...26_cleanup_duplicates_and_add_unique_indexes.rb |   66 +
 ...1170531_remove_duplicate_aspect_visibilities.rb |   11 +
 .../20160618033455_cleanup_participations.rb       |   44 +
 .../20160720212620_create_signature_tables.rb      |   87 +
 db/migrate/20160802212635_cleanup_posts_table.rb   |   30 +
 db/migrate/20160807212443_participation_counter.rb |   47 +
 ...230114_cleanup_invitation_columns_from_users.rb |   72 +
 db/migrate/20160813115514_remove_id_tokens.rb      |    7 +
 ...tarted_sharing_notifications_without_contact.rb |   12 +
 db/schema.rb                                       |  295 ++-
 features/desktop/accepts_invitation.feature        |   45 -
 features/desktop/activity_stream.feature           |   36 +
 features/desktop/aspect_navigation.feature         |    3 +
 features/desktop/blocks_user.feature               |    9 +-
 features/desktop/change_email.feature              |    4 +-
 features/desktop/change_password.feature           |    8 +-
 features/desktop/closes_account.feature            |    9 +-
 features/desktop/comments.feature                  |   51 +-
 features/desktop/connects_users.feature            |   37 +-
 features/desktop/contacts.feature                  |    9 +-
 features/desktop/conversations.feature             |   15 +
 features/desktop/donations.feature                 |    2 +
 features/desktop/edits_profile.feature             |   12 +-
 features/desktop/follows_tags.feature              |   26 +-
 features/desktop/invitations.feature               |   64 +-
 features/desktop/keyboard_navigation.feature       |   27 +-
 features/desktop/likes.feature                     |    7 +-
 features/desktop/manages_aspects.feature           |   24 +-
 features/desktop/mentions.feature                  |   28 +-
 .../desktop/mentions_from_profile_page.feature     |    4 +-
 features/desktop/not_safe_for_work.feature         |    3 +-
 features/desktop/notifications.feature             |   81 +-
 features/desktop/oidc_auth_code_flow.feature       |   26 +
 features/desktop/oidc_implicit_flow.feature        |   35 +
 features/desktop/photo_gallery.feature             |   15 +
 features/desktop/photo_lightbox.feature            |   27 -
 features/desktop/post_preview.feature              |   64 +-
 features/desktop/posts_from_main_page.feature      |   15 +-
 features/desktop/profile_photos.feature            |   28 +-
 features/desktop/public_stream.feature             |   22 +-
 features/desktop/reshare.feature                   |    9 +-
 features/desktop/search.feature                    |   52 +-
 features/desktop/signs_up.feature                  |   23 +-
 .../desktop/single_post_view_moderation.feature    |   12 +-
 features/desktop/user_applications.feature         |   23 +
 features/mobile/activity_stream.feature            |   29 +-
 features/mobile/change_password.feature            |   56 +
 features/mobile/closes_account.feature             |   16 +-
 features/mobile/conversations.feature              |    3 +-
 features/mobile/drawer.feature                     |   91 +-
 features/mobile/edits_profile.feature              |   11 +-
 features/mobile/getting_started.feature            |   17 +-
 features/mobile/home.feature                       |    2 -
 features/mobile/invitations.feature                |   13 +-
 features/mobile/logged_out_browsing.feature        |   34 +-
 features/mobile/more-button.feature                |   60 +-
 features/mobile/multiphoto.feature                 |   29 +-
 features/mobile/not_safe_for_work.feature          |   78 +
 features/mobile/people_aspects.feature             |   80 +-
 features/mobile/posts_from_main_page.feature       |  108 +-
 features/mobile/reactions.feature                  |   40 +-
 features/mobile/reshare.feature                    |   20 +-
 features/mobile/signs_up.feature                   |   15 +-
 features/mobile/tags.feature                       |    9 +-
 features/mobile/user_applications.feature          |   23 +
 features/step_definitions/aspects_steps.rb         |   39 +-
 features/step_definitions/auth_code_steps.rb       |   40 +
 features/step_definitions/comment_steps.rb         |   25 +-
 features/step_definitions/conversations_steps.rb   |   12 +-
 features/step_definitions/custom_web_steps.rb      |   69 +-
 features/step_definitions/drawer_steps.rb          |    5 +
 features/step_definitions/gallery_steps.rb         |   11 +
 features/step_definitions/implicit_flow_steps.rb   |   63 +
 .../step_definitions/keyboard_navigation_steps.rb  |   11 +-
 features/step_definitions/lightbox_steps.rb        |   19 -
 features/step_definitions/location_steps.rb        |   11 +
 features/step_definitions/mention_steps.rb         |   18 +-
 features/step_definitions/message_steps.rb         |    2 -
 features/step_definitions/mobile_steps.rb          |   12 +-
 features/step_definitions/modal_steps.rb           |   19 +-
 features/step_definitions/notifications_steps.rb   |    4 +-
 features/step_definitions/oidc_common_steps.rb     |   39 +
 features/step_definitions/post_preview_steps.rb    |   34 +-
 features/step_definitions/post_with_poll_steps.rb  |    4 +-
 features/step_definitions/posts_steps.rb           |   33 +-
 features/step_definitions/profile_steps.rb         |    4 +
 features/step_definitions/search_steps.rb          |   21 +-
 features/step_definitions/session_steps.rb         |   37 +-
 features/step_definitions/stream_steps.rb          |   14 +
 features/step_definitions/tag_steps.rb             |   15 +-
 .../step_definitions/user_applications_steps.rb    |   16 +
 features/step_definitions/user_steps.rb            |   40 +-
 features/step_definitions/web_steps.rb             |   26 +-
 features/support/application_cuke_helpers.rb       |   18 +-
 features/support/download_helpers.rb               |   40 -
 features/support/env.rb                            |   51 +-
 features/support/matchers.rb                       |   13 +-
 features/support/paths.rb                          |   96 +-
 features/support/poor_mans_webmock.rb              |   20 +-
 features/support/publishing_cuke_helpers.rb        |   37 +-
 features/support/user_cuke_helpers.rb              |   31 +-
 graphics/README.md                                 |    4 +
 graphics/dandelion.jpg                             |  Bin 0 -> 293373 bytes
 lib/account_deleter.rb                             |   26 +-
 .../openid_connect/authorization_point/endpoint.rb |   62 +
 .../endpoint_confirmation_point.rb                 |   72 +
 .../authorization_point/endpoint_start_point.rb    |   35 +
 lib/api/openid_connect/error.rb                    |   16 +
 lib/api/openid_connect/id_token.rb                 |   70 +
 lib/api/openid_connect/id_token_config.rb          |   16 +
 .../openid_connect/protected_resource_endpoint.rb  |   38 +
 .../openid_connect/subject_identifier_creator.rb   |   17 +
 lib/api/openid_connect/token_endpoint.rb           |   57 +
 lib/assets/javascripts/charcount.js                |   33 +
 lib/assets/javascripts/jquery.autoresize.js        |  274 ---
 lib/assets/javascripts/jquery.mentionsInput.js     |  443 ----
 lib/assets/javascripts/keycodes.js                 |  117 +
 lib/bookmarklet_renderer.rb                        |   28 +
 lib/configuration_methods.rb                       |   32 +-
 lib/connection_tester.rb                           |  271 +++
 lib/diaspora.rb                                    |    1 -
 lib/diaspora/encryptable.rb                        |   52 -
 lib/diaspora/exceptions.rb                         |   22 -
 lib/diaspora/federated.rb                          |    8 +-
 lib/diaspora/federated/base.rb                     |   53 +-
 lib/diaspora/federated/generator.rb                |   31 +
 lib/diaspora/federated/relayable_retraction.rb     |   70 -
 lib/diaspora/federated/request.rb                  |  105 -
 lib/diaspora/federated/retraction.rb               |  100 +-
 lib/diaspora/federated/shareable.rb                |  130 --
 lib/diaspora/federated/signed_retraction.rb        |  107 -
 lib/diaspora/federation.rb                         |   80 +-
 lib/diaspora/federation/dispatcher.rb              |   80 +
 lib/diaspora/federation/dispatcher/private.rb      |   28 +
 lib/diaspora/federation/dispatcher/public.rb       |   45 +
 lib/diaspora/federation/entities.rb                |  257 ++
 lib/diaspora/federation/mappings.rb                |   81 +
 lib/diaspora/federation/receive.rb                 |  323 +++
 lib/diaspora/fetcher.rb                            |    1 -
 lib/diaspora/fetcher/public.rb                     |   15 +-
 lib/diaspora/fetcher/single.rb                     |   41 -
 lib/diaspora/fields/author.rb                      |   15 +
 lib/diaspora/fields/guid.rb                        |   18 +
 lib/diaspora/fields/target.rb                      |   14 +
 lib/diaspora/guid.rb                               |   18 -
 lib/diaspora/markdownify/html.rb                   |    6 +-
 lib/diaspora/mentionable.rb                        |   43 +-
 lib/diaspora/message_renderer.rb                   |   30 +-
 lib/diaspora/parser.rb                             |   22 -
 lib/diaspora/relayable.rb                          |  135 +-
 lib/diaspora/shareable.rb                          |  105 +-
 lib/diaspora/signature.rb                          |   18 +
 lib/email_inviter.rb                               |    6 +-
 lib/encryptor.rb                                   |   62 -
 lib/error_page_renderer.rb                         |   47 +
 lib/evil_query.rb                                  |   63 +-
 lib/federated/generator.rb                         |   43 -
 lib/federated/relayable.rb                         |   46 -
 lib/hydra_wrapper.rb                               |  110 -
 lib/messagebus/mailer.rb                           |   40 -
 lib/photo_exporter.rb                              |   44 +
 lib/postzord.rb                                    |    8 -
 lib/postzord/dispatcher.rb                         |  178 --
 lib/postzord/dispatcher/private.rb                 |   19 -
 lib/postzord/dispatcher/public.rb                  |   19 -
 lib/postzord/receiver.rb                           |   32 -
 lib/postzord/receiver/local_batch.rb               |   78 -
 lib/postzord/receiver/private.rb                   |  101 -
 lib/postzord/receiver/public.rb                    |  115 -
 lib/publisher.rb                                   |   26 +-
 lib/salmon.rb                                      |   30 -
 lib/salmon/encrypted_slap.rb                       |   68 -
 lib/salmon/magic_sig_envelope.rb                   |   81 -
 lib/salmon/slap.rb                                 |  168 --
 lib/stream/multi.rb                                |    2 +-
 lib/stream/person.rb                               |    7 +
 lib/stream/tag.rb                                  |   21 +-
 lib/tasks/accounts.rake                            |   15 -
 lib/tasks/assets.rake                              |   55 +-
 lib/tasks/db.rake                                  |   87 +-
 lib/tasks/linter.rake                              |   13 +-
 lib/tasks/maintenance.rake                         |   34 -
 lib/tasks/migrations.rake                          |  114 +-
 lib/unicorn_killer.rb                              |   53 -
 public/javascripts/custom-mobile-scripting.js      |   52 -
 script/ci/build.sh                                 |    4 +-
 script/server                                      |   18 +-
 spec/controllers/admin/pods_controller_spec.rb     |   53 +
 spec/controllers/admin/users_controller_spec.rb    |    2 +-
 spec/controllers/admins_controller_spec.rb         |   27 +-
 .../authorizations_controller_spec.rb              |  382 +++
 .../api/openid_connect/clients_controller_spec.rb  |  141 ++
 .../openid_connect/discovery_controller_spec.rb    |   35 +
 .../openid_connect/id_tokens_controller_spec.rb    |   19 +
 .../api/openid_connect/user_applications_spec.rb   |   17 +
 .../aspect_memberships_controller_spec.rb          |    2 +-
 spec/controllers/aspects_controller_spec.rb        |    2 +-
 spec/controllers/blocks_controller_spec.rb         |    2 +-
 spec/controllers/comments_controller_spec.rb       |    6 +-
 spec/controllers/contacts_controller_spec.rb       |  115 +-
 .../conversation_visibilities_controller_spec.rb   |   10 +-
 spec/controllers/conversations_controller_spec.rb  |   25 +-
 spec/controllers/help_controller_spec.rb           |   16 +
 spec/controllers/home_controller_spec.rb           |   65 +-
 spec/controllers/invitations_controller_spec.rb    |  176 +-
 spec/controllers/jasmine_fixtures/admins_spec.rb   |   18 +
 spec/controllers/jasmine_fixtures/aspects_spec.rb  |   23 +-
 spec/controllers/jasmine_fixtures/contacts_spec.rb |    7 +-
 .../jasmine_fixtures/conversations_spec.rb         |    2 +-
 .../jasmine_fixtures/notifications_spec.rb         |    2 +-
 spec/controllers/jasmine_fixtures/people_spec.rb   |   15 +-
 spec/controllers/jasmine_fixtures/photos_spec.rb   |    2 +-
 .../jasmine_fixtures/status_messages_spec.rb       |    4 +-
 spec/controllers/jasmine_fixtures/streams_spec.rb  |    2 +-
 spec/controllers/jasmine_fixtures/users_spec.rb    |   19 +
 spec/controllers/likes_controller_spec.rb          |    2 +-
 spec/controllers/messages_controller_spec.rb       |   25 +-
 spec/controllers/notifications_controller_spec.rb  |    4 +-
 spec/controllers/participations_controller_spec.rb |    2 +-
 spec/controllers/passwords_controller_spec.rb      |    2 -
 spec/controllers/people_controller_spec.rb         |  131 +-
 spec/controllers/photos_controller_spec.rb         |   49 +-
 spec/controllers/posts_controller_spec.rb          |  154 +-
 spec/controllers/profiles_controller_spec.rb       |    2 +-
 spec/controllers/registrations_controller_spec.rb  |  144 +-
 spec/controllers/report_controller_spec.rb         |   32 +-
 spec/controllers/reshares_controller_spec.rb       |    9 +-
 spec/controllers/search_controller_spec.rb         |    4 +-
 spec/controllers/services_controller_spec.rb       |    6 +-
 spec/controllers/sessions_controller_spec.rb       |    6 +-
 .../share_visibilities_controller_spec.rb          |    2 +-
 spec/controllers/social_relay_controller_spec.rb   |   16 +
 .../controllers/status_messages_controller_spec.rb |   85 +-
 spec/controllers/tag_followings_controller_spec.rb |    2 +-
 spec/controllers/tags_controller_spec.rb           |   38 +-
 spec/controllers/terms_controller_spec.rb          |   15 +
 spec/controllers/users_controller_spec.rb          |   40 +-
 spec/factories.rb                                  |  154 +-
 spec/federation_callbacks_spec.rb                  |  314 ++-
 ...client_assertion_with_nonexistent_client_id.txt |    1 +
 .../client_assertion_with_nonexistent_kid.txt      |    1 +
 .../client_assertion_with_tampered_sig.txt         |    1 +
 .../data_conversion/aspect_memberships.csv         |    7 -
 spec/fixtures/data_conversion/aspects.csv          |    5 -
 spec/fixtures/data_conversion/comments.csv         |    3 -
 spec/fixtures/data_conversion/contacts.csv         |    7 -
 spec/fixtures/data_conversion/invitations.csv      |    2 -
 spec/fixtures/data_conversion/notifications.csv    |    3 -
 spec/fixtures/data_conversion/people.csv           |   61 -
 .../fixtures/data_conversion/post_visibilities.csv |    9 -
 spec/fixtures/data_conversion/posts.csv            |    7 -
 spec/fixtures/data_conversion/profiles.csv         |   11 -
 spec/fixtures/data_conversion/requests.csv         |    3 -
 spec/fixtures/data_conversion/services.csv         |    3 -
 spec/fixtures/data_conversion/users.csv            |  169 --
 spec/fixtures/jwks.json                            |    1 +
 spec/fixtures/public_posts.json                    |    2 +-
 spec/fixtures/valid_client_assertion.txt           |    1 +
 spec/helpers/application_helper_spec.rb            |   18 +-
 spec/helpers/gon_helper_spec.rb                    |   48 +
 .../interim_stream_hackiness_helper_spec.rb        |    7 +-
 spec/helpers/invitation_codes_helper_spec.rb       |   15 -
 spec/helpers/language_helper_spec.rb               |   10 +
 spec/helpers/meta_data_helper_spec.rb              |   55 +
 spec/helpers/mobile_helper_spec.rb                 |   19 -
 spec/helpers/notifications_helper_spec.rb          |   14 +-
 spec/helpers/open_graph_helper_spec.rb             |   14 -
 spec/helpers/people_helper_spec.rb                 |   11 +-
 spec/helpers/posts_helper_spec.rb                  |    2 +-
 spec/helpers/report_helper_spec.rb                 |   26 +-
 spec/helpers/users_helper_spec.rb                  |   42 +
 spec/integration/account_deletion_spec.rb          |  116 +-
 spec/integration/api/user_info_controller_spec.rb  |   21 +
 spec/integration/attack_vectors_spec.rb            |  262 ---
 spec/integration/dispatching_spec.rb               |   39 +-
 spec/integration/federation/attack_vectors_spec.rb |  129 +
 spec/integration/federation/federation_helper.rb   |   53 +-
 .../federation/receive_federation_messages_spec.rb |   38 +-
 .../federation/shared_receive_relayable.rb         |   15 +-
 .../federation/shared_receive_retraction.rb        |   11 +-
 .../federation/shared_receive_stream_items.rb      |   64 +-
 spec/integration/mentioning_spec.rb                |   71 +-
 spec/integration/mobile_posts_spec.rb              |   36 +
 spec/integration/profile_spec.rb                   |   26 +-
 spec/integration/receiving_spec.rb                 |  331 +--
 spec/javascripts/app/app_spec.js                   |    7 +
 .../app/collections/aspect_memberships_spec.js     |   17 +
 .../app/collections/aspect_selections_spec.js      |   82 +
 spec/javascripts/app/collections/aspects_spec.js   |   94 -
 spec/javascripts/app/collections/pods_spec.js      |   16 +
 .../javascripts/app/helpers/date_formatter_spec.js |    1 -
 .../app/helpers/handlebars-helpers_spec.js         |    4 -
 spec/javascripts/app/helpers/locations_spec.js     |   29 +
 .../javascripts/app/helpers/text_formatter_spec.js |   25 +-
 spec/javascripts/app/models/contact_spec.js        |    7 +
 spec/javascripts/app/models/person_spec.js         |    9 +
 spec/javascripts/app/models/pod_spec.js            |   45 +
 .../app/models/post/interacations_spec.js          |   87 +
 spec/javascripts/app/pages/admin_dashboard_spec.js |  166 ++
 spec/javascripts/app/pages/contacts_spec.js        |  248 +-
 spec/javascripts/app/pages/getting_started_spec.js |   15 +
 spec/javascripts/app/router_spec.js                |   22 +-
 .../app/views/aspect_create_view_spec.js           |   85 +-
 .../app/views/aspect_membership_view_spec.js       |  110 +-
 spec/javascripts/app/views/aspect_view_spec.js     |    4 +-
 .../app/views/aspects_dropdown_view_spec.js        |   99 +-
 .../app/views/aspects_list_view_spec.js            |   25 +-
 .../javascripts/app/views/bookmarklet_view_spec.js |   36 +-
 .../app/views/comment_stream_view_spec.js          |   46 +-
 .../app/views/contact_stream_view_spec.js          |  203 +-
 spec/javascripts/app/views/contact_view_spec.js    |  126 +-
 spec/javascripts/app/views/content_view_spec.js    |    5 +
 .../app/views/conversations_view_spec.js           |   40 +-
 spec/javascripts/app/views/feedback_view_spec.js   |    8 -
 .../app/views/flash_messages_view-spec.js          |   33 +
 spec/javascripts/app/views/header_view_spec.js     |   65 +-
 spec/javascripts/app/views/help_view_spec.js       |   11 +-
 spec/javascripts/app/views/hovercard_view_spec.js  |   34 +-
 spec/javascripts/app/views/likes_info_view_spec.js |   20 +-
 spec/javascripts/app/views/location_stream_spec.js |   45 +
 spec/javascripts/app/views/location_view_spec.js   |   17 -
 spec/javascripts/app/views/locator_spec.js         |   16 +
 .../app/views/no_posts_info_view_spec.js           |   11 +
 .../app/views/notification_dropdown_view_spec.js   |  133 +-
 .../app/views/notifications_view_spec.js           |  211 +-
 spec/javascripts/app/views/photo_viewer_spec.js    |   19 -
 spec/javascripts/app/views/pod_entry_view_spec.js  |   96 +
 spec/javascripts/app/views/poll_view_spec.js       |   14 +-
 .../app/views/preview_post_view_spec.js            |   81 +
 .../app/views/profile_sidebar_view_spec.js         |    1 +
 .../app/views/publisher_mention_view_spec.js       |  480 ++++
 spec/javascripts/app/views/publisher_view_spec.js  |  270 ++-
 .../app/views/reshares_info_view_spec.js           |   46 +
 .../javascripts/app/views/search_base_view_spec.js |  283 +++
 spec/javascripts/app/views/search_view_spec.js     |   52 +-
 .../app/views/single_post_content_view_spec.js     |   42 +
 .../javascripts/app/views/stream/shortcuts_spec.js |   56 +-
 .../app/views/stream_faces_view_spec.js            |   54 -
 spec/javascripts/app/views/stream_post_spec.js     |   24 +-
 .../app/views/tag_following_action_view_spec.js    |    4 +-
 spec/javascripts/app/views_spec.js                 |   84 +-
 spec/javascripts/bookmarklet-spec.js               |   25 +
 spec/javascripts/helpers/i18n_spec.js              |   12 +-
 spec/javascripts/helpers/markdown_editor_spec.js   |  237 ++
 spec/javascripts/jasmine_helpers/SpecHelper.js     |   80 +-
 spec/javascripts/jasmine_helpers/factory.js        |   52 +-
 spec/javascripts/lib/charcounter_spec.js           |  102 +
 spec/javascripts/lib/keycodes_spec.js              |   13 +
 spec/javascripts/mobile/mobile_application_spec.js |   22 +
 spec/javascripts/mobile/mobile_comments_spec.js    |  164 ++
 spec/javascripts/mobile/mobile_drawer_spec.js      |   47 +
 .../javascripts/mobile/mobile_post_actions_spec.js |  232 ++
 spec/javascripts/support/jasmine.yml               |    5 +-
 spec/javascripts/widgets/flash-messages-spec.js    |   36 -
 spec/javascripts/widgets/lightbox-spec.js          |   95 -
 spec/lib/account_deleter_spec.rb                   |   52 +-
 .../protected_resource_endpoint_spec.rb            |   86 +
 spec/lib/api/openid_connect/token_endpoint_spec.rb |  246 ++
 spec/lib/configuration_methods_spec.rb             |   26 +-
 spec/lib/connection_tester_spec.rb                 |  162 ++
 spec/lib/diaspora/encryptable_spec.rb              |   29 -
 spec/lib/diaspora/federated/base_spec.rb           |   25 +
 spec/lib/diaspora/federated/generator_spec.rb      |   25 -
 .../federated/relayable_retraction_spec.rb         |  158 --
 spec/lib/diaspora/federated/request_spec.rb        |  166 --
 spec/lib/diaspora/federated/retraction_spec.rb     |  182 +-
 .../diaspora/federated/signed_retraction_spec.rb   |   47 -
 spec/lib/diaspora/federated_base_spec.rb           |   19 -
 .../diaspora/federation/dispatcher/private_spec.rb |   59 +
 .../diaspora/federation/dispatcher/public_spec.rb  |   92 +
 spec/lib/diaspora/federation/dispatcher_spec.rb    |   64 +
 spec/lib/diaspora/federation/entities_spec.rb      |  364 +++
 spec/lib/diaspora/federation/receive_spec.rb       |  700 ++++++
 spec/lib/diaspora/fetcher/public_spec.rb           |   12 +-
 spec/lib/diaspora/markdownify_email_spec.rb        |   13 +-
 spec/lib/diaspora/markdownify_spec.rb              |   17 +-
 spec/lib/diaspora/mentionable_spec.rb              |   65 +-
 spec/lib/diaspora/message_renderer_spec.rb         |    2 +-
 spec/lib/diaspora/parser_spec.rb                   |   34 -
 spec/lib/diaspora/shareable_spec.rb                |   30 +
 spec/lib/diaspora/taggable_spec.rb                 |    8 +-
 spec/lib/encryptor_spec.rb                         |   21 -
 spec/lib/evil_query_spec.rb                        |   62 +-
 spec/lib/hydra_wrapper_spec.rb                     |  110 -
 spec/lib/i18n_interpolation_fallbacks_spec.rb      |   18 +-
 spec/lib/postzord/dispatcher/private_spec.rb       |   17 -
 spec/lib/postzord/dispatcher/public_spec.rb        |    9 -
 spec/lib/postzord/dispatcher_spec.rb               |  339 ---
 spec/lib/postzord/receiver/local_batch_spec.rb     |   93 -
 spec/lib/postzord/receiver/private_spec.rb         |   89 -
 spec/lib/postzord/receiver/public_spec.rb          |  134 --
 spec/lib/postzord/receiver_spec.rb                 |   66 -
 spec/lib/publisher_spec.rb                         |    8 +-
 spec/lib/salmon/encrypted_slap_spec.rb             |   93 -
 spec/lib/salmon/magic_sig_envelope_spec.rb         |    5 -
 spec/lib/salmon/slap_spec.rb                       |  110 -
 spec/lib/stream/multi_spec.rb                      |    4 +-
 spec/lib/stream/person_spec.rb                     |   20 +-
 spec/lib/stream/public_spec.rb                     |    7 +
 spec/lib/stream/tag_spec.rb                        |   21 +-
 spec/mailers/notifier_spec.rb                      |   15 +-
 spec/mailers/report_spec.rb                        |   29 +-
 spec/misc_spec.rb                                  |   28 +-
 spec/models/account_deletion_spec.rb               |   50 +-
 spec/models/aspect_visibility_spec.rb              |   32 +
 spec/models/comment_signature_spec.rb              |   11 +
 spec/models/comment_spec.rb                        |  108 +-
 spec/models/contact_spec.rb                        |  185 +-
 spec/models/conversation_spec.rb                   |   61 -
 spec/models/invitation_spec.rb                     |   74 -
 spec/models/like_signature_spec.rb                 |   11 +
 spec/models/like_spec.rb                           |   96 +-
 spec/models/mention_spec.rb                        |   46 +-
 spec/models/message_spec.rb                        |  128 +-
 spec/models/notification_spec.rb                   |   92 +-
 spec/models/notifications/also_commented_spec.rb   |   67 +
 spec/models/notifications/mentioned_spec.rb        |   72 +
 spec/models/notifications/private_message_spec.rb  |  105 +-
 spec/models/notifications/reshared_spec.rb         |   63 +-
 spec/models/notifications/started_sharing_spec.rb  |   33 +
 spec/models/participation_spec.rb                  |   49 +-
 spec/models/person_spec.rb                         |  205 +-
 spec/models/photo_spec.rb                          |   76 +-
 spec/models/pod_spec.rb                            |  175 +-
 spec/models/poll_participation_signature_spec.rb   |   11 +
 spec/models/poll_participation_spec.rb             |  116 +-
 spec/models/post_spec.rb                           |  288 +--
 spec/models/profile_spec.rb                        |   75 +-
 spec/models/report_spec.rb                         |   10 +-
 spec/models/reshare_spec.rb                        |  315 +--
 spec/models/services/facebook_spec.rb              |   31 +-
 spec/models/services/tumblr_spec.rb                |   23 +-
 spec/models/services/twitter_spec.rb               |   17 +-
 spec/models/share_visibility_spec.rb               |   52 +-
 spec/models/signature_order_spec.rb                |   25 +
 spec/models/status_message_spec.rb                 |  467 ++--
 spec/models/user/connecting_spec.rb                |  201 +-
 spec/models/user/querying_spec.rb                  |   57 +-
 spec/models/user/social_actions_spec.rb            |  122 +-
 spec/models/user_spec.rb                           |  174 +-
 spec/presenters/contact_presenter_spec.rb          |    8 +
 spec/presenters/node_info_presenter_spec.rb        |    2 +-
 spec/presenters/person_presenter_spec.rb           |   76 +-
 spec/presenters/post_presenter_spec.rb             |   46 +-
 spec/presenters/profile_presenter_spec.rb          |   13 +
 spec/presenters/social_relay_presenter_spec.rb     |  122 +
 spec/presenters/statistics_presenter_spec.rb       |   24 +-
 spec/requests_helper.rb                            |    5 -
 spec/serializers/notification_serializer_spec.rb   |   53 +
 spec/serializers/post_serializer_spec.rb           |    3 -
 spec/services/comment_service_spec.rb              |  102 +
 spec/services/post_service_spec.rb                 |  211 +-
 .../status_message_creation_service_spec.rb        |  208 ++
 spec/shared_behaviors/account_deletion.rb          |    4 -
 spec/shared_behaviors/dispatcher.rb                |   85 +
 spec/shared_behaviors/receiving.rb                 |   75 +
 spec/shared_behaviors/relayable.rb                 |  123 +-
 spec/shared_behaviors/signature.rb                 |   57 +
 spec/spec_helper.rb                                |   44 +-
 spec/support/fake_typhoeus.rb                      |   22 -
 spec/support/fixture_generation.rb                 |    3 +
 spec/support/gon.rb                                |   30 +
 spec/support/user_methods.rb                       |   11 +-
 spec/workers/deferred_dispatch_spec.rb             |    4 +-
 spec/workers/delete_post_from_service_spec.rb      |   19 +-
 spec/workers/http_multi_spec.rb                    |  141 --
 spec/workers/notify_local_users_spec.rb            |   19 -
 spec/workers/receive_local_batch_spec.rb           |   14 -
 spec/workers/receive_private_spec.rb               |   40 +
 spec/workers/receive_public_spec.rb                |   31 +
 spec/workers/receive_salmon_spec.rb                |   23 -
 spec/workers/receive_spec.rb                       |   23 -
 spec/workers/recurring_pod_check_spec.rb           |   17 +
 spec/workers/resend_invitation_spec.rb             |   17 -
 spec/workers/send_base_spec.rb                     |   20 +
 spec/workers/send_private_spec.rb                  |   44 +
 spec/workers/send_public_spec.rb                   |   41 +
 .../javascripts/jquery.autocomplete-custom.js      |  763 ------
 vendor/assets/javascripts/jquery.charcount.js      |   58 -
 vendor/assets/javascripts/keycodes.js              |  117 -
 vendor/assets/javascripts/mbp-helper.js            |  171 --
 vendor/assets/javascripts/typeahead.bundle.js      | 2466 ++++++++++++++++++++
 1335 files changed, 39415 insertions(+), 44742 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