[DRE-commits] [diaspora] 46/257: Merge tag 'upstream/0.5.0_git.20141112.b4a24bd49e'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sun Apr 12 14:16:51 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 7c1e4cf997339027dc2856ff7ac242fc61618474
Merge: b49d360 403bd27
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Fri Nov 14 19:28:43 2014 +0530
Merge tag 'upstream/0.5.0_git.20141112.b4a24bd49e'
Upstream version 0.5.0~git.20141112.b4a24bd49e
.gitignore | 12 +-
.ruby-gemset | 1 +
.ruby-version | 1 +
.rvmrc | 21 -
.travis.yml | 8 +-
Changelog.md | 281 ++-
Gemfile | 196 +-
Gemfile.lock | 748 ++++----
app/assets/images/branding-s78f0383719.png | Bin 0 -> 247843 bytes
app/assets/images/branding/header-logo_hover.png | Bin 0 -> 3931 bytes
app/assets/images/branding/logo.png | Bin 0 -> 4153 bytes
app/assets/images/branding/logo_caps.png | Bin 1761 -> 0 bytes
app/assets/images/branding/logo_small.png | Bin 0 -> 1280 bytes
app/assets/images/branding/logo_white.png | Bin 0 -> 1488 bytes
app/assets/images/branding/logo_white2x.png | Bin 0 -> 3020 bytes
app/assets/images/branding/logo_white4x.png | Bin 0 -> 2723 bytes
app/assets/images/branding/powered_by_diaspora.png | Bin 1461 -> 1681 bytes
app/assets/images/branding/white.png | Bin 801 -> 0 bytes
app/assets/images/branding/white2x.png | Bin 3364 -> 3020 bytes
app/assets/images/branding/white_on_grey.png | Bin 1014 -> 3576 bytes
app/assets/images/icons-s71323e8d98.png | Bin 0 -> 50590 bytes
app/assets/images/icons/asterisk_white_mobile.png | Bin 0 -> 2658 bytes
app/assets/images/icons/circle.png | Bin 255 -> 0 bytes
app/assets/images/icons/compose_mobile.png | Bin 1488 -> 1520 bytes
app/assets/images/icons/cubbies.png | Bin 3299 -> 0 bytes
app/assets/images/icons/mail_white.png | Bin 0 -> 992 bytes
app/assets/images/icons/menu.png | Bin 0 -> 262 bytes
app/assets/images/icons/notifications_white.png | Bin 0 -> 2357 bytes
app/assets/images/icons/report.png | Bin 0 -> 173 bytes
.../images/social_media_logos-s87df44da1f.png | Bin 0 -> 39864 bytes
.../images/social_media_logos/wordpress-16x16.png | Bin 1394 -> 823 bytes
.../images/social_media_logos/wordpress-24x24.png | Bin 1639 -> 1261 bytes
.../images/social_media_logos/wordpress-32x32.png | Bin 1754 -> 1778 bytes
.../images/social_media_logos/wordpress-48x48.png | Bin 2282 -> 2486 bytes
app/assets/javascripts/app/app.js | 33 +-
app/assets/javascripts/app/collections/aspects.js | 4 +
app/assets/javascripts/app/collections/comments.js | 4 +
app/assets/javascripts/app/collections/likes.js | 4 +
app/assets/javascripts/app/collections/photos.js | 4 +
app/assets/javascripts/app/collections/posts.js | 4 +
app/assets/javascripts/app/collections/reshares.js | 4 +
.../javascripts/app/collections/tag_followings.js | 4 +
app/assets/javascripts/app/forms/picture_form.js | 59 -
app/assets/javascripts/app/forms/post_form.js | 18 -
.../javascripts/app/helpers/date_formatter.js | 4 +
.../javascripts/app/helpers/direction_detector.js | 95 +
.../javascripts/app/helpers/handlebars-helpers.js | 77 +-
.../javascripts/app/helpers/handlebars-partials.js | 6 +-
app/assets/javascripts/app/helpers/o_embed.js | 6 +-
app/assets/javascripts/app/helpers/open_graph.js | 4 +
.../javascripts/app/helpers/text_formatter.js | 25 +-
app/assets/javascripts/app/models.js | 3 +
app/assets/javascripts/app/models/aspect.js | 6 +-
.../javascripts/app/models/aspect_membership.js | 6 +-
app/assets/javascripts/app/models/block.js | 4 +
app/assets/javascripts/app/models/comment.js | 4 +
app/assets/javascripts/app/models/like.js | 4 +
app/assets/javascripts/app/models/person.js | 53 +
app/assets/javascripts/app/models/photo.js | 4 +
.../javascripts/app/models/poll_participation.js | 9 +
app/assets/javascripts/app/models/post.js | 12 +
.../javascripts/app/models/post/interactions.js | 4 +
app/assets/javascripts/app/models/profile.js | 4 +
app/assets/javascripts/app/models/report.js | 8 +
app/assets/javascripts/app/models/reshare.js | 4 +
.../javascripts/app/models/status_message.js | 7 +-
app/assets/javascripts/app/models/stream.js | 17 +-
.../javascripts/app/models/stream_aspects.js | 4 +
app/assets/javascripts/app/models/tag_following.js | 4 +
app/assets/javascripts/app/models/user.js | 8 +
app/assets/javascripts/app/pages/profile.js | 133 ++
.../javascripts/app/pages/single-post-viewer.js | 5 +-
app/assets/javascripts/app/pages/stream.js | 68 -
app/assets/javascripts/app/router.js | 78 +-
app/assets/javascripts/app/views.js | 53 +-
.../app/views/aspect_membership_blueprint_view.js | 172 ++
.../app/views/aspect_membership_view.js | 78 +-
app/assets/javascripts/app/views/aspect_view.js | 4 +
.../javascripts/app/views/aspects_dropdown_view.js | 92 +-
.../javascripts/app/views/aspects_list_view.js | 4 +
.../javascripts/app/views/bookmarklet_view.js | 49 +
.../javascripts/app/views/comment_stream_view.js | 10 +
app/assets/javascripts/app/views/comment_view.js | 7 +-
app/assets/javascripts/app/views/contacts_view.js | 116 ++
app/assets/javascripts/app/views/content_view.js | 7 +-
.../app/views/conversations_form_view.js | 31 +
.../javascripts/app/views/conversations_view.js | 38 +
.../javascripts/app/views/faq_question_view.js | 41 +
.../javascripts/app/views/feedback_actions.js | 6 +-
app/assets/javascripts/app/views/feedback_view.js | 14 +-
app/assets/javascripts/app/views/header_view.js | 16 +-
.../javascripts/app/views/help_section_view.js | 58 +
app/assets/javascripts/app/views/help_view.js | 175 +-
app/assets/javascripts/app/views/hovercard_view.js | 54 +-
.../javascripts/app/views/infinite_stream_view.js | 4 +
.../javascripts/app/views/likes_info_view.js | 6 +-
.../javascripts/app/views/location_stream.js | 4 +
app/assets/javascripts/app/views/location_view.js | 9 +-
.../javascripts/app/views/notifications_view.js | 96 +
app/assets/javascripts/app/views/photo_view.js | 19 +-
app/assets/javascripts/app/views/photo_viewer.js | 6 +-
app/assets/javascripts/app/views/photos_view.js | 4 +
app/assets/javascripts/app/views/poll_view.js | 113 ++
.../javascripts/app/views/post/canvas_frame.js | 66 -
.../javascripts/app/views/post/small_frame.js | 83 -
.../javascripts/app/views/post/stream_frame.js | 29 -
.../app/views/post/stream_interactions_view.js | 20 -
app/assets/javascripts/app/views/post_view.js | 10 +-
.../javascripts/app/views/profile_header_view.js | 70 +
.../javascripts/app/views/profile_sidebar_view.js | 17 +
.../publisher/aspect_selector_blueprint_view.js | 94 +
.../app/views/publisher/aspect_selector_view.js | 95 +-
.../app/views/publisher/getting_started_view.js | 17 +-
.../app/views/publisher/poll_creator_view.js | 109 ++
.../app/views/publisher/services_view.js | 6 +-
.../app/views/publisher/uploader_view.js | 22 +-
app/assets/javascripts/app/views/publisher_view.js | 179 +-
app/assets/javascripts/app/views/sidebar.js | 4 +
.../app/views/single-post-viewer/new_comment.js | 42 -
.../app/views/single-post-viewer/reactions.js | 45 -
.../single-post-viewer/single_post_actions.js | 20 +-
.../single_post_comment_stream.js | 20 +
.../single-post-viewer/single_post_content_view.js | 15 +-
.../single-post-viewer/single_post_interactions.js | 4 +
.../javascripts/app/views/stream/shortcuts.js | 11 +-
.../javascripts/app/views/stream_faces_view.js | 4 +
.../javascripts/app/views/stream_post_views.js | 31 +-
app/assets/javascripts/app/views/stream_view.js | 4 +
.../app/views/tag_following_action_view.js | 16 +-
.../app/views/tag_following_list_view.js | 4 +
.../javascripts/app/views/tag_following_view.js | 4 +
app/assets/javascripts/aspect-edit-pane.js | 120 --
app/assets/javascripts/aspect-sorting.js | 18 -
app/assets/javascripts/aspects-dropdown.js | 32 +-
.../javascripts/bootstrap-scrollspy-custom.js | 145 --
app/assets/javascripts/browser_detection.js | 9 +
app/assets/javascripts/clear-form.js | 1 +
app/assets/javascripts/contact-edit.js | 75 -
app/assets/javascripts/contact-list.js | 61 +-
app/assets/javascripts/diaspora.js | 4 +
app/assets/javascripts/finder.js | 5 -
app/assets/javascripts/friend-finder.js | 25 -
app/assets/javascripts/helpers/alert.js | 6 +-
app/assets/javascripts/helpers/i18n.js | 98 +-
app/assets/javascripts/home.js | 1 -
app/assets/javascripts/ie.js | 4 +
app/assets/javascripts/inbox.js | 37 +-
app/assets/javascripts/jasmine-load-all.js | 7 +-
app/assets/javascripts/login.js | 30 -
app/assets/javascripts/main.js | 19 +-
app/assets/javascripts/mentions.js | 4 +
app/assets/javascripts/mobile.js | 28 +-
app/assets/javascripts/osmlocator.js | 6 +-
app/assets/javascripts/pages/contacts-index.js | 4 +
.../javascripts/pages/featured-users-index.js | 7 -
app/assets/javascripts/pages/invitations-edit.js | 4 +
app/assets/javascripts/pages/invitations-new.js | 3 +
.../javascripts/pages/notifications-index.js | 6 +-
app/assets/javascripts/pages/services-finder.js | 7 -
.../javascripts/pages/users-getting-started.js | 4 +
app/assets/javascripts/people.js | 26 -
app/assets/javascripts/photo-show.js | 72 -
app/assets/javascripts/photos.js | 5 -
app/assets/javascripts/validation.js | 48 -
app/assets/javascripts/view.js | 15 +-
app/assets/javascripts/widgets/back-to-top.js | 4 +
.../javascripts/widgets/direction-detector.js | 51 +-
app/assets/javascripts/widgets/flash-messages.js | 6 +-
app/assets/javascripts/widgets/header.js | 4 +
app/assets/javascripts/widgets/infinite-scroll.js | 5 +-
app/assets/javascripts/widgets/lightbox.js | 33 +-
.../javascripts/widgets/notifications-badge.js | 77 +-
app/assets/javascripts/widgets/notifications.js | 86 +-
app/assets/javascripts/widgets/search.js | 4 +
app/assets/javascripts/widgets/stream.js | 4 +
app/assets/javascripts/widgets/timeago.js | 15 +-
app/assets/stylesheets/admin.css.scss | 51 +
app/assets/stylesheets/application.css.sass | 1929 --------------------
app/assets/stylesheets/application.css.scss | 1817 ++++++++++++++++++
app/assets/stylesheets/aspects.css.scss | 261 +--
app/assets/stylesheets/bookmarklet.css.scss | 2 +
app/assets/stylesheets/bootstrap-complete.css.scss | 8 +-
app/assets/stylesheets/bootstrap-headerfix.sass | 42 -
app/assets/stylesheets/bootstrap-headerfix.scss | 52 +
app/assets/stylesheets/colors.css.scss | 1 +
app/assets/stylesheets/comments.css.scss | 42 +
app/assets/stylesheets/contacts.css.scss | 70 +
app/assets/stylesheets/conversations.css.scss | 229 ++-
app/assets/stylesheets/default.css | 15 -
app/assets/stylesheets/default.css.scss | 14 +
app/assets/stylesheets/entypo.css.scss | 316 +++-
app/assets/stylesheets/getting-started.css.scss | 37 +
app/assets/stylesheets/header.css.scss | 132 +-
app/assets/stylesheets/help.css.scss | 18 +-
app/assets/stylesheets/hovercard.css.scss | 27 +-
app/assets/stylesheets/invitations.css.scss | 23 +
app/assets/stylesheets/leftnavbar.css.scss | 48 +
app/assets/stylesheets/lightbox.css.scss | 35 +-
app/assets/stylesheets/login.css.scss | 111 --
app/assets/stylesheets/mentions.css.scss | 17 +-
app/assets/stylesheets/mobile.css.scss | 1272 -------------
app/assets/stylesheets/mobile/header.css.scss | 178 ++
app/assets/stylesheets/mobile/mobile.css.scss | 1178 ++++++++++++
app/assets/stylesheets/new-templates.css.scss | 44 +-
app/assets/stylesheets/new_styles/_base.scss | 32 +-
.../stylesheets/new_styles/_buttons.css.scss | 57 +
app/assets/stylesheets/new_styles/_forms.scss | 13 +
.../stylesheets/new_styles/_interactions.scss | 230 +--
app/assets/stylesheets/new_styles/_login.scss | 55 +-
app/assets/stylesheets/new_styles/_navs.scss | 15 +
app/assets/stylesheets/new_styles/_poll.scss | 43 +
.../stylesheets/new_styles/_registration.scss | 7 +-
app/assets/stylesheets/new_styles/_settings.scss | 17 +
app/assets/stylesheets/new_styles/_typography.scss | 4 +-
app/assets/stylesheets/new_styles/_viewer_nav.scss | 18 -
app/assets/stylesheets/notifications.css.scss | 82 +
app/assets/stylesheets/opengraph.css.scss | 32 +-
app/assets/stylesheets/people.css.scss | 29 +
app/assets/stylesheets/photo.css.scss | 19 +
app/assets/stylesheets/poll.css.scss | 32 +
app/assets/stylesheets/profile.css.scss | 221 ++-
app/assets/stylesheets/publisher.css.scss | 480 ++---
.../stylesheets/publisher_blueprint.css.scss | 410 +++++
app/assets/stylesheets/report.css.scss | 21 +
app/assets/stylesheets/rtl.css.scss | 6 +-
app/assets/stylesheets/sidebar.css.scss | 157 +-
app/assets/stylesheets/single-post-view.css.scss | 160 +-
app/assets/stylesheets/stream-faces.css.scss | 7 +
app/assets/stylesheets/stream.css.scss | 6 +
app/assets/stylesheets/stream_element.css.scss | 147 ++
.../stylesheets/stream_element_blueprint.css.scss | 288 +++
app/assets/stylesheets/tag.css.scss | 38 +
app/assets/stylesheets/tags.css.scss | 20 -
app/assets/stylesheets/ui.css.scss | 6 +-
app/assets/stylesheets/vendor/autoSuggest.css | 224 ---
app/assets/stylesheets/vendor/autoSuggest.css.erb | 226 +++
.../vendor/blueprint/{LICENSE => LICENSE.txt} | 0
app/assets/templates/aspects-dropdown_tpl.jst.hbs | 27 -
app/assets/templates/comment-stream_tpl.jst.hbs | 2 +-
app/assets/templates/comment_tpl.jst.hbs | 54 +-
app/assets/templates/faq_getting_help_tpl.jst.hbs | 22 +
.../templates/faq_keyboard_shortcuts_tpl.jst.hbs | 15 +
.../templates/faq_posts_and_posting_tpl.jst.hbs | 69 +
app/assets/templates/faq_question_tpl.jst.hbs | 9 +
app/assets/templates/faq_sharing_tpl.jst.hbs | 38 +
app/assets/templates/feedback-actions_tpl.jst.hbs | 33 -
app/assets/templates/feedback_tpl.jst.hbs | 2 +-
app/assets/templates/header_tpl.jst.hbs | 37 +-
app/assets/templates/help_tpl.jst.hbs | 78 +
app/assets/templates/hovercard_tpl.jst.hbs | 13 +
app/assets/templates/likes-info_tpl.jst.hbs | 2 +-
app/assets/templates/mood_tpl.jst.hbs | 23 -
app/assets/templates/opengraph_tpl.jst.hbs | 13 +-
app/assets/templates/photo_tpl.jst.hbs | 32 +-
app/assets/templates/picture-form_tpl.jst.hbs | 13 -
app/assets/templates/poll_creator_tpl.jst.hbs | 21 +
app/assets/templates/poll_tpl.jst.hbs | 42 +
app/assets/templates/post-form_tpl.jst.hbs | 8 -
app/assets/templates/profile_header_tpl.jst.hbs | 104 ++
app/assets/templates/profile_sidebar_tpl.jst.hbs | 37 +
app/assets/templates/reshare_tpl.jst.hbs | 2 +-
.../single-post-viewer/new-comment_tpl.jst.hbs | 8 -
.../single-post-viewer/reactions_tpl.jst.hbs | 36 -
.../single-post-actions_tpl.jst.hbs | 50 +-
.../single-post-content_tpl.jst.hbs | 103 +-
.../single-post-interactions_tpl.jst.hbs | 32 +-
.../templates/small-frame/default_tpl.jst.hbs | 52 -
app/assets/templates/status-message_tpl.jst.hbs | 1 +
app/assets/templates/stream-element_tpl.jst.hbs | 3 +
.../templates/stream-interactions_tpl.jst.hbs | 3 -
app/assets/templates/stream_tpl.jst.hbs | 2 +-
.../templates/tag_following_action_tpl.jst.hbs | 12 +-
app/controllers/admin/admin_controller.rb | 8 +
app/controllers/admin/users_controller.rb | 16 +
app/controllers/admins_controller.rb | 66 +-
app/controllers/application_controller.rb | 25 +-
app/controllers/aspect_memberships_controller.rb | 4 +-
app/controllers/aspects_controller.rb | 25 +-
app/controllers/blocks_controller.rb | 2 +-
app/controllers/comments_controller.rb | 6 +-
app/controllers/contacts_controller.rb | 49 +-
.../conversation_visibilities_controller.rb | 2 +-
app/controllers/conversations_controller.rb | 32 +-
app/controllers/help_controller.rb | 2 +
app/controllers/invitation_codes_controller.rb | 2 +-
app/controllers/invitations_controller.rb | 4 +-
app/controllers/likes_controller.rb | 2 +-
app/controllers/messages_controller.rb | 4 +-
app/controllers/notifications_controller.rb | 42 +-
app/controllers/passwords_controller.rb | 4 +
app/controllers/people_controller.rb | 103 +-
app/controllers/photos_controller.rb | 27 +-
app/controllers/poll_participations_controller.rb | 28 +
app/controllers/posts_controller.rb | 18 +-
app/controllers/profiles_controller.rb | 5 +-
app/controllers/publics_controller.rb | 8 +-
app/controllers/registrations_controller.rb | 6 +-
app/controllers/report_controller.rb | 44 +
app/controllers/reshares_controller.rb | 10 +-
app/controllers/search_controller.rb | 4 +-
app/controllers/services_controller.rb | 9 +-
app/controllers/sessions_controller.rb | 4 +-
app/controllers/share_visibilities_controller.rb | 2 +-
app/controllers/status_messages_controller.rb | 27 +-
app/controllers/streams_controller.rb | 6 +-
app/controllers/tag_followings_controller.rb | 6 +-
app/controllers/tags_controller.rb | 11 +-
app/controllers/terms_controller.rb | 20 +
app/controllers/users_controller.rb | 18 +-
app/helpers/application_helper.rb | 21 +-
app/helpers/aspect_global_helper.rb | 56 +-
app/helpers/aspects_helper.rb | 6 +-
app/helpers/contacts_helper.rb | 31 +-
app/helpers/language_helper.rb | 8 +-
app/helpers/layout_helper.rb | 18 +-
app/helpers/markdownify_helper.rb | 62 -
app/helpers/mobile_helper.rb | 2 +-
app/helpers/notifications_helper.rb | 5 +-
app/helpers/notifier_helper.rb | 20 +-
app/helpers/people_helper.rb | 48 +-
app/helpers/posts_helper.rb | 15 +-
app/helpers/publisher_helper.rb | 15 +
app/helpers/report_helper.rb | 17 +
app/helpers/stream_helper.rb | 4 +-
app/helpers/tags_helper.rb | 6 +-
app/mailers/maintenance.rb | 15 +
app/mailers/notification_mailers/also_commented.rb | 6 +-
app/mailers/notification_mailers/base.rb | 4 +-
.../notification_mailers/comment_on_post.rb | 6 +-
app/mailers/notifier.rb | 23 +-
app/mailers/report_mailer.rb | 29 +
app/models/account_deletion.rb | 1 +
app/models/acts_as_taggable_on-tag.rb | 23 +
app/models/acts_as_taggable_on/tag.rb | 25 -
app/models/aspect.rb | 2 +-
app/models/comment.rb | 12 +-
app/models/contact.rb | 33 +-
app/models/conversation.rb | 8 +-
app/models/mention.rb | 2 +-
app/models/message.rb | 6 +-
app/models/notification.rb | 42 +-
app/models/o_embed_cache.rb | 6 +-
app/models/open_graph_cache.rb | 22 +-
app/models/person.rb | 28 +-
app/models/photo.rb | 18 +-
app/models/pod.rb | 6 +-
app/models/poll.rb | 41 +
app/models/poll_answer.rb | 15 +
app/models/poll_participation.rb | 66 +
app/models/post.rb | 27 +-
app/models/profile.rb | 33 +-
app/models/report.rb | 67 +
app/models/reshare.rb | 70 +-
app/models/role.rb | 6 +-
app/models/service.rb | 11 +-
app/models/services/facebook.rb | 14 +-
app/models/services/tumblr.rb | 9 +-
app/models/services/twitter.rb | 16 +-
app/models/services/wordpress.rb | 30 +-
app/models/share_visibility.rb | 11 +-
app/models/status_message.rb | 41 +-
app/models/user.rb | 64 +-
app/models/user/connecting.rb | 6 +-
app/models/user/querying.rb | 31 +-
app/models/user/social_actions.rb | 5 +
app/models/user_preference.rb | 3 +-
app/presenters/avatar_presenter.rb | 12 +
app/presenters/base_presenter.rb | 28 +-
app/presenters/block_presenter.rb | 6 +
app/presenters/comment_presenter.rb | 4 +-
app/presenters/o_embed_presenter.rb | 5 +-
app/presenters/person_presenter.rb | 79 +-
app/presenters/photo_presenter.rb | 16 +
app/presenters/post_presenter.rb | 22 +-
app/presenters/profile_presenter.rb | 24 +
app/presenters/statistics_presenter.rb | 20 +-
app/views/admins/_admin_bar.haml | 7 +-
app/views/admins/_user_entry.haml | 64 +
app/views/admins/correlations.haml | 20 +-
app/views/admins/stats.html.haml | 75 +-
app/views/admins/user_search.html.haml | 78 +-
app/views/admins/weekly_user_stats.haml | 19 +-
.../_aspect_membership_dropdown.html.haml | 26 +
..._aspect_membership_dropdown_blueprint.html.haml | 19 +
app/views/aspects/_aspect_stream.haml | 2 +-
app/views/aspects/create.js.erb | 4 +-
app/views/aspects/edit.html.haml | 24 -
app/views/aspects/new.haml | 10 +-
app/views/aspects/toggle_contact_visibility.js.erb | 15 -
app/views/comments/_comment.mobile.haml | 6 +-
app/views/community_spotlight/_user.html.haml | 13 -
app/views/contacts/_aspect_listings.haml | 56 +-
app/views/contacts/_contact.html.haml | 22 +-
app/views/contacts/_header.html.haml | 35 +
app/views/contacts/_sidebar.html.haml | 7 +
app/views/contacts/index.html.haml | 63 +-
app/views/contacts/index.mobile.haml | 3 -
app/views/contacts/sharing.haml | 30 -
app/views/contacts/spotlight.haml | 41 +-
app/views/conversations/_conversation.haml | 14 +-
app/views/conversations/_conversation.mobile.haml | 2 +-
app/views/conversations/_new.haml | 18 +
app/views/conversations/_show.haml | 2 +-
app/views/conversations/index.haml | 33 +-
app/views/conversations/index.mobile.haml | 2 +-
app/views/conversations/new.haml | 53 -
app/views/conversations/new.html.haml | 11 +
app/views/conversations/new.mobile.haml | 52 +
app/views/conversations/show.js.erb | 8 +-
app/views/devise/passwords/edit.haml | 18 -
app/views/devise/passwords/edit.mobile.haml | 29 -
app/views/devise/passwords/new.haml | 14 -
app/views/devise/passwords/new.mobile.haml | 29 -
app/views/help/_faq_nav.haml | 16 -
app/views/help/_help_nav.haml | 2 -
.../help/account_and_data_management.html.haml | 35 -
app/views/help/aspects.html.haml | 59 -
app/views/help/faq.html.haml | 11 +
app/views/help/getting_help.html.haml | 29 -
app/views/help/mentions.html.haml | 31 -
app/views/help/miscellaneous.html.haml | 31 -
app/views/help/pods.html.haml | 27 -
app/views/help/posts_and_posting.html.haml | 60 -
app/views/help/private_posts.html.haml | 31 -
app/views/help/private_profiles.html.haml | 27 -
app/views/help/public_posts.html.haml | 35 -
app/views/help/public_profiles.html.haml | 31 -
app/views/help/resharing_posts.html.haml | 23 -
app/views/help/sharing.html.haml | 41 -
app/views/help/tags.html.haml | 35 -
app/views/invitations/new.html.haml | 55 +-
app/views/invitations/new_blueprint.html.haml | 34 +
app/views/layouts/application.html.haml | 5 +-
app/views/layouts/application.mobile.haml | 89 +-
.../centered_with_header_with_footer.html.haml | 8 +-
app/views/layouts/notifier.html.erb | 2 +-
.../maintenance/account_removal_warning.markerb | 2 +
app/views/messages/_message.haml | 5 +-
app/views/notifications/_notification.html.haml | 13 +
app/views/notifications/_notify_popup_item.haml | 12 +-
app/views/notifications/index.html.haml | 85 +-
app/views/notifications/index.mobile.haml | 11 +-
app/views/passwords/edit.haml | 27 +
app/views/passwords/edit.mobile.haml | 29 +
app/views/passwords/new.haml | 22 +
app/views/passwords/new.mobile.haml | 29 +
app/views/people/_aspect_membership_dropdown.haml | 2 +-
app/views/people/_index.html.haml | 20 +-
app/views/people/_person.html.haml | 27 +-
app/views/people/_profile_sidebar.html.haml | 92 -
app/views/people/_relationship_action.haml | 5 +-
app/views/people/_sub_header.html.haml | 34 -
app/views/people/contacts.haml | 48 +-
app/views/people/index.html.haml | 74 +-
app/views/people/index.mobile.haml | 8 +-
app/views/people/show.html.haml | 48 +-
app/views/people/show.mobile.haml | 8 +-
app/views/people/tag_index.js.erb | 2 +-
app/views/photos/_new_profile_photo.haml | 5 +-
app/views/photos/show.mobile.haml | 5 +-
app/views/posts/show.html.haml | 2 +-
app/views/profiles/_edit.haml | 53 +-
app/views/profiles/_edit_public.haml | 17 +-
app/views/profiles/edit.haml | 28 +-
app/views/profiles/edit.mobile.haml | 2 +-
app/views/publics/webfinger.erb | 1 +
app/views/publisher/_aspect_dropdown.html.haml | 38 +
app/views/publisher/_publisher.html.haml | 4 +
app/views/publisher/_publisher.mobile.haml | 42 +
app/views/publisher/_publisher_blueprint.html.haml | 104 ++
app/views/publisher/_publisher_bootstrap.html.haml | 80 +
app/views/registrations/new.html.erb | 11 +-
app/views/registrations/new.mobile.haml | 9 +-
app/views/report/index.html.haml | 29 +
app/views/report/report_email.markerb | 2 +
app/views/services/index.html.haml | 24 +-
app/views/sessions/new.haml | 55 -
app/views/sessions/new.html.erb | 48 -
app/views/sessions/new.html.haml | 40 +
app/views/shared/_aspect_dropdown.html.haml | 23 -
app/views/shared/_contact_list.html.haml | 2 +-
app/views/shared/_contact_sidebar.html.haml | 13 -
app/views/shared/_footer.mobile.haml | 6 -
app/views/shared/_invitations.haml | 8 +-
app/views/shared/_invitations_blueprint.haml | 3 +
app/views/shared/_links.haml | 2 +
app/views/shared/_modal.haml | 12 +
app/views/shared/_post_info.mobile.haml | 5 +-
app/views/shared/_publisher.html.haml | 93 -
app/views/shared/_publisher.mobile.haml | 43 -
app/views/shared/_right_sections.html.haml | 42 +-
app/views/shared/_settings_nav.haml | 10 +-
.../status_messages/_status_message.mobile.haml | 2 +-
app/views/status_messages/bookmarklet.html.haml | 41 +-
app/views/status_messages/bookmarklet.mobile.haml | 2 +-
app/views/status_messages/new.html.haml | 25 +-
app/views/status_messages/new.mobile.haml | 2 +-
app/views/streams/main_stream.html.haml | 13 +-
app/views/streams/main_stream.mobile.haml | 25 +-
app/views/tags/show.haml | 49 +-
app/views/terms/default.haml | 318 ++++
app/views/users/edit.html.haml | 429 ++---
app/views/users/edit.mobile.haml | 79 +-
app/views/users/getting_started.haml | 79 +-
app/views/users/privacy_settings.html.haml | 33 +-
app/views/users/public.atom.builder | 6 +-
app/workers/base.rb | 4 +-
app/workers/deferred_dispatch.rb | 3 +-
app/workers/gather_o_embed_data.rb | 2 +-
app/workers/gather_open_graph_data.rb | 2 +-
app/workers/http_multi.rb | 15 +-
app/workers/mail/report_worker.rb | 12 +
app/workers/process_photo.rb | 1 +
app/workers/queue_users_for_removal.rb | 41 +
app/workers/receive_local_batch.rb | 1 +
app/workers/remove_old_user.rb | 27 +
bin/autospec | 16 +
bin/bundle | 3 +
bin/compass | 16 +
bin/cucumber | 16 +
bin/foreman | 16 +
bin/guard | 16 +
bin/rails | 4 +
bin/rake | 4 +
bin/rspec | 16 +
bin/sass | 16 +
bin/sass-convert | 16 +
bin/scss | 16 +
bin/spork | 16 +
config/application.rb | 22 +-
config/boot.rb | 2 -
config/defaults.yml | 21 +-
config/diaspora.yml.example | 625 ++++---
config/environments/development.rb | 13 +-
config/environments/integration.rb | 2 -
config/environments/production.rb | 22 +-
config/environments/test.rb | 11 +-
config/initializers/acts_as_taggable_on.rb | 2 +-
config/initializers/client_side_validations.rb | 14 -
config/initializers/faraday.rb | 11 +-
config/initializers/filter_parameter_logging.rb | 4 +
config/initializers/json_escape.rb | 2 +-
config/initializers/load_libraries.rb | 5 +-
config/initializers/maintenance.rb | 16 +
config/initializers/rails_admin.rb | 35 +-
config/initializers/session_store.rb | 11 +-
config/initializers/setup_simple_captcha.rb | 5 +-
config/initializers/sidekiq.rb | 9 +-
config/initializers/strong_parameters.rb | 2 -
config/initializers/wrap_parameters.rb | 14 +
config/locale_settings.yml | 13 +-
config/locales/devise/devise.br.yml | 96 +-
config/locales/devise/devise.da.yml | 12 +-
config/locales/devise/devise.de.yml | 6 +-
config/locales/devise/devise.de_formal.yml | 8 +-
config/locales/devise/devise.en.yml | 8 +-
config/locales/devise/devise.en_valspeak.yml | 93 +
config/locales/devise/devise.es-AR.yml | 8 +-
config/locales/devise/devise.es-MX.yml | 9 +-
config/locales/devise/devise.es.yml | 12 +-
config/locales/devise/devise.fi.yml | 6 +-
config/locales/devise/devise.fr.yml | 12 +-
config/locales/devise/devise.gl.yml | 46 +-
config/locales/devise/devise.he.yml | 79 +-
config/locales/devise/devise.hu.yml | 8 +-
config/locales/devise/devise.ia.yml | 17 +-
config/locales/devise/devise.is.yml | 8 +-
config/locales/devise/devise.it.yml | 7 +-
config/locales/devise/devise.ja.yml | 5 +
config/locales/devise/devise.ko.yml | 5 +
config/locales/devise/devise.nb.yml | 10 +-
config/locales/devise/devise.nds.yml | 57 +
config/locales/devise/devise.nl.yml | 8 +-
config/locales/devise/devise.pl.yml | 14 +-
config/locales/devise/devise.pt-BR.yml | 16 +-
config/locales/devise/devise.pt-PT.yml | 10 +-
config/locales/devise/devise.ru.yml | 14 +-
config/locales/devise/devise.sk.yml | 12 +-
config/locales/devise/devise.sv.yml | 12 +-
config/locales/devise/devise.te.yml | 11 +-
config/locales/devise/devise.uk.yml | 13 +-
config/locales/diaspora/ar.yml | 39 +-
config/locales/diaspora/art-nvi.yml | 13 -
config/locales/diaspora/ast.yml | 218 +++
config/locales/diaspora/be.yml | 3 -
config/locales/diaspora/bg.yml | 35 +-
config/locales/diaspora/br.yml | 855 +++++----
config/locales/diaspora/bs.yml | 39 +-
config/locales/diaspora/cs.yml | 38 +-
config/locales/diaspora/cy.yml | 17 +-
config/locales/diaspora/da.yml | 380 ++--
config/locales/diaspora/de.yml | 203 +-
config/locales/diaspora/de_formal.yml | 201 +-
config/locales/diaspora/el.yml | 44 +-
config/locales/diaspora/en-AU.yml | 8 +
config/locales/diaspora/en-GB.yml | 8 +
config/locales/diaspora/en-US.yml | 9 +-
config/locales/diaspora/en.yml | 315 ++--
config/locales/diaspora/en_1337.yml | 35 +-
config/locales/diaspora/en_pirate.yml | 428 ++++-
config/locales/diaspora/en_shaw.yml | 33 +-
config/locales/diaspora/en_valspeak.yml | 1286 +++++++++++++
config/locales/diaspora/eo.yml | 58 +-
config/locales/diaspora/es-AR.yml | 254 ++-
config/locales/diaspora/es-CL.yml | 40 +-
config/locales/diaspora/es-CO.yml | 12 -
config/locales/diaspora/es-MX.yml | 291 ++-
config/locales/diaspora/es.yml | 264 ++-
config/locales/diaspora/eu.yml | 40 +-
config/locales/diaspora/fa.yml | 4 -
config/locales/diaspora/fi.yml | 194 +-
config/locales/diaspora/fil.yml | 13 +-
config/locales/diaspora/fr.yml | 359 ++--
config/locales/diaspora/fy.yml | 3 -
config/locales/diaspora/ga.yml | 4 -
config/locales/diaspora/gl.yml | 422 ++---
config/locales/diaspora/he.yml | 1062 +++++------
config/locales/diaspora/hi.yml | 2 -
config/locales/diaspora/hu.yml | 323 ++--
config/locales/diaspora/hy.yml | 141 +-
config/locales/diaspora/ia.yml | 339 +++-
config/locales/diaspora/id.yml | 240 ++-
config/locales/diaspora/io.yml | 7 +-
config/locales/diaspora/is.yml | 141 +-
config/locales/diaspora/it.yml | 123 +-
config/locales/diaspora/ja.yml | 39 +-
config/locales/diaspora/ka.yml | 21 +-
config/locales/diaspora/kk.yml | 25 +
config/locales/diaspora/kn.yml | 4 +-
config/locales/diaspora/ko.yml | 84 +-
config/locales/diaspora/lt.yml | 21 +-
config/locales/diaspora/lv.yml | 227 +++
config/locales/diaspora/mk.yml | 22 +-
config/locales/diaspora/ml.yml | 42 +-
config/locales/diaspora/ms.yml | 45 +-
config/locales/diaspora/nb.yml | 238 ++-
config/locales/diaspora/nds.yml | 956 ++++++++++
config/locales/diaspora/ne.yml | 2 -
config/locales/diaspora/nl.yml | 431 +++--
config/locales/diaspora/nn.yml | 53 +-
config/locales/diaspora/pa.yml | 11 +-
config/locales/diaspora/pl.yml | 399 ++--
config/locales/diaspora/pt-BR.yml | 357 ++--
config/locales/diaspora/pt-PT.yml | 411 +++--
config/locales/diaspora/ro.yml | 249 ++-
config/locales/diaspora/ru.yml | 418 +++--
config/locales/diaspora/si.yml | 5 -
config/locales/diaspora/sk.yml | 150 +-
config/locales/diaspora/sl.yml | 49 +-
config/locales/diaspora/sr.yml | 7 -
config/locales/diaspora/sv.yml | 231 ++-
config/locales/diaspora/te.yml | 660 +++++--
config/locales/diaspora/tr.yml | 187 +-
config/locales/diaspora/uk.yml | 616 +++++--
config/locales/diaspora/ur-PK.yml | 16 +-
config/locales/diaspora/vi.yml | 34 +-
config/locales/diaspora/wo.yml | 7 -
config/locales/diaspora/yi.yml | 3 -
config/locales/diaspora/zh-CN.yml | 36 +-
config/locales/diaspora/zh-TW.yml | 40 +-
config/locales/javascript/javascript.ar.yml | 1 -
config/locales/javascript/javascript.art-nvi.yml | 1 -
config/locales/javascript/javascript.bg.yml | 1 -
config/locales/javascript/javascript.br.yml | 150 +-
config/locales/javascript/javascript.bs.yml | 1 -
config/locales/javascript/javascript.cs.yml | 1 -
config/locales/javascript/javascript.cy.yml | 9 +-
config/locales/javascript/javascript.da.yml | 66 +-
config/locales/javascript/javascript.de.yml | 63 +-
config/locales/javascript/javascript.de_formal.yml | 40 +-
config/locales/javascript/javascript.el.yml | 1 -
config/locales/javascript/javascript.en.yml | 62 +-
config/locales/javascript/javascript.en_1337.yml | 7 +-
config/locales/javascript/javascript.en_pirate.yml | 17 +-
config/locales/javascript/javascript.en_shaw.yml | 17 +-
.../locales/javascript/javascript.en_valspeak.yml | 207 +++
config/locales/javascript/javascript.eo.yml | 7 +-
config/locales/javascript/javascript.es-AR.yml | 61 +-
config/locales/javascript/javascript.es-CL.yml | 1 -
config/locales/javascript/javascript.es-MX.yml | 11 +-
config/locales/javascript/javascript.es.yml | 62 +-
config/locales/javascript/javascript.et.yml | 1 -
config/locales/javascript/javascript.eu.yml | 1 -
config/locales/javascript/javascript.fi.yml | 57 +-
config/locales/javascript/javascript.fr.yml | 61 +-
config/locales/javascript/javascript.fy.yml | 1 -
config/locales/javascript/javascript.gl.yml | 58 +-
config/locales/javascript/javascript.he.yml | 177 +-
config/locales/javascript/javascript.hu.yml | 35 +-
config/locales/javascript/javascript.hy.yml | 7 +-
config/locales/javascript/javascript.ia.yml | 63 +-
config/locales/javascript/javascript.id.yml | 12 +-
config/locales/javascript/javascript.is.yml | 8 +-
config/locales/javascript/javascript.it.yml | 4 +-
config/locales/javascript/javascript.ja.yml | 15 +-
config/locales/javascript/javascript.ka.yml | 1 -
config/locales/javascript/javascript.ko.yml | 9 +-
config/locales/javascript/javascript.lt.yml | 1 -
config/locales/javascript/javascript.ml.yml | 1 -
config/locales/javascript/javascript.nb.yml | 51 +-
config/locales/javascript/javascript.nds.yml | 116 ++
config/locales/javascript/javascript.ne.yml | 1 -
config/locales/javascript/javascript.nl.yml | 63 +-
config/locales/javascript/javascript.nn.yml | 1 -
config/locales/javascript/javascript.pl.yml | 62 +-
config/locales/javascript/javascript.pt-BR.yml | 68 +-
config/locales/javascript/javascript.pt-PT.yml | 17 +-
config/locales/javascript/javascript.ro.yml | 21 +-
config/locales/javascript/javascript.ru.yml | 95 +-
config/locales/javascript/javascript.sk.yml | 28 +-
config/locales/javascript/javascript.sl.yml | 1 -
config/locales/javascript/javascript.sr.yml | 1 -
config/locales/javascript/javascript.sv.yml | 64 +-
config/locales/javascript/javascript.te.yml | 38 +-
config/locales/javascript/javascript.tr.yml | 4 +-
config/locales/javascript/javascript.uk.yml | 123 +-
config/locales/javascript/javascript.vi.yml | 3 +-
config/locales/javascript/javascript.zh-CN.yml | 1 -
config/locales/javascript/javascript.zh-TW.yml | 1 -
config/routes.rb | 73 +-
config/unicorn.rb | 3 +
db/migrate/0000_create_schema.rb | 663 +++++--
db/migrate/20110105051803_create_import_tables.rb | 199 --
...0110119060243_add_index_to_post_visibilities.rb | 9 -
db/migrate/20110119221746_add_indicies.rb | 29 -
db/migrate/20110120181553_create_statistics.rb | 15 -
db/migrate/20110120182100_create_data_points.rb | 17 -
db/migrate/20110123210746_alter_string_columns.rb | 37 -
.../20110125190034_unique_index_on_profile.rb | 37 -
...on_service_and_invitation_identifier_to_user.rb | 13 -
db/migrate/20110126200714_add_contacts_visible.rb | 17 -
...225202_remove_unique_index_on_email_on_users.rb | 11 -
...n_service_and_invitation_identifier_to_users.rb | 11 -
db/migrate/20110127000931_drop_extra_columns.rb | 10 -
db/migrate/20110127000953_make_fields_not_null.rb | 39 -
.../20110130072907_notification_multiple_people.rb | 70 -
db/migrate/20110202015222_add_open_to_aspects.rb | 9 -
db/migrate/20110209204702_create_mentions.rb | 15 -
.../20110211021926_fix_target_on_notification.rb | 29 -
...0110211204804_unique_index_post_visibilities.rb | 39 -
db/migrate/20110213052742_add_more_indicies.rb | 19 -
db/migrate/20110217044519_undo_adding_indicies.rb | 10 -
..._conversations_and_messages_and_visibilities.rb | 39 -
.../20110228180709_notification_subclasses.rb | 31 -
.../20110228201109_foreign_key_constraints.rb | 63 -
..._rename_post_to_parent_and_creator_to_author.rb | 11 -
.../20110228233419_add_signatures_to_message.rb | 11 -
.../20110301014507_rename_person_to_author.rb | 19 -
db/migrate/20110301202619_drop_statistics.rb | 9 -
...20110311000150_acts_as_taggable_on_migration.rb | 28 -
.../20110311183826_create_user_preferences.rb | 14 -
db/migrate/20110311220249_downcase_tags.rb | 26 -
db/migrate/20110313015438_rename_text_fields.rb | 12 -
db/migrate/20110314043119_drop_import_tables.rb | 10 -
db/migrate/20110317222802_guid_is_unique.rb | 36 -
db/migrate/20110318000734_create_service_users.rb | 23 -
...0318012008_delete_disconnected_notifications.rb | 11 -
db/migrate/20110319005509_add_processed_to_post.rb | 9 -
db/migrate/20110319172136_add_likes.rb | 26 -
.../20110321205715_unprocessed_image_uploader.rb | 14 -
.../20110323213655_add_location_to_profile.rb | 9 -
...110328175936_add_hidden_to_post_visibilities.rb | 11 -
...20110328202414_post_visibilities_on_contacts.rb | 97 -
db/migrate/20110330175950_tag_uniqueness.rb | 24 -
db/migrate/20110330230206_pm_foreign_keys.rb | 53 -
db/migrate/20110331004720_add_hidden_indicies.rb | 12 -
db/migrate/20110405170101_fix_stream_queries.rb | 11 -
...act_remove_pending_add_sharing_and_receiving.rb | 61 -
db/migrate/20110406202932_drop_requests_table.rb | 40 -
db/migrate/20110406203720_tag_name_uniqueness.rb | 45 -
db/migrate/20110421120744_downcase_usernames.rb | 15 -
...0110507212759_remove_type_null_notifications.rb | 13 -
.../20110513175000_eliminate_stray_user_records.rb | 32 -
.../20110514182918_update_devise_invitable.rb | 13 -
...7180148_delete_all_new_request_notifications.rb | 14 -
...assword_reset_for_accounts_without_usernames.rb | 16 -
.../20110518184453_add_token_auth_to_user.rb | 11 -
...222303_add_column_for_activity_streams_photo.rb | 21 -
db/migrate/20110524184202_add_object_id_to_post.rb | 11 -
db/migrate/20110525213325_add_root_id_to_posts.rb | 9 -
...552_photo_status_message_association_on_guid.rb | 46 -
...0110601083310_add_unconfirmed_email_to_users.rb | 9 -
...10601091059_add_confirm_email_token_to_users.rb | 9 -
db/migrate/20110603181015_lockable_users.rb | 9 -
.../20110603212633_likes_dependent_delete.rb | 15 -
db/migrate/20110603233202_drop_aspects_open.rb | 10 -
db/migrate/20110604012703_drop_mongo_remains.rb | 18 -
.../20110604204533_index_on_remember_token.rb | 9 -
db/migrate/20110606192307_drop_mongo_ids.rb | 29 -
db/migrate/20110623210918_add_o_auth2_support.rb | 65 -
db/migrate/20110701215925_create_tag_followings.rb | 14 -
.../20110705003445_counter_cache_on_post_likes.rb | 14 -
.../20110707221112_index_taggings_created_at.rb | 8 -
db/migrate/20110707234802_likes_on_comments.rb | 39 -
.../20110710102747_add_order_id_to_aspects.rb | 9 -
.../20110729045734_add_full_name_to_profile.rb | 29 -
db/migrate/20110730173137_create_pods.rb | 14 -
db/migrate/20110730173443_create_pod_stats.rb | 16 -
...20110812175614_add_username_to_service_users.rb | 9 -
...110815210933_remove_invite_counter_from_user.rb | 9 -
.../20110816061820_add_fields_to_invitations.rb | 17 -
...12541_add_identifier_to_existing_invitations.rb | 20 -
.../20110830170929_remove_pod_stats_table.rb | 16 -
.../20110907205720_add_indexes_to_serivces.rb | 11 -
...0110911213207_counter_cache_on_post_comments.rb | 15 -
db/migrate/20110924112840_create_o_embed_caches.rb | 14 -
.../20110926120220_fix_indexes_to_serivces.rb | 14 -
.../20110930182048_add_root_guid_index_to_posts.rb | 9 -
...fix_data_type_for_activity_streams_object_id.rb | 11 -
.../20111003232053_add_index_for_reshares.rb | 9 -
.../20111011193702_add_oembed_cache_to_posts.rb | 9 -
db/migrate/20111011194702_comment_anything.rb | 18 -
db/migrate/20111011195702_share_anything.rb | 114 --
...0111012215141_move_photos_to_their_own_table.rb | 161 --
.../20111016145626_add_language_to_invitations.rb | 9 -
db/migrate/20111018010003_add_back_indexes.rb | 15 -
...20111019013244_postgresql_photos_id_seq_init.rb | 11 -
...1021184041_add_community_spotlight_in_stream.rb | 14 -
.../20111023230730_fix_photo_share_visibilities.rb | 40 -
...026173547_add_missing_tag_followings_indices.rb | 34 -
db/migrate/20111101202137_create_blocks.rb | 12 -
...1103184050_add_closed_account_flag_to_person.rb | 9 -
.../20111109023618_create_account_deletions.rb | 12 -
...0111111025358_counter_cache_on_post_reshares.rb | 35 -
...20111114173111_add_auto_follow_back_to_users.rb | 11 -
...0506_add_oauth_redirect_uri_to_oauth_clients.rb | 9 -
...3_remove_low_length_limits_from_oauth_tables.rb | 19 -
.../20111211213438_create_invitation_codes.rb | 15 -
...111217042006_add_photo_counter_cache_to_post.rb | 15 -
...107220942_move_recently_hidden_posts_to_user.rb | 28 -
...20120114191018_remove_photos_count_from_post.rb | 13 -
db/migrate/20120127235102_add_nsfw_to_profiles.rb | 9 -
...20202190701_remove_public_share_visibilities.rb | 59 -
.../20120203220932_add_interacted_at_to_posts.rb | 9 -
db/migrate/20120208231253_create_participations.rb | 17 -
db/migrate/20120301143226_remove_youtube_titles.rb | 11 -
.../20120322223517_add_template_name_to_posts.rb | 5 -
...328025842_remove_invitation_email_from_users.rb | 17 -
.../20120330103021_indexes_on_participation.rb | 6 -
db/migrate/20120330144057_indexes_on_posts.rb | 5 -
db/migrate/20120405170105_create_locations.rb | 12 -
...414005431_create_rails_admin_histories_table.rb | 18 -
...0120420185823_add_width_and_height_to_photos.rb | 6 -
db/migrate/20120422072257_add_favorite_to_post.rb | 5 -
db/migrate/20120427152648_create_roles.rb | 10 -
.../20120506053156_add_wallpaper_to_profile.rb | 5 -
db/migrate/20120510184853_drop_service_users.rb | 24 -
db/migrate/20120517014034_remove_oauth.rb | 57 -
...519015723_remove_multi_photo_frame_reference.rb | 8 -
.../20120521191429_remove_rich_media_type.rb | 8 -
.../20120803143552_add_fetch_status_to_people.rb | 5 -
db/migrate/20120906162503_update_devise.rb | 11 -
...20120909053122_remove_wallpaper_from_profile.rb | 9 -
db/migrate/20131017093025_create_post_reports.rb | 13 +
.../20140121132816_add_post_type_to_post_report.rb | 6 +
.../20140214104217_rename_post_report_to_report.rb | 8 +
.../20140222162826_devise_add_lastseenable_user.rb | 12 +
db/migrate/20140308154022_create_polls.rb | 38 +
.../20140422134050_rename_post_columns_to_item.rb | 11 +
...0140422134627_change_user_id_type_to_integer.rb | 12 +
...ter_cache_to_tags.acts_as_taggable_on_engine.rb | 15 +
...230505_add_completed_at_to_account_deletions.rb | 5 +
...20140826165533_increase_simple_captcha_limit.rb | 8 +
db/migrate/20140906192846_fix_open_graph_data.rb | 10 +
.../20141001162851_add_remove_after_to_users.rb | 5 +
db/schema.rb | 611 ++++---
features/desktop/accepts_invitation.feature | 12 +-
features/desktop/activity_stream.feature | 23 -
features/desktop/aspect_navigation.feature | 7 +-
features/desktop/blocks_user.feature | 4 +-
features/desktop/change_password.feature | 10 +-
features/desktop/closes_account.feature | 26 +-
features/desktop/comments.feature | 34 +-
features/desktop/connects_users.feature | 35 +-
features/desktop/contacts.feature | 19 +-
features/desktop/conversations.feature | 5 +-
features/desktop/edits_profile.feature | 13 +-
features/desktop/hovercards.feature | 14 +-
features/desktop/keyboard_navigation.feature | 1 +
features/desktop/manages_aspects.feature | 36 +-
features/desktop/mentions.feature | 5 +-
.../desktop/mentions_from_profile_page.feature | 13 +-
features/desktop/notifications.feature | 45 +-
features/desktop/oembed.feature | 22 +-
features/desktop/post_preview.feature | 30 +-
features/desktop/post_with_a_poll.feature | 94 +
features/desktop/posts_from_main_page.feature | 77 +-
features/desktop/posts_from_profile_page.feature | 11 +-
features/desktop/profile_photos.feature | 20 +-
features/desktop/signs_up.feature | 28 +-
features/desktop/stops_following_users.feature | 5 +-
features/desktop/tags.feature | 13 -
features/desktop/tags_and_comments.feature | 21 -
features/mobile/activity_stream.feature | 10 +-
features/mobile/conversations.feature | 6 +-
features/mobile/edits_profile.feature | 7 +-
features/mobile/getting_started.feature | 30 +-
features/mobile/multiphoto.feature | 6 +-
features/mobile/posts_from_main_page.feature | 15 +-
features/mobile/reactions.feature | 10 +-
features/mobile/signs_up.feature | 34 +
features/mobile/tags.feature | 4 +-
features/step_definitions/aspects_steps.rb | 71 +-
features/step_definitions/comment_steps.rb | 10 +
features/step_definitions/conversations_steps.rb | 19 +-
features/step_definitions/custom_web_steps.rb | 83 +-
features/step_definitions/hovercard_steps.rb | 12 +-
features/step_definitions/mention_steps.rb | 11 +-
features/step_definitions/mobile_steps.rb | 26 +-
features/step_definitions/modal_steps.rb | 3 +
features/step_definitions/notifications_steps.rb | 7 +
features/step_definitions/post_with_poll_steps.rb | 44 +
features/step_definitions/posts_steps.rb | 34 +-
features/step_definitions/profile_steps.rb | 5 +
features/step_definitions/session_steps.rb | 8 +
features/step_definitions/stream_steps.rb | 2 +-
features/step_definitions/user_steps.rb | 12 +-
features/step_definitions/web_steps.rb | 7 +-
features/support/application_cuke_helpers.rb | 18 +-
features/support/env.rb | 4 +-
features/support/paths.rb | 16 +-
features/support/publishing_cuke_helpers.rb | 48 +-
features/support/user_cuke_helpers.rb | 25 +
lib/account_deleter.rb | 42 +-
lib/assets/javascripts/fileuploader-custom.js | 2 +
lib/assets/javascripts/jquery.mentionsInput.js | 432 +++++
lib/configuration_methods.rb | 6 +-
lib/diaspora.rb | 8 +-
lib/diaspora/camo.rb | 35 +
lib/diaspora/exceptions.rb | 7 +-
lib/diaspora/exporter.rb | 9 +-
lib/diaspora/federated/relayable_retraction.rb | 4 +
lib/diaspora/federated/request.rb | 4 +-
lib/diaspora/federated/shareable.rb | 8 +-
lib/diaspora/federated/signed_retraction.rb | 4 +-
lib/diaspora/fetcher.rb | 1 +
lib/diaspora/fetcher/public.rb | 6 +-
lib/diaspora/fetcher/single.rb | 41 +
lib/diaspora/guid.rb | 4 +-
lib/diaspora/likeable.rb | 8 +-
lib/diaspora/markdownify/html.rb | 6 +-
lib/diaspora/mentionable.rb | 56 +-
lib/diaspora/message_renderer.rb | 248 +++
lib/diaspora/relayable.rb | 17 +-
lib/diaspora/shareable.rb | 4 +-
lib/diaspora/taggable.rb | 16 +-
lib/email_inviter.rb | 1 +
lib/evil_query.rb | 6 +-
lib/federated/generator.rb | 2 -
lib/federated/relayable.rb | 6 +-
lib/hydra_wrapper.rb | 28 +-
lib/i18n_interpolation_fallbacks.rb | 8 +-
lib/postzord/receiver/private.rb | 22 +-
lib/postzord/receiver/public.rb | 23 +-
lib/sidekiq_middlewares.rb | 3 +-
lib/stream/base.rb | 4 +-
lib/stream/tag.rb | 4 -
lib/tasks/accounts.rake | 15 +
lib/tasks/generate_session_secret.rake | 13 +-
lib/tasks/maintenance.rake | 9 +
lib/tasks/migrations.rake | 2 +-
lib/tasks/podmin.rake | 32 +
lib/tasks/tests.rake | 7 +-
lib/webfinger.rb | 4 +-
public/crossdomain.xml | 3 -
public/default.html | 2 +-
script/ci/before_install.sh | 9 -
script/env/ensure_right_rubygems | 3 -
script/env/ruby_env | 3 -
script/get_config.rb | 1 -
script/server | 16 +-
spec/controllers/admin/users_controller_spec.rb | 22 +
spec/controllers/admins_controller_spec.rb | 52 +-
spec/controllers/application_controller_spec.rb | 35 +-
.../aspect_memberships_controller_spec.rb | 34 +-
spec/controllers/aspects_controller_spec.rb | 97 +-
spec/controllers/blocks_controller_spec.rb | 18 +-
spec/controllers/comments_controller_spec.rb | 54 +-
spec/controllers/contacts_controller_spec.rb | 49 +-
.../conversation_visibilities_controller_spec.rb | 10 +-
spec/controllers/conversations_controller_spec.rb | 162 +-
.../devise/passwords_controller_spec.rb | 37 -
spec/controllers/home_controller_spec.rb | 10 +-
spec/controllers/invitations_controller_spec.rb | 62 +-
spec/controllers/jasmine_fixtures/aspects_spec.rb | 4 +-
spec/controllers/jasmine_fixtures/contacts_spec.rb | 6 +-
.../jasmine_fixtures/notifications_spec.rb | 19 +
spec/controllers/jasmine_fixtures/people_spec.rb | 20 +-
.../jasmine_fixtures/status_messages_spec.rb | 19 +
spec/controllers/jasmine_fixtures/streams_spec.rb | 4 +-
spec/controllers/likes_controller_spec.rb | 24 +-
spec/controllers/messages_controller_spec.rb | 30 +-
spec/controllers/notifications_controller_spec.rb | 143 +-
spec/controllers/passwords_controller_spec.rb | 37 +
spec/controllers/people_controller_spec.rb | 308 ++--
spec/controllers/photos_controller_spec.rb | 82 +-
spec/controllers/posts_controller_spec.rb | 70 +-
spec/controllers/profiles_controller_spec.rb | 48 +-
spec/controllers/publics_controller_spec.rb | 48 +-
spec/controllers/registrations_controller_spec.rb | 46 +-
spec/controllers/report_controller_spec.rb | 130 ++
spec/controllers/reshares_controller_spec.rb | 29 +-
spec/controllers/search_controller_spec.rb | 21 +-
spec/controllers/services_controller_spec.rb | 38 +-
spec/controllers/sessions_controller_spec.rb | 14 +-
.../share_visibilities_controller_spec.rb | 8 +-
spec/controllers/statistics_controller_spec.rb | 6 +-
.../controllers/status_messages_controller_spec.rb | 91 +-
spec/controllers/streams_controller_spec.rb | 14 +-
spec/controllers/tags_controller_spec.rb | 90 +-
spec/controllers/users_controller_spec.rb | 104 +-
spec/factories.rb | 23 +
spec/helpers/application_helper_spec.rb | 51 +-
spec/helpers/getting_started_helper_spec.rb | 6 +-
.../interim_stream_hackiness_helper_spec.rb | 16 +-
spec/helpers/invitation_codes_helper_spec.rb | 4 +-
spec/helpers/layout_helper_spec.rb | 6 +-
spec/helpers/markdownify_helper_spec.rb | 105 --
spec/helpers/mobile_helper_spec.rb | 4 +-
spec/helpers/notifications_helper_spec.rb | 32 +-
spec/helpers/notifier_helper_spec.rb | 23 +-
spec/helpers/o_embed_helper_spec.rb | 14 +-
spec/helpers/open_graph_helper_spec.rb | 10 +-
spec/helpers/people_helper_spec.rb | 56 +-
spec/helpers/posts_helper_spec.rb | 35 +-
spec/helpers/report_helper_spec.rb | 17 +
spec/helpers/stream_helper_spec.rb | 28 +-
spec/helpers/tags_helper_spec.rb | 14 +-
spec/integration/account_deletion_spec.rb | 32 +-
spec/integration/attack_vectors_spec.rb | 8 +-
spec/integration/contact_deleting_spec.rb | 6 +-
spec/integration/dispatching_spec.rb | 6 +-
spec/integration/mentioning_spec.rb | 22 +-
spec/integration/receiving_spec.rb | 85 +-
spec/integration/tag_people_spec.rb | 12 +-
spec/javascripts/app/collections/aspects_spec.js | 28 +-
spec/javascripts/app/forms/picture_form_spec.js | 57 -
.../app/helpers/direction_detector_spec.js | 34 +
.../javascripts/app/helpers/text_formatter_spec.js | 25 +-
spec/javascripts/app/models/person_spec.js | 69 +
.../app/models/post/interacations_spec.js | 38 +-
spec/javascripts/app/models/stream_aspects_spec.js | 2 +-
spec/javascripts/app/models/stream_spec.js | 80 +-
spec/javascripts/app/pages/profile_spec.js | 24 +
spec/javascripts/app/pages/stream_spec.js | 33 -
spec/javascripts/app/router_spec.js | 65 +-
.../views/aspect_membership_blueprint_view_spec.js | 126 ++
.../app/views/aspect_membership_view_spec.js | 144 +-
spec/javascripts/app/views/aspect_view_spec.js | 6 +-
.../app/views/aspects_dropdown_view_spec.js | 237 ++-
.../app/views/aspects_list_view_spec.js | 6 +-
.../javascripts/app/views/bookmarklet_view_spec.js | 64 +
.../app/views/comment_stream_view_spec.js | 28 +-
spec/javascripts/app/views/comment_view_spec.js | 12 +-
spec/javascripts/app/views/contacts_view_spec.js | 215 +++
spec/javascripts/app/views/content_view_spec.js | 15 +
spec/javascripts/app/views/feedback_view_spec.js | 8 +-
spec/javascripts/app/views/header_view_spec.js | 40 +-
spec/javascripts/app/views/help_view_spec.js | 90 +
spec/javascripts/app/views/likes_info_view_spec.js | 8 +-
.../app/views/notifications_view_spec.js | 76 +
spec/javascripts/app/views/poll_view_spec.js | 62 +
.../app/views/post/canvas_frame_spec.js | 31 -
.../app/views/post/small_frame_view_spec.js | 85 -
.../app/views/post/stream_frame_spec.js | 37 -
.../app/views/profile_header_view_spec.js | 33 +
.../app/views/profile_sidebar_view_spec.js | 37 +
.../app/views/publisher_poll_creator_view_spec.js | 61 +
spec/javascripts/app/views/publisher_view_spec.js | 130 +-
spec/javascripts/app/views/stream_post_spec.js | 40 +-
spec/javascripts/app/views/stream_view_spec.js | 19 +-
.../app/views/tag_following_action_view_spec.js | 14 +-
spec/javascripts/app/views_spec.js | 4 +-
spec/javascripts/bookmarklet-spec.js | 54 -
spec/javascripts/contact-list-spec.js | 19 -
spec/javascripts/helpers/SpecHelper.js | 83 +-
spec/javascripts/helpers/factory.js | 92 +-
spec/javascripts/helpers/jasmine-jquery.js | 203 --
spec/javascripts/helpers/mock-ajax.js | 426 +++--
spec/javascripts/osmlocator-spec.js | 5 +-
spec/javascripts/search-spec.js | 1 -
spec/javascripts/support/jasmine.yml | 4 +-
spec/javascripts/validation-spec.js | 52 -
spec/javascripts/view-spec.js | 34 -
spec/javascripts/widgets/back-to-top-spec.js | 6 +-
spec/javascripts/widgets/flash-messages-spec.js | 2 +-
spec/javascripts/widgets/i18n-spec.js | 125 +-
spec/javascripts/widgets/notifications-spec.js | 6 +-
spec/javascripts/widgets/search-spec.js | 2 +-
spec/lib/account_deleter_spec.rb | 50 +-
spec/lib/configuration_methods_spec.rb | 72 +-
spec/lib/diaspora/camo_spec.rb | 55 +
spec/lib/diaspora/encryptable_spec.rb | 6 +-
spec/lib/diaspora/exporter_spec.rb | 58 +-
.../federated/relayable_retraction_spec.rb | 49 +-
spec/lib/diaspora/federated/request_spec.rb | 52 +-
spec/lib/diaspora/federated/retraction_spec.rb | 12 +-
.../diaspora/federated/signed_retraction_spec.rb | 18 +-
spec/lib/diaspora/federated_base_spec.rb | 2 +-
spec/lib/diaspora/fetcher/public_spec.rb | 74 +-
spec/lib/diaspora/markdownify_email_spec.rb | 8 +-
spec/lib/diaspora/markdownify_spec.rb | 2 +-
spec/lib/diaspora/mentionable_spec.rb | 60 +-
spec/lib/diaspora/message_renderer_spec.rb | 182 ++
spec/lib/diaspora/parser_spec.rb | 8 +-
spec/lib/direction_detector_spec.rb | 68 +-
spec/lib/email_inviter_spec.rb | 21 +-
spec/lib/encryptor_spec.rb | 4 +-
spec/lib/evil_query_spec.rb | 12 +-
spec/lib/hcard_spec.rb | 14 +-
spec/lib/hydra_wrapper_spec.rb | 38 +-
spec/lib/i18n_interpolation_fallbacks_spec.rb | 14 +-
spec/lib/postzord/dispatcher_spec.rb | 98 +-
spec/lib/postzord/receiver/local_batch_spec.rb | 24 +-
spec/lib/postzord/receiver/private_spec.rb | 40 +-
spec/lib/postzord/receiver/public_spec.rb | 30 +-
spec/lib/postzord/receiver_spec.rb | 4 +-
spec/lib/publisher_spec.rb | 10 +-
spec/lib/pubsubhubbub_spec.rb | 2 +-
spec/lib/rack/chrome_frame_spec.rb | 34 +-
spec/lib/rake_helper_spec.rb | 9 +-
spec/lib/salmon/encrypted_slap_spec.rb | 26 +-
spec/lib/salmon/slap_spec.rb | 30 +-
spec/lib/statistics_spec.rb | 31 +-
spec/lib/stream/activity_spec.rb | 11 +-
spec/lib/stream/aspect_spec.rb | 46 +-
spec/lib/stream/base_spec.rb | 24 +-
spec/lib/stream/followed_tag_spec.rb | 2 +-
spec/lib/stream/multi_spec.rb | 28 +-
spec/lib/stream/person_spec.rb | 4 +-
spec/lib/stream/tag_spec.rb | 26 +-
spec/lib/webfinger_profile_spec.rb | 8 +-
spec/lib/webfinger_spec.rb | 111 +-
spec/locale_spec.rb | 2 +-
spec/mailers/maintenance_spec.rb | 41 +
spec/mailers/notifier_spec.rb | 129 +-
spec/mailers/report_spec.rb | 32 +
spec/misc_spec.rb | 32 +-
spec/models/account_deletion_spec.rb | 30 +-
spec/models/acts_as_taggable_on_tag_spec.rb | 14 +-
spec/models/aspect_membership_spec.rb | 8 +-
spec/models/aspect_spec.rb | 22 +-
spec/models/block_spec.rb | 5 +-
spec/models/comment_spec.rb | 37 +-
spec/models/contact_spec.rb | 60 +-
spec/models/conversation_spec.rb | 34 +-
spec/models/invitation_code_spec.rb | 20 +-
spec/models/invitation_spec.rb | 26 +-
spec/models/like_spec.rb | 26 +-
spec/models/location_spec.rb | 6 +-
spec/models/mention_spec.rb | 12 +-
spec/models/message_spec.rb | 28 +-
spec/models/notification_spec.rb | 28 +-
spec/models/notifications/private_message_spec.rb | 20 +-
spec/models/notifications/reshared_spec.rb | 14 +-
spec/models/participation_spec.rb | 2 +-
spec/models/person_spec.rb | 154 +-
spec/models/photo_spec.rb | 68 +-
spec/models/pod_spec.rb | 12 +-
spec/models/poll_answer_spec.rb | 34 +
spec/models/poll_participation_spec.rb | 127 ++
spec/models/poll_spec.rb | 26 +
spec/models/post_spec.rb | 152 +-
spec/models/profile_spec.rb | 113 +-
spec/models/report_spec.rb | 95 +
spec/models/reshare_spec.rb | 124 +-
spec/models/role_spec.rb | 4 +-
spec/models/service_spec.rb | 4 +-
spec/models/services/facebook_spec.rb | 25 +-
spec/models/services/tumblr_spec.rb | 8 +-
spec/models/services/twitter_spec.rb | 63 +-
spec/models/services/wordpress_spec.rb | 6 +-
spec/models/share_visibility_spec.rb | 24 +-
spec/models/status_message_spec.rb | 182 +-
spec/models/tag_following_spec.rb | 10 +-
spec/models/user/connecting_spec.rb | 70 +-
spec/models/user/posting_spec.rb | 31 +-
spec/models/user/querying_spec.rb | 132 +-
spec/models/user/social_actions_spec.rb | 65 +-
spec/models/user_preference_spec.rb | 4 +-
spec/models/user_spec.rb | 443 ++---
spec/presenters/aspect_presenter_spec.rb | 2 +-
spec/presenters/base_presenter_spec.rb | 25 +
spec/presenters/o_embed_presenter_spec.rb | 12 +-
spec/presenters/person_presenter_spec.rb | 52 +-
spec/presenters/post_presenter_spec.rb | 51 +-
spec/presenters/service_presenter_spec.rb | 2 +-
spec/presenters/statistics_presenter_spec.rb | 67 +-
spec/presenters/user_presenter_spec.rb | 14 +-
spec/shared_behaviors/account_deletion.rb | 20 +-
spec/shared_behaviors/relayable.rb | 42 +-
spec/shared_behaviors/stream.rb | 18 +-
spec/shared_behaviors/taggable.rb | 32 +-
spec/spec_helper.rb | 14 +-
spec/support/user_methods.rb | 1 -
spec/workers/deferred_dispatch_spec.rb | 9 +
spec/workers/delete_account_spec.rb | 4 +-
spec/workers/delete_post_from_service_spec.rb | 4 +-
spec/workers/fetch_profile_photo_spec.rb | 32 +-
spec/workers/gather_o_embed_data_spec.rb | 10 +-
spec/workers/gather_open_graph_data_spec.rb | 37 +-
spec/workers/http_multi_spec.rb | 61 +-
spec/workers/mail/invite_email_spec.rb | 4 +-
spec/workers/mail/mentioned_spec.rb | 4 +-
spec/workers/mail/private_message_spec.rb | 4 +-
spec/workers/mail/reshared_spec.rb | 4 +-
spec/workers/notify_local_users_spec.rb | 13 +-
spec/workers/post_to_service_spec.rb | 6 +-
spec/workers/process_photo_spec.rb | 22 +-
spec/workers/publish_to_hub_spec.rb | 4 +-
spec/workers/queue_users_for_removal_spec.rb | 82 +
spec/workers/receive_salmon_spec.rb | 6 +-
spec/workers/receive_spec.rb | 6 +-
spec/workers/remove_old_user_spec.rb | 52 +
spec/workers/resend_invitation_spec.rb | 4 +-
spec/workers/reset_password_spec.rb | 4 +-
.../javascripts/bootstrap/bootstrap-dropdown.js | 92 -
.../javascripts/bootstrap/bootstrap-modal.js | 209 ---
.../javascripts/bootstrap/bootstrap-popover.js | 77 -
.../javascripts/bootstrap/bootstrap-transition.js | 51 -
.../javascripts/bootstrap/bootstrap-twipsy.js | 303 ---
.../assets/javascripts/handlebars-1.0.0.beta.6.js | 1550 ----------------
.../javascripts/jquery-ui-1.8.9.custom.min.js | 442 -----
vendor/assets/javascripts/jquery.hotkeys.js | 99 -
vendor/assets/javascripts/jquery.idle-timer.js | 246 ---
.../javascripts/jquery.infinitescroll-custom.js | 2 +-
vendor/assets/javascripts/jquery.mentionsInput.js | 423 -----
vendor/assets/javascripts/jquery.placeholder.js | 104 --
vendor/assets/javascripts/jquery.textchange.js | 76 -
vendor/assets/javascripts/punycode.js | 512 ------
vendor/assets/javascripts/rails.validations.js | 404 ----
vendor/assets/javascripts/timeago.js | 143 --
1232 files changed, 35787 insertions(+), 28978 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