Merge branch 'release/0.7.1.0'
Showing
with
5634 additions
and
2994 deletions
+5634
-2994
- .rubocop.yml .rubocop.yml +2 -11
- .travis.yml .travis.yml +2 -2
- Changelog.md Changelog.md +53 -0
- Gemfile Gemfile +22 -20
- Gemfile.lock Gemfile.lock +105 -105
- Guardfile Guardfile +2 -0
- Rakefile Rakefile +2 -0
- app/assets/config/manifest.js app/assets/config/manifest.js +12 -0
- app/assets/javascripts/app/helpers/handlebars-helpers.js app/assets/javascripts/app/helpers/handlebars-helpers.js +1 -1
- app/assets/javascripts/app/helpers/text_formatter.js app/assets/javascripts/app/helpers/text_formatter.js +1 -6
- app/assets/javascripts/app/pages/contacts.js app/assets/javascripts/app/pages/contacts.js +5 -2
- app/assets/javascripts/app/pages/getting_started.js app/assets/javascripts/app/pages/getting_started.js +1 -1
- app/assets/javascripts/app/pages/profile.js app/assets/javascripts/app/pages/profile.js +1 -1
- app/assets/javascripts/app/pages/settings.js app/assets/javascripts/app/pages/settings.js +1 -1
- app/assets/javascripts/app/router.js app/assets/javascripts/app/router.js +2 -2
- app/assets/javascripts/app/views/aspect_membership_view.js app/assets/javascripts/app/views/aspect_membership_view.js +3 -3
- app/assets/javascripts/app/views/comment_stream_view.js app/assets/javascripts/app/views/comment_stream_view.js +5 -3
- app/assets/javascripts/app/views/contact_view.js app/assets/javascripts/app/views/contact_view.js +1 -1
- app/assets/javascripts/app/views/content_view.js app/assets/javascripts/app/views/content_view.js +2 -2
- app/assets/javascripts/app/views/conversations_form_view.js app/assets/javascripts/app/views/conversations_form_view.js +7 -2
- app/assets/javascripts/app/views/photos_view.js app/assets/javascripts/app/views/photos_view.js +1 -1
- app/assets/javascripts/app/views/poll_view.js app/assets/javascripts/app/views/poll_view.js +16 -9
- app/assets/javascripts/app/views/post_controls_view.js app/assets/javascripts/app/views/post_controls_view.js +2 -1
- app/assets/javascripts/app/views/profile_header_view.js app/assets/javascripts/app/views/profile_header_view.js +3 -3
- app/assets/javascripts/app/views/publisher/uploader_view.js app/assets/javascripts/app/views/publisher/uploader_view.js +1 -1
- app/assets/javascripts/app/views/publisher_view.js app/assets/javascripts/app/views/publisher_view.js +6 -6
- app/assets/javascripts/app/views/single-post-viewer/single_post_actions.js ...ripts/app/views/single-post-viewer/single_post_actions.js +2 -2
- app/assets/javascripts/app/views/stream_post_views.js app/assets/javascripts/app/views/stream_post_views.js +1 -1
- app/assets/javascripts/contact-list.js app/assets/javascripts/contact-list.js +2 -2
- app/assets/javascripts/helpers/profile_photo_uploader.js app/assets/javascripts/helpers/profile_photo_uploader.js +4 -0
- app/assets/javascripts/ie.js app/assets/javascripts/ie.js +0 -6
- app/assets/javascripts/mobile/mobile_comments.js app/assets/javascripts/mobile/mobile_comments.js +3 -3
- app/assets/javascripts/mobile/mobile_file_uploader.js app/assets/javascripts/mobile/mobile_file_uploader.js +4 -4
- app/assets/javascripts/osmlocator.js app/assets/javascripts/osmlocator.js +2 -2
- app/assets/stylesheets/aspects.scss app/assets/stylesheets/aspects.scss +1 -1
- app/assets/stylesheets/color_themes/_color_theme_override.scss ...ssets/stylesheets/color_themes/_color_theme_override.scss +1 -3
- app/assets/stylesheets/color_themes/_color_theme_override_dark.scss .../stylesheets/color_themes/_color_theme_override_dark.scss +6 -5
- app/assets/stylesheets/color_themes/_color_theme_override_origwhite.scss ...esheets/color_themes/_color_theme_override_origwhite.scss +1 -1
- app/assets/stylesheets/comments.scss app/assets/stylesheets/comments.scss +2 -2
- app/assets/stylesheets/contacts.scss app/assets/stylesheets/contacts.scss +1 -1
- app/assets/stylesheets/conversations.scss app/assets/stylesheets/conversations.scss +4 -4
- app/assets/stylesheets/header.scss app/assets/stylesheets/header.scss +1 -1
- app/assets/stylesheets/hovercard.scss app/assets/stylesheets/hovercard.scss +1 -1
- app/assets/stylesheets/interactions.scss app/assets/stylesheets/interactions.scss +1 -1
- app/assets/stylesheets/mobile/mobile.scss app/assets/stylesheets/mobile/mobile.scss +6 -6
- app/assets/stylesheets/notifications.scss app/assets/stylesheets/notifications.scss +1 -1
- app/assets/stylesheets/people.scss app/assets/stylesheets/people.scss +2 -2
- app/assets/stylesheets/poll.scss app/assets/stylesheets/poll.scss +9 -14
- app/assets/stylesheets/post-content.scss app/assets/stylesheets/post-content.scss +1 -1
- app/assets/stylesheets/profile.scss app/assets/stylesheets/profile.scss +3 -3
- app/assets/stylesheets/publisher.scss app/assets/stylesheets/publisher.scss +5 -5
- app/assets/stylesheets/stream.scss app/assets/stylesheets/stream.scss +1 -1
- app/assets/stylesheets/stream_element.scss app/assets/stylesheets/stream_element.scss +2 -1
- app/assets/stylesheets/tag.scss app/assets/stylesheets/tag.scss +1 -1
- app/assets/templates/comment-stream_tpl.jst.hbs app/assets/templates/comment-stream_tpl.jst.hbs +1 -1
- app/assets/templates/faq_posts_and_posting_tpl.jst.hbs app/assets/templates/faq_posts_and_posting_tpl.jst.hbs +10 -0
- app/assets/templates/help_tpl.jst.hbs app/assets/templates/help_tpl.jst.hbs +1 -1
- app/assets/templates/poll_tpl.jst.hbs app/assets/templates/poll_tpl.jst.hbs +25 -12
- app/assets/templates/post-controls_tpl.jst.hbs app/assets/templates/post-controls_tpl.jst.hbs +6 -6
- app/assets/templates/profile_header_tpl.jst.hbs app/assets/templates/profile_header_tpl.jst.hbs +1 -1
- app/assets/templates/single-post-viewer/single-post-moderation_tpl.jst.hbs ...tes/single-post-viewer/single-post-moderation_tpl.jst.hbs +6 -6
- app/assets/templates/status-message_tpl.jst.hbs app/assets/templates/status-message_tpl.jst.hbs +1 -1
- app/controllers/admin/admin_controller.rb app/controllers/admin/admin_controller.rb +2 -0
- app/controllers/admin/pods_controller.rb app/controllers/admin/pods_controller.rb +2 -0
- app/controllers/admin/users_controller.rb app/controllers/admin/users_controller.rb +2 -0
- app/controllers/admins_controller.rb app/controllers/admins_controller.rb +2 -0
- app/controllers/api/openid_connect/authorizations_controller.rb ...ntrollers/api/openid_connect/authorizations_controller.rb +2 -0
- app/controllers/api/openid_connect/clients_controller.rb app/controllers/api/openid_connect/clients_controller.rb +2 -0
- app/controllers/api/openid_connect/discovery_controller.rb app/controllers/api/openid_connect/discovery_controller.rb +2 -0
- app/controllers/api/openid_connect/id_tokens_controller.rb app/controllers/api/openid_connect/id_tokens_controller.rb +2 -0
- app/controllers/api/openid_connect/token_endpoint_controller.rb ...ntrollers/api/openid_connect/token_endpoint_controller.rb +2 -0
- app/controllers/api/openid_connect/user_applications_controller.rb ...ollers/api/openid_connect/user_applications_controller.rb +2 -0
- app/controllers/api/openid_connect/user_info_controller.rb app/controllers/api/openid_connect/user_info_controller.rb +2 -0
- app/controllers/api/v0/base_controller.rb app/controllers/api/v0/base_controller.rb +2 -0
- app/controllers/application_controller.rb app/controllers/application_controller.rb +2 -0
- app/controllers/aspect_memberships_controller.rb app/controllers/aspect_memberships_controller.rb +2 -0
- app/controllers/aspects_controller.rb app/controllers/aspects_controller.rb +2 -0
- app/controllers/blocks_controller.rb app/controllers/blocks_controller.rb +2 -0
- app/controllers/comments_controller.rb app/controllers/comments_controller.rb +6 -0
- app/controllers/contacts_controller.rb app/controllers/contacts_controller.rb +2 -0
- app/controllers/conversation_visibilities_controller.rb app/controllers/conversation_visibilities_controller.rb +2 -0
- app/controllers/conversations_controller.rb app/controllers/conversations_controller.rb +2 -6
- app/controllers/help_controller.rb app/controllers/help_controller.rb +2 -0
- app/controllers/home_controller.rb app/controllers/home_controller.rb +2 -0
- app/controllers/invitation_codes_controller.rb app/controllers/invitation_codes_controller.rb +2 -0
- app/controllers/invitations_controller.rb app/controllers/invitations_controller.rb +2 -0
- app/controllers/likes_controller.rb app/controllers/likes_controller.rb +7 -1
- app/controllers/messages_controller.rb app/controllers/messages_controller.rb +2 -0
- app/controllers/node_info_controller.rb app/controllers/node_info_controller.rb +2 -0
- app/controllers/notifications_controller.rb app/controllers/notifications_controller.rb +4 -2
- app/controllers/participations_controller.rb app/controllers/participations_controller.rb +2 -0
- app/controllers/people_controller.rb app/controllers/people_controller.rb +3 -1
- app/controllers/photos_controller.rb app/controllers/photos_controller.rb +2 -0
- app/controllers/poll_participations_controller.rb app/controllers/poll_participations_controller.rb +2 -0
- app/controllers/posts_controller.rb app/controllers/posts_controller.rb +3 -1
- app/controllers/profiles_controller.rb app/controllers/profiles_controller.rb +2 -0
- app/controllers/registrations_controller.rb app/controllers/registrations_controller.rb +2 -0
- app/controllers/report_controller.rb app/controllers/report_controller.rb +2 -0
- app/controllers/reshares_controller.rb app/controllers/reshares_controller.rb +3 -1
- app/controllers/search_controller.rb app/controllers/search_controller.rb +2 -0
- app/controllers/services_controller.rb app/controllers/services_controller.rb +2 -0
- app/controllers/sessions_controller.rb app/controllers/sessions_controller.rb +2 -0
- app/controllers/share_visibilities_controller.rb app/controllers/share_visibilities_controller.rb +2 -0
- app/controllers/social_relay_controller.rb app/controllers/social_relay_controller.rb +2 -0
- app/controllers/status_messages_controller.rb app/controllers/status_messages_controller.rb +2 -0
- app/controllers/streams_controller.rb app/controllers/streams_controller.rb +2 -0
- app/controllers/tag_followings_controller.rb app/controllers/tag_followings_controller.rb +2 -0
- app/controllers/tags_controller.rb app/controllers/tags_controller.rb +2 -0
- app/controllers/terms_controller.rb app/controllers/terms_controller.rb +2 -0
- app/controllers/users_controller.rb app/controllers/users_controller.rb +2 -0
- app/helpers/activity_streams_helper.rb app/helpers/activity_streams_helper.rb +2 -0
- app/helpers/application_helper.rb app/helpers/application_helper.rb +5 -2
- app/helpers/aspect_global_helper.rb app/helpers/aspect_global_helper.rb +2 -0
- app/helpers/contacts_helper.rb app/helpers/contacts_helper.rb +2 -0
- app/helpers/conversations_helper.rb app/helpers/conversations_helper.rb +6 -5
- app/helpers/error_messages_helper.rb app/helpers/error_messages_helper.rb +2 -0
- app/helpers/getting_started_helper.rb app/helpers/getting_started_helper.rb +2 -0
- app/helpers/gon_helper.rb app/helpers/gon_helper.rb +2 -0
- app/helpers/interim_stream_hackiness_helper.rb app/helpers/interim_stream_hackiness_helper.rb +2 -0
- app/helpers/invitation_codes_helper.rb app/helpers/invitation_codes_helper.rb +2 -0
- app/helpers/jsxc_helper.rb app/helpers/jsxc_helper.rb +2 -0
- app/helpers/language_helper.rb app/helpers/language_helper.rb +2 -0
- app/helpers/layout_helper.rb app/helpers/layout_helper.rb +2 -15
- app/helpers/meta_data_helper.rb app/helpers/meta_data_helper.rb +2 -0
- app/helpers/mobile_helper.rb app/helpers/mobile_helper.rb +2 -0
- app/helpers/notifications_helper.rb app/helpers/notifications_helper.rb +2 -0
- app/helpers/notifier_helper.rb app/helpers/notifier_helper.rb +2 -0
- app/helpers/o_embed_helper.rb app/helpers/o_embed_helper.rb +2 -0
- app/helpers/open_graph_helper.rb app/helpers/open_graph_helper.rb +2 -0
- app/helpers/people_helper.rb app/helpers/people_helper.rb +16 -8
- app/helpers/posts_helper.rb app/helpers/posts_helper.rb +2 -0
- app/helpers/profile_helper.rb app/helpers/profile_helper.rb +2 -0
- app/helpers/publisher_helper.rb app/helpers/publisher_helper.rb +2 -0
- app/helpers/report_helper.rb app/helpers/report_helper.rb +2 -0
- app/helpers/services_helper.rb app/helpers/services_helper.rb +2 -0
- app/helpers/sessions_helper.rb app/helpers/sessions_helper.rb +2 -0
- app/helpers/statistics_helper.rb app/helpers/statistics_helper.rb +2 -0
- app/helpers/stream_helper.rb app/helpers/stream_helper.rb +2 -0
- app/helpers/tags_helper.rb app/helpers/tags_helper.rb +2 -0
- app/helpers/user_applications_helper.rb app/helpers/user_applications_helper.rb +2 -0
- app/helpers/users_helper.rb app/helpers/users_helper.rb +2 -0
- app/mailers/application_mailer.rb app/mailers/application_mailer.rb +2 -0
- app/mailers/diaspora_devise_mailer.rb app/mailers/diaspora_devise_mailer.rb +2 -0
- app/mailers/export_mailer.rb app/mailers/export_mailer.rb +2 -0
- app/mailers/maintenance.rb app/mailers/maintenance.rb +2 -0
- app/mailers/notification_mailers/also_commented.rb app/mailers/notification_mailers/also_commented.rb +2 -0
- app/mailers/notification_mailers/base.rb app/mailers/notification_mailers/base.rb +3 -1
- app/mailers/notification_mailers/comment_on_post.rb app/mailers/notification_mailers/comment_on_post.rb +2 -0
- app/mailers/notification_mailers/confirm_email.rb app/mailers/notification_mailers/confirm_email.rb +2 -0
- app/mailers/notification_mailers/csrf_token_fail.rb app/mailers/notification_mailers/csrf_token_fail.rb +2 -0
- app/mailers/notification_mailers/liked.rb app/mailers/notification_mailers/liked.rb +2 -0
- app/mailers/notification_mailers/mentioned.rb app/mailers/notification_mailers/mentioned.rb +2 -0
- app/mailers/notification_mailers/mentioned_in_comment.rb app/mailers/notification_mailers/mentioned_in_comment.rb +3 -1
- app/mailers/notification_mailers/private_message.rb app/mailers/notification_mailers/private_message.rb +2 -0
- app/mailers/notification_mailers/reshared.rb app/mailers/notification_mailers/reshared.rb +2 -0
- app/mailers/notification_mailers/started_sharing.rb app/mailers/notification_mailers/started_sharing.rb +3 -1
- app/mailers/notifier.rb app/mailers/notifier.rb +3 -3
- app/mailers/report_mailer.rb app/mailers/report_mailer.rb +2 -0
- app/models/account_deletion.rb app/models/account_deletion.rb +2 -0
- app/models/account_migration.rb app/models/account_migration.rb +7 -0
- app/models/acts_as_taggable_on-tag.rb app/models/acts_as_taggable_on-tag.rb +2 -0
- app/models/api/openid_connect/authorization.rb app/models/api/openid_connect/authorization.rb +2 -0
- app/models/api/openid_connect/o_auth_access_token.rb app/models/api/openid_connect/o_auth_access_token.rb +2 -0
- app/models/api/openid_connect/o_auth_application.rb app/models/api/openid_connect/o_auth_application.rb +2 -0
- app/models/api/openid_connect/pairwise_pseudonymous_identifier.rb ...ls/api/openid_connect/pairwise_pseudonymous_identifier.rb +2 -0
- app/models/application_record.rb app/models/application_record.rb +2 -0
- app/models/aspect.rb app/models/aspect.rb +2 -0
- app/models/aspect_membership.rb app/models/aspect_membership.rb +3 -4
- app/models/aspect_visibility.rb app/models/aspect_visibility.rb +2 -0
- app/models/block.rb app/models/block.rb +2 -0
- app/models/comment.rb app/models/comment.rb +4 -1
- app/models/comment_signature.rb app/models/comment_signature.rb +2 -0
- app/models/contact.rb app/models/contact.rb +2 -0
- app/models/conversation.rb app/models/conversation.rb +7 -5
- app/models/conversation_visibility.rb app/models/conversation_visibility.rb +2 -0
- app/models/invitation_code.rb app/models/invitation_code.rb +2 -0
- app/models/like.rb app/models/like.rb +3 -1
- app/models/like_signature.rb app/models/like_signature.rb +2 -0
- app/models/location.rb app/models/location.rb +2 -0
- app/models/mention.rb app/models/mention.rb +2 -0
- app/models/message.rb app/models/message.rb +8 -4
- app/models/notification.rb app/models/notification.rb +3 -1
- app/models/notification_actor.rb app/models/notification_actor.rb +2 -2
- app/models/notifications/also_commented.rb app/models/notifications/also_commented.rb +2 -0
- app/models/notifications/comment_on_post.rb app/models/notifications/comment_on_post.rb +2 -0
- app/models/notifications/commented.rb app/models/notifications/commented.rb +2 -0
- app/models/notifications/liked.rb app/models/notifications/liked.rb +2 -0
- app/models/notifications/mentioned.rb app/models/notifications/mentioned.rb +2 -0
- app/models/notifications/mentioned_in_comment.rb app/models/notifications/mentioned_in_comment.rb +2 -0
- app/models/notifications/mentioned_in_post.rb app/models/notifications/mentioned_in_post.rb +2 -0
- app/models/notifications/private_message.rb app/models/notifications/private_message.rb +2 -0
- app/models/notifications/reshared.rb app/models/notifications/reshared.rb +2 -0
- app/models/notifications/started_sharing.rb app/models/notifications/started_sharing.rb +2 -0
- app/models/o_embed_cache.rb app/models/o_embed_cache.rb +2 -0
- app/models/open_graph_cache.rb app/models/open_graph_cache.rb +2 -0
- app/models/participation.rb app/models/participation.rb +2 -0
- app/models/person.rb app/models/person.rb +4 -2
- app/models/photo.rb app/models/photo.rb +2 -0
- app/models/pod.rb app/models/pod.rb +2 -0
- app/models/poll.rb app/models/poll.rb +13 -11
- app/models/poll_answer.rb app/models/poll_answer.rb +2 -0
- app/models/poll_participation.rb app/models/poll_participation.rb +2 -0
- app/models/poll_participation_signature.rb app/models/poll_participation_signature.rb +2 -0
- app/models/post.rb app/models/post.rb +8 -2
- app/models/profile.rb app/models/profile.rb +2 -0
- app/models/reference.rb app/models/reference.rb +32 -0
- app/models/report.rb app/models/report.rb +2 -0
- app/models/reshare.rb app/models/reshare.rb +4 -2
- app/models/role.rb app/models/role.rb +2 -0
- app/models/service.rb app/models/service.rb +3 -1
- app/models/services/facebook.rb app/models/services/facebook.rb +2 -0
- app/models/services/tumblr.rb app/models/services/tumblr.rb +7 -6
- app/models/services/twitter.rb app/models/services/twitter.rb +2 -0
- app/models/services/wordpress.rb app/models/services/wordpress.rb +2 -0
- app/models/share_visibility.rb app/models/share_visibility.rb +2 -0
- app/models/signature_order.rb app/models/signature_order.rb +2 -0
- app/models/status_message.rb app/models/status_message.rb +6 -1
- app/models/tag_following.rb app/models/tag_following.rb +2 -0
- app/models/user.rb app/models/user.rb +9 -3
- app/models/user/authentication_token.rb app/models/user/authentication_token.rb +2 -0
- app/models/user/connecting.rb app/models/user/connecting.rb +3 -0
- app/models/user/querying.rb app/models/user/querying.rb +4 -2
- app/models/user/social_actions.rb app/models/user/social_actions.rb +3 -1
- app/models/user_preference.rb app/models/user_preference.rb +2 -0
- app/presenters/aspect_membership_presenter.rb app/presenters/aspect_membership_presenter.rb +2 -0
- app/presenters/aspect_presenter.rb app/presenters/aspect_presenter.rb +2 -0
- app/presenters/avatar_presenter.rb app/presenters/avatar_presenter.rb +2 -0
- app/presenters/base_presenter.rb app/presenters/base_presenter.rb +2 -0
- app/presenters/block_presenter.rb app/presenters/block_presenter.rb +2 -0
- app/presenters/comment_presenter.rb app/presenters/comment_presenter.rb +2 -0
- app/presenters/contact_presenter.rb app/presenters/contact_presenter.rb +2 -0
- app/presenters/last_three_comments_decorator.rb app/presenters/last_three_comments_decorator.rb +2 -0
- app/presenters/node_info_presenter.rb app/presenters/node_info_presenter.rb +11 -0
- app/presenters/o_embed_presenter.rb app/presenters/o_embed_presenter.rb +2 -0
- app/presenters/person_presenter.rb app/presenters/person_presenter.rb +2 -0
- app/presenters/photo_presenter.rb app/presenters/photo_presenter.rb +2 -0
- app/presenters/pod_presenter.rb app/presenters/pod_presenter.rb +2 -0
- app/presenters/post_interaction_presenter.rb app/presenters/post_interaction_presenter.rb +2 -0
- app/presenters/post_presenter.rb app/presenters/post_presenter.rb +5 -5
- app/presenters/profile_presenter.rb app/presenters/profile_presenter.rb +2 -0
- app/presenters/service_presenter.rb app/presenters/service_presenter.rb +2 -0
- app/presenters/social_relay_presenter.rb app/presenters/social_relay_presenter.rb +2 -0
- app/presenters/tag_stream_presenter.rb app/presenters/tag_stream_presenter.rb +2 -0
- app/presenters/user_application_presenter.rb app/presenters/user_application_presenter.rb +2 -0
- app/presenters/user_applications_presenter.rb app/presenters/user_applications_presenter.rb +2 -0
- app/presenters/user_presenter.rb app/presenters/user_presenter.rb +2 -0
- app/serializers/export/aspect_serializer.rb app/serializers/export/aspect_serializer.rb +2 -0
- app/serializers/export/contact_serializer.rb app/serializers/export/contact_serializer.rb +2 -0
- app/serializers/export/others_data_serializer.rb app/serializers/export/others_data_serializer.rb +16 -15
- app/serializers/export/own_post_serializer.rb app/serializers/export/own_post_serializer.rb +3 -1
- app/serializers/export/own_relayables_serializer.rb app/serializers/export/own_relayables_serializer.rb +2 -0
- app/serializers/export/person_metadata_serializer.rb app/serializers/export/person_metadata_serializer.rb +0 -17
- app/serializers/export/user_serializer.rb app/serializers/export/user_serializer.rb +28 -2
- app/serializers/federation_entity_serializer.rb app/serializers/federation_entity_serializer.rb +3 -1
- app/serializers/flat_map_array_serializer.rb app/serializers/flat_map_array_serializer.rb +11 -0
- app/serializers/notification_serializer.rb app/serializers/notification_serializer.rb +2 -0
- app/serializers/serializer_post_processing.rb app/serializers/serializer_post_processing.rb +2 -0
- app/serializers/user_info_serializer.rb app/serializers/user_info_serializer.rb +2 -0
- app/services/comment_service.rb app/services/comment_service.rb +2 -0
- app/services/like_service.rb app/services/like_service.rb +2 -0
- app/services/notification_service.rb app/services/notification_service.rb +2 -0
- app/services/post_service.rb app/services/post_service.rb +2 -0
- app/services/reshare_service.rb app/services/reshare_service.rb +2 -0
- app/services/status_message_creation_service.rb app/services/status_message_creation_service.rb +2 -0
- app/uploaders/exported_photos.rb app/uploaders/exported_photos.rb +2 -4
- app/uploaders/exported_user.rb app/uploaders/exported_user.rb +3 -1
- app/uploaders/processed_image.rb app/uploaders/processed_image.rb +3 -1
- app/uploaders/secure_uploader.rb app/uploaders/secure_uploader.rb +2 -0
- app/uploaders/unprocessed_image.rb app/uploaders/unprocessed_image.rb +2 -0
- app/views/aspect_memberships/_aspect_membership_dropdown.haml ...views/aspect_memberships/_aspect_membership_dropdown.haml +1 -1
- app/views/aspect_memberships/_aspect_membership_dropdown.mobile.haml ...spect_memberships/_aspect_membership_dropdown.mobile.haml +1 -1
- app/views/aspects/_aspect_dropdown.html.haml app/views/aspects/_aspect_dropdown.html.haml +1 -1
- app/views/aspects/_aspect_stream.haml app/views/aspects/_aspect_stream.haml +2 -2
- app/views/comments/_new_comment.mobile.haml app/views/comments/_new_comment.mobile.haml +1 -1
- app/views/contacts/index.html.haml app/views/contacts/index.html.haml +1 -1
- app/views/contacts/index.mobile.haml app/views/contacts/index.mobile.haml +1 -1
- app/views/contacts/spotlight.haml app/views/contacts/spotlight.haml +1 -1
- app/views/conversations/_conversation.haml app/views/conversations/_conversation.haml +1 -1
- app/views/conversations/_conversation.mobile.haml app/views/conversations/_conversation.mobile.haml +1 -1
- app/views/conversations/index.haml app/views/conversations/index.haml +1 -1
- app/views/conversations/new.html.haml app/views/conversations/new.html.haml +1 -2
- app/views/devise/passwords/edit.mobile.haml app/views/devise/passwords/edit.mobile.haml +1 -1
- app/views/devise/passwords/new.mobile.haml app/views/devise/passwords/new.mobile.haml +1 -1
- app/views/layouts/application.html.haml app/views/layouts/application.html.haml +0 -6
- app/views/layouts/application.mobile.haml app/views/layouts/application.mobile.haml +1 -1
- app/views/notifications/_notification.haml app/views/notifications/_notification.haml +1 -1
- app/views/people/_index.html.haml app/views/people/_index.html.haml +1 -1
- app/views/people/_relationship_action.haml app/views/people/_relationship_action.haml +1 -1
- app/views/people/contacts.haml app/views/people/contacts.haml +2 -2
- app/views/people/index.html.haml app/views/people/index.html.haml +1 -1
- app/views/people/index.mobile.haml app/views/people/index.mobile.haml +1 -1
- app/views/people/show.html.haml app/views/people/show.html.haml +2 -2
- app/views/people/show.mobile.haml app/views/people/show.mobile.haml +1 -1
- app/views/photos/_index.mobile.haml app/views/photos/_index.mobile.haml +1 -1
- app/views/publisher/_publisher.html.haml app/views/publisher/_publisher.html.haml +1 -1
- app/views/publisher/_publisher.mobile.haml app/views/publisher/_publisher.mobile.haml +1 -1
- app/views/registrations/new.mobile.haml app/views/registrations/new.mobile.haml +1 -1
- app/views/sessions/new.mobile.haml app/views/sessions/new.mobile.haml +1 -1
- app/views/shared/_photo_area.mobile.haml app/views/shared/_photo_area.mobile.haml +1 -1
- app/views/status_messages/_status_message.mobile.haml app/views/status_messages/_status_message.mobile.haml +1 -1
- app/views/streams/main_stream.html.haml app/views/streams/main_stream.html.haml +1 -1
- app/views/streams/main_stream.mobile.haml app/views/streams/main_stream.mobile.haml +1 -1
- app/views/tags/show.haml app/views/tags/show.haml +2 -2
- app/views/tags/show.mobile.haml app/views/tags/show.mobile.haml +1 -1
- app/views/users/public.atom.builder app/views/users/public.atom.builder +2 -0
- app/workers/base.rb app/workers/base.rb +2 -0
- app/workers/clean_cached_files.rb app/workers/clean_cached_files.rb +2 -0
- app/workers/deferred_dispatch.rb app/workers/deferred_dispatch.rb +2 -0
- app/workers/deferred_retraction.rb app/workers/deferred_retraction.rb +2 -0
- app/workers/delete_account.rb app/workers/delete_account.rb +2 -0
- app/workers/delete_post_from_service.rb app/workers/delete_post_from_service.rb +2 -0
- app/workers/export_photos.rb app/workers/export_photos.rb +2 -0
- app/workers/export_user.rb app/workers/export_user.rb +24 -1
- app/workers/fetch_profile_photo.rb app/workers/fetch_profile_photo.rb +2 -0
- app/workers/fetch_public_posts.rb app/workers/fetch_public_posts.rb +2 -0
- app/workers/fetch_webfinger.rb app/workers/fetch_webfinger.rb +2 -0
- app/workers/gather_o_embed_data.rb app/workers/gather_o_embed_data.rb +2 -0
- app/workers/gather_open_graph_data.rb app/workers/gather_open_graph_data.rb +2 -0
- app/workers/mail/also_commented.rb app/workers/mail/also_commented.rb +2 -0
- app/workers/mail/comment_on_post.rb app/workers/mail/comment_on_post.rb +2 -0
- app/workers/mail/confirm_email.rb app/workers/mail/confirm_email.rb +2 -0
- app/workers/mail/csrf_token_fail.rb app/workers/mail/csrf_token_fail.rb +2 -0
- app/workers/mail/invite_email.rb app/workers/mail/invite_email.rb +2 -0
- app/workers/mail/liked.rb app/workers/mail/liked.rb +2 -0
- app/workers/mail/mentioned.rb app/workers/mail/mentioned.rb +2 -0
- app/workers/mail/mentioned_in_comment.rb app/workers/mail/mentioned_in_comment.rb +2 -0
- app/workers/mail/notifier_base.rb app/workers/mail/notifier_base.rb +2 -0
- app/workers/mail/private_message.rb app/workers/mail/private_message.rb +2 -0
- app/workers/mail/report_worker.rb app/workers/mail/report_worker.rb +2 -0
- app/workers/mail/reshared.rb app/workers/mail/reshared.rb +2 -0
- app/workers/mail/started_sharing.rb app/workers/mail/started_sharing.rb +2 -0
- app/workers/post_to_service.rb app/workers/post_to_service.rb +2 -0
- app/workers/process_photo.rb app/workers/process_photo.rb +2 -0
- app/workers/publish_to_hub.rb app/workers/publish_to_hub.rb +2 -0
- app/workers/queue_users_for_removal.rb app/workers/queue_users_for_removal.rb +2 -0
- app/workers/receive_base.rb app/workers/receive_base.rb +2 -0
- app/workers/receive_local.rb app/workers/receive_local.rb +2 -0
- app/workers/receive_private.rb app/workers/receive_private.rb +2 -0
- app/workers/receive_public.rb app/workers/receive_public.rb +2 -0
- app/workers/recheck_scheduled_pods.rb app/workers/recheck_scheduled_pods.rb +2 -0
- app/workers/recurring_pod_check.rb app/workers/recurring_pod_check.rb +2 -0
- app/workers/remove_old_user.rb app/workers/remove_old_user.rb +2 -0
- app/workers/reset_password.rb app/workers/reset_password.rb +2 -0
- app/workers/send_base.rb app/workers/send_base.rb +2 -0
- app/workers/send_private.rb app/workers/send_private.rb +2 -0
- app/workers/send_public.rb app/workers/send_public.rb +2 -0
- config.ru config.ru +2 -2
- config/application.rb config/application.rb +4 -15
- config/asset_sync.rb config/asset_sync.rb +2 -0
- config/boot.rb config/boot.rb +2 -0
- config/defaults.yml config/defaults.yml +2 -1
- config/diaspora.yml.example config/diaspora.yml.example +5 -0
- config/environment.rb config/environment.rb +2 -0
- config/environments/development.rb config/environments/development.rb +2 -0
- config/environments/integration.rb config/environments/integration.rb +2 -0
- config/environments/production.rb config/environments/production.rb +2 -0
- config/environments/test.rb config/environments/test.rb +2 -0
- config/eye.rb config/eye.rb +2 -0
- config/initializers/acts_as_taggable_on.rb config/initializers/acts_as_taggable_on.rb +2 -0
- config/initializers/application_controller_renderer.rb config/initializers/application_controller_renderer.rb +1 -0
- config/initializers/asset_sync.rb config/initializers/asset_sync.rb +2 -0
- config/initializers/assets.rb config/initializers/assets.rb +2 -0
- config/initializers/backtrace_silencers.rb config/initializers/backtrace_silencers.rb +1 -0
- config/initializers/carrierwave.rb config/initializers/carrierwave.rb +4 -0
- config/initializers/color_themes.rb config/initializers/color_themes.rb +2 -0
- config/initializers/cookies_serializer.rb config/initializers/cookies_serializer.rb +2 -0
- config/initializers/cors.rb config/initializers/cors.rb +2 -0
- config/initializers/devise.rb config/initializers/devise.rb +2 -0
- config/initializers/diaspora_federation.rb config/initializers/diaspora_federation.rb +4 -0
- config/initializers/enforce_ssl.rb config/initializers/enforce_ssl.rb +2 -0
- config/initializers/entypo.rb config/initializers/entypo.rb +2 -0
- config/initializers/faraday.rb config/initializers/faraday.rb +2 -0
- config/initializers/filter_parameter_logging.rb config/initializers/filter_parameter_logging.rb +2 -0
- config/initializers/haml.rb config/initializers/haml.rb +2 -0
- config/initializers/handlebars_assets.rb config/initializers/handlebars_assets.rb +2 -0
- config/initializers/ignore_ssl_in_development.rb config/initializers/ignore_ssl_in_development.rb +2 -0
- config/initializers/inflections.rb config/initializers/inflections.rb +1 -0
- config/initializers/json_escape.rb config/initializers/json_escape.rb +2 -0
- config/initializers/jsroutes.rb config/initializers/jsroutes.rb +2 -0
- config/initializers/load_analyitics.rb config/initializers/load_analyitics.rb +2 -0
- config/initializers/load_libraries.rb config/initializers/load_libraries.rb +2 -0
- config/initializers/locale.rb config/initializers/locale.rb +2 -0
- config/initializers/mailer_config.rb config/initializers/mailer_config.rb +2 -0
- config/initializers/maintenance.rb config/initializers/maintenance.rb +2 -0
- config/initializers/markerb.rb config/initializers/markerb.rb +2 -0
- config/initializers/mime_types.rb config/initializers/mime_types.rb +1 -0
- config/initializers/oembed.rb config/initializers/oembed.rb +2 -0
- config/initializers/omniauth.rb config/initializers/omniauth.rb +2 -0
- config/initializers/open_graph_reader.rb config/initializers/open_graph_reader.rb +2 -0
- config/initializers/patch_openssl_pkey.rb config/initializers/patch_openssl_pkey.rb +2 -0
- config/initializers/prosody.rb config/initializers/prosody.rb +2 -0
- config/initializers/rspec_generator.rb config/initializers/rspec_generator.rb +2 -0
- config/initializers/secure_headers.rb config/initializers/secure_headers.rb +2 -0
- config/initializers/session_store.rb config/initializers/session_store.rb +2 -0
- config/initializers/set_session_secret.rb config/initializers/set_session_secret.rb +2 -0
- config/initializers/set_up_image_redirects.rb config/initializers/set_up_image_redirects.rb +2 -0
- config/initializers/setup_simple_captcha.rb config/initializers/setup_simple_captcha.rb +2 -0
- config/initializers/sidekiq.rb config/initializers/sidekiq.rb +2 -0
- config/initializers/version_header.rb config/initializers/version_header.rb +2 -0
- config/initializers/will_paginate.rb config/initializers/will_paginate.rb +2 -0
- config/initializers/wrap_parameters.rb config/initializers/wrap_parameters.rb +2 -0
- config/load_config.rb config/load_config.rb +2 -0
- config/locales/cldr/plurals.rb config/locales/cldr/plurals.rb +2 -0
- config/locales/devise/devise.nb.yml config/locales/devise/devise.nb.yml +23 -1
- config/locales/devise/devise.oc.yml config/locales/devise/devise.oc.yml +6 -6
- config/locales/devise/devise.pl.yml config/locales/devise/devise.pl.yml +2 -1
- config/locales/devise/devise.sc.yml config/locales/devise/devise.sc.yml +115 -0
- config/locales/diaspora/da.yml config/locales/diaspora/da.yml +5 -7
- config/locales/diaspora/de-CH.yml config/locales/diaspora/de-CH.yml +2 -2
- config/locales/diaspora/de.yml config/locales/diaspora/de.yml +37 -32
- config/locales/diaspora/de_formal.yml config/locales/diaspora/de_formal.yml +22 -18
- config/locales/diaspora/en.yml config/locales/diaspora/en.yml +7 -3
- config/locales/diaspora/es.yml config/locales/diaspora/es.yml +4 -0
- config/locales/diaspora/fr.yml config/locales/diaspora/fr.yml +15 -10
- config/locales/diaspora/hy.yml config/locales/diaspora/hy.yml +2 -0
- config/locales/diaspora/ja.yml config/locales/diaspora/ja.yml +4 -0
- config/locales/diaspora/nb.yml config/locales/diaspora/nb.yml +280 -72
- config/locales/diaspora/oc.yml config/locales/diaspora/oc.yml +150 -148
- config/locales/diaspora/pl.yml config/locales/diaspora/pl.yml +123 -74
- config/locales/diaspora/pt-BR.yml config/locales/diaspora/pt-BR.yml +19 -9
- config/locales/diaspora/ru.yml config/locales/diaspora/ru.yml +130 -10
- config/locales/diaspora/sc.yml config/locales/diaspora/sc.yml +396 -20
- config/locales/diaspora/sv.yml config/locales/diaspora/sv.yml +5 -4
- config/locales/diaspora/uk.yml config/locales/diaspora/uk.yml +25 -23
- config/locales/diaspora/zh-CN.yml config/locales/diaspora/zh-CN.yml +55 -0
- config/locales/diaspora/zh-TW.yml config/locales/diaspora/zh-TW.yml +7 -5
- config/locales/javascript/javascript.da.yml config/locales/javascript/javascript.da.yml +1 -0
- config/locales/javascript/javascript.de.yml config/locales/javascript/javascript.de.yml +4 -3
- config/locales/javascript/javascript.de_formal.yml config/locales/javascript/javascript.de_formal.yml +1 -0
- config/locales/javascript/javascript.en.yml config/locales/javascript/javascript.en.yml +1 -0
- config/locales/javascript/javascript.es.yml config/locales/javascript/javascript.es.yml +1 -0
- config/locales/javascript/javascript.fr.yml config/locales/javascript/javascript.fr.yml +1 -0
- config/locales/javascript/javascript.ja.yml config/locales/javascript/javascript.ja.yml +1 -0
- config/locales/javascript/javascript.nb.yml config/locales/javascript/javascript.nb.yml +76 -1
- config/locales/javascript/javascript.oc.yml config/locales/javascript/javascript.oc.yml +21 -20
- config/locales/javascript/javascript.pl.yml config/locales/javascript/javascript.pl.yml +24 -1
- config/locales/javascript/javascript.pt-BR.yml config/locales/javascript/javascript.pt-BR.yml +1 -0
- config/locales/javascript/javascript.ru.yml config/locales/javascript/javascript.ru.yml +19 -3
- config/locales/javascript/javascript.sc.yml config/locales/javascript/javascript.sc.yml +307 -4
- config/locales/javascript/javascript.zh-TW.yml config/locales/javascript/javascript.zh-TW.yml +1 -0
- config/logging.rb config/logging.rb +2 -0
- config/routes.rb config/routes.rb +2 -0
- config/spring.rb config/spring.rb +2 -0
- config/unicorn.rb config/unicorn.rb +2 -0
- db/migrate/0000_create_schema.rb db/migrate/0000_create_schema.rb +309 -125
- db/migrate/20130207231310_add_facebook_id_to_post.rb db/migrate/20130207231310_add_facebook_id_to_post.rb +0 -5
- db/migrate/20130404211624_fix_default_image_url_from_profile.rb ...rate/20130404211624_fix_default_image_url_from_profile.rb +0 -9
- db/migrate/20130429073928_add_tweet_id_to_post.rb db/migrate/20130429073928_add_tweet_id_to_post.rb +0 -6
- db/migrate/20130608171134_add_open_graph_cache.rb db/migrate/20130608171134_add_open_graph_cache.rb +0 -19
- db/migrate/20130613203350_remove_limit_from_root_guid_in_posts.rb ...te/20130613203350_remove_limit_from_root_guid_in_posts.rb +0 -13
- db/migrate/20130717104359_migrate_activity_stream_to_status_message.rb ...130717104359_migrate_activity_stream_to_status_message.rb +0 -13
- db/migrate/20130801063213_add_tumblr_post_ids_to_posts.rb db/migrate/20130801063213_add_tumblr_post_ids_to_posts.rb +0 -5
- db/migrate/20131017093025_create_post_reports.rb db/migrate/20131017093025_create_post_reports.rb +0 -13
- db/migrate/20131213171804_create_simple_captcha_data.rb db/migrate/20131213171804_create_simple_captcha_data.rb +0 -15
- db/migrate/20140121132816_add_post_type_to_post_report.rb db/migrate/20140121132816_add_post_type_to_post_report.rb +0 -6
- db/migrate/20140214104217_rename_post_report_to_report.rb db/migrate/20140214104217_rename_post_report_to_report.rb +0 -8
- db/migrate/20140222162826_devise_add_lastseenable_user.rb db/migrate/20140222162826_devise_add_lastseenable_user.rb +0 -12
- db/migrate/20140308154022_create_polls.rb db/migrate/20140308154022_create_polls.rb +0 -38
- db/migrate/20140422134050_rename_post_columns_to_item.rb db/migrate/20140422134050_rename_post_columns_to_item.rb +0 -11
- db/migrate/20140422134627_change_user_id_type_to_integer.rb db/migrate/20140422134627_change_user_id_type_to_integer.rb +0 -12
- db/migrate/20140601102543_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb ...gings_counter_cache_to_tags.acts_as_taggable_on_engine.rb +0 -15
- db/migrate/20140801101230_create_chat_contacts.rb db/migrate/20140801101230_create_chat_contacts.rb +0 -17
- db/migrate/20140801101352_create_chat_fragments.rb db/migrate/20140801101352_create_chat_fragments.rb +0 -17
- db/migrate/20140824230505_add_completed_at_to_account_deletions.rb ...e/20140824230505_add_completed_at_to_account_deletions.rb +0 -5
- db/migrate/20140826165533_increase_simple_captcha_limit.rb db/migrate/20140826165533_increase_simple_captcha_limit.rb +0 -8
- db/migrate/20140906192846_fix_open_graph_data.rb db/migrate/20140906192846_fix_open_graph_data.rb +0 -10
- db/migrate/20141001162851_add_remove_after_to_users.rb db/migrate/20141001162851_add_remove_after_to_users.rb +0 -5
- db/migrate/20141007003922_add_chat_enabled_to_aspects.rb db/migrate/20141007003922_add_chat_enabled_to_aspects.rb +0 -9
- db/migrate/20141024170120_create_chat_offline_messages.rb db/migrate/20141024170120_create_chat_offline_messages.rb +0 -14
- db/migrate/20141209041241_drop_open_graph_caches_with_invalid_urls.rb ...0141209041241_drop_open_graph_caches_with_invalid_urls.rb +0 -9
- db/migrate/20141216213423_purge_orphan_conversations.rb db/migrate/20141216213423_purge_orphan_conversations.rb +0 -13
- db/migrate/20141227120907_add_export_to_user.rb db/migrate/20141227120907_add_export_to_user.rb +0 -7
- db/migrate/20141230214830_user_pref_strip_exif.rb db/migrate/20141230214830_user_pref_strip_exif.rb +0 -9
- db/migrate/20150209230946_disable_mail_for_closed_account.rb db/migrate/20150209230946_disable_mail_for_closed_account.rb +0 -9
- db/migrate/20150220001357_add_photos_export_to_user.rb db/migrate/20150220001357_add_photos_export_to_user.rb +0 -13
- db/migrate/20150403192408_remove_deleted_aspects_from_auto_follow_back.rb ...403192408_remove_deleted_aspects_from_auto_follow_back.rb +0 -11
- db/migrate/20150403212139_fix_wrong_only_sharing.rb db/migrate/20150403212139_fix_wrong_only_sharing.rb +0 -11
- db/migrate/20150523004437_enable_color_themes.rb db/migrate/20150523004437_enable_color_themes.rb +0 -9
- db/migrate/20150531005120_cleanup_default_avatars.rb db/migrate/20150531005120_cleanup_default_avatars.rb +0 -10
- db/migrate/20150607143809_fix_photo_public_flag.rb db/migrate/20150607143809_fix_photo_public_flag.rb +0 -9
- db/migrate/20150613202109_create_o_auth_applications.rb db/migrate/20150613202109_create_o_auth_applications.rb +0 -30
- db/migrate/20150630221004_add_public_to_profiles.rb db/migrate/20150630221004_add_public_to_profiles.rb +0 -5
- db/migrate/20150708153926_create_authorizations.rb db/migrate/20150708153926_create_authorizations.rb +0 -18
- db/migrate/20150708153928_create_o_auth_access_tokens.rb db/migrate/20150708153928_create_o_auth_access_tokens.rb +0 -14
- db/migrate/20150714055110_create_id_tokens.rb db/migrate/20150714055110_create_id_tokens.rb +0 -14
- db/migrate/20150724152052_remove_favorites_from_posts.rb db/migrate/20150724152052_remove_favorites_from_posts.rb +0 -9
- db/migrate/20150731123113_create_pairwise_pseudonymous_identifiers.rb ...0150731123113_create_pairwise_pseudonymous_identifiers.rb +0 -15
- db/migrate/20150731123114_add_status_to_pods.rb db/migrate/20150731123114_add_status_to_pods.rb +0 -14
- db/migrate/20150828132451_remove_duplicate_and_empty_pods.rb db/migrate/20150828132451_remove_duplicate_and_empty_pods.rb +0 -24
- db/migrate/20151003142048_update_report_item_types.rb db/migrate/20151003142048_update_report_item_types.rb +0 -7
- db/migrate/20151210213023_remove_signatures_from_relayables.rb ...grate/20151210213023_remove_signatures_from_relayables.rb +0 -9
- db/migrate/20160124234712_extend_pods.rb db/migrate/20160124234712_extend_pods.rb +0 -77
- db/migrate/20160225232049_link_share_visibilities_with_user.rb ...grate/20160225232049_link_share_visibilities_with_user.rb +0 -80
- db/migrate/20160302025129_cleanup_aspect_visibility.rb db/migrate/20160302025129_cleanup_aspect_visibility.rb +0 -27
- db/migrate/20160307142216_cleanup_handles.rb db/migrate/20160307142216_cleanup_handles.rb +0 -7
- db/migrate/20160327103605_add_author_id_index_to_participations.rb ...e/20160327103605_add_author_id_index_to_participations.rb +0 -5
- db/migrate/20160509232726_cleanup_duplicates_and_add_unique_indexes.rb ...160509232726_cleanup_duplicates_and_add_unique_indexes.rb +0 -47
- db/migrate/20160531170531_remove_duplicate_aspect_visibilities.rb ...te/20160531170531_remove_duplicate_aspect_visibilities.rb +0 -11
- db/migrate/20160618033455_cleanup_participations.rb db/migrate/20160618033455_cleanup_participations.rb +0 -44
- db/migrate/20160720212620_create_signature_tables.rb db/migrate/20160720212620_create_signature_tables.rb +0 -87
- db/migrate/20160802212635_cleanup_posts_table.rb db/migrate/20160802212635_cleanup_posts_table.rb +0 -30
- db/migrate/20160807212443_participation_counter.rb db/migrate/20160807212443_participation_counter.rb +0 -47
- db/migrate/20160810230114_cleanup_invitation_columns_from_users.rb ...e/20160810230114_cleanup_invitation_columns_from_users.rb +0 -72
- db/migrate/20160813115514_remove_id_tokens.rb db/migrate/20160813115514_remove_id_tokens.rb +0 -7
- db/migrate/20160822212739_remove_started_sharing_notifications_without_contact.rb ...9_remove_started_sharing_notifications_without_contact.rb +0 -13
- db/migrate/20160829170244_add_post_default_to_aspects.rb db/migrate/20160829170244_add_post_default_to_aspects.rb +2 -0
- db/migrate/20160901072443_add_video_url_to_open_graph_cache.rb ...grate/20160901072443_add_video_url_to_open_graph_cache.rb +2 -0
- db/migrate/20160902180630_remove_invalid_unconfirmed_emails.rb ...grate/20160902180630_remove_invalid_unconfirmed_emails.rb +2 -0
- db/migrate/20160906225138_fix_photos_share_visibilities.rb db/migrate/20160906225138_fix_photos_share_visibilities.rb +2 -0
- db/migrate/20161015174300_remove_empty_pod.rb db/migrate/20161015174300_remove_empty_pod.rb +2 -0
- db/migrate/20161024231443_add_scheduled_check_to_pod.rb db/migrate/20161024231443_add_scheduled_check_to_pod.rb +2 -0
- db/migrate/20161107100840_polymorphic_mentions.rb db/migrate/20161107100840_polymorphic_mentions.rb +2 -0
- db/migrate/20170430022507_remove_message_signature.rb db/migrate/20170430022507_remove_message_signature.rb +2 -0
- db/migrate/20170730154117_create_account_migrations.rb db/migrate/20170730154117_create_account_migrations.rb +2 -0
- db/migrate/20170813141631_cleanup_account_deletions_and_add_unique_index.rb ...3141631_cleanup_account_deletions_and_add_unique_index.rb +2 -0
- db/migrate/20170813153048_add_missing_indexes.rb db/migrate/20170813153048_add_missing_indexes.rb +2 -0
- db/migrate/20170813160104_cleanup_aspects_and_add_unique_index.rb ...te/20170813160104_cleanup_aspects_and_add_unique_index.rb +2 -0
- db/migrate/20170813164435_add_missing_unique_indexes.rb db/migrate/20170813164435_add_missing_unique_indexes.rb +2 -0
- db/migrate/20170813222333_reset_export_states.rb db/migrate/20170813222333_reset_export_states.rb +2 -0
- db/migrate/20170824202628_cleanup_root_guids_from_reshares.rb ...igrate/20170824202628_cleanup_root_guids_from_reshares.rb +11 -0
- db/migrate/20170827222357_remove_rails_admin_histories.rb db/migrate/20170827222357_remove_rails_admin_histories.rb +23 -0
- db/migrate/20170827231800_remove_string_column_from_ppid.rb db/migrate/20170827231800_remove_string_column_from_ppid.rb +7 -0
- db/migrate/20170914202650_cleanup_invalid_likes.rb db/migrate/20170914202650_cleanup_invalid_likes.rb +13 -0
- db/migrate/20170914212336_cleanup_invalid_polls.rb db/migrate/20170914212336_cleanup_invalid_polls.rb +19 -0
- db/migrate/20170917163640_cleanup_invalid_o_embed_caches.rb db/migrate/20170917163640_cleanup_invalid_o_embed_caches.rb +12 -0
- db/migrate/20170920214158_create_references_table.rb db/migrate/20170920214158_create_references_table.rb +16 -0
- db/migrate/20170928233609_cleanup_invalid_diaspora_ids.rb db/migrate/20170928233609_cleanup_invalid_diaspora_ids.rb +25 -0
- db/migrate/20171009232054_cleanup_relayables_without_signature.rb ...te/20171009232054_cleanup_relayables_without_signature.rb +81 -0
- db/migrate/20171012202650_cleanup_invalid_contacts.rb db/migrate/20171012202650_cleanup_invalid_contacts.rb +44 -0
- db/migrate/20171017221434_cleanup_empty_signatures.rb db/migrate/20171017221434_cleanup_empty_signatures.rb +44 -0
- features/desktop/change_settings.feature features/desktop/change_settings.feature +3 -3
- features/desktop/comments.feature features/desktop/comments.feature +1 -0
- features/desktop/connects_users.feature features/desktop/connects_users.feature +1 -1
- features/desktop/contacts.feature features/desktop/contacts.feature +2 -2
- features/desktop/conversations.feature features/desktop/conversations.feature +6 -6
- features/desktop/hovercards.feature features/desktop/hovercards.feature +4 -4
- features/desktop/likes.feature features/desktop/likes.feature +3 -3
- features/desktop/post_preview.feature features/desktop/post_preview.feature +2 -2
- features/desktop/post_with_a_poll.feature features/desktop/post_with_a_poll.feature +4 -4
- features/desktop/posts_from_main_page.feature features/desktop/posts_from_main_page.feature +5 -5
- features/desktop/posts_from_profile_page.feature features/desktop/posts_from_profile_page.feature +1 -1
- features/desktop/profile_photos.feature features/desktop/profile_photos.feature +2 -2
- features/desktop/search.feature features/desktop/search.feature +1 -1
- features/desktop/signs_up.feature features/desktop/signs_up.feature +1 -1
- features/mobile/drawer.feature features/mobile/drawer.feature +2 -2
- features/mobile/posts_from_main_page.feature features/mobile/posts_from_main_page.feature +2 -2
- features/mobile/stream.feature features/mobile/stream.feature +1 -1
- features/step_definitions/aspects_steps.rb features/step_definitions/aspects_steps.rb +10 -8
- features/step_definitions/auth_code_steps.rb features/step_definitions/auth_code_steps.rb +2 -0
- features/step_definitions/comment_steps.rb features/step_definitions/comment_steps.rb +5 -3
- features/step_definitions/conversations_steps.rb features/step_definitions/conversations_steps.rb +2 -0
- features/step_definitions/custom_web_steps.rb features/step_definitions/custom_web_steps.rb +17 -16
- features/step_definitions/debug_steps.rb features/step_definitions/debug_steps.rb +2 -0
- features/step_definitions/drawer_steps.rb features/step_definitions/drawer_steps.rb +2 -0
- features/step_definitions/gallery_steps.rb features/step_definitions/gallery_steps.rb +2 -0
- features/step_definitions/hovercard_steps.rb features/step_definitions/hovercard_steps.rb +2 -0
- features/step_definitions/implicit_flow_steps.rb features/step_definitions/implicit_flow_steps.rb +2 -0
- features/step_definitions/keyboard_navigation_steps.rb features/step_definitions/keyboard_navigation_steps.rb +3 -1
- features/step_definitions/like_steps.rb features/step_definitions/like_steps.rb +2 -0
- features/step_definitions/location_steps.rb features/step_definitions/location_steps.rb +8 -0
- features/step_definitions/mention_steps.rb features/step_definitions/mention_steps.rb +2 -0
- features/step_definitions/message_steps.rb features/step_definitions/message_steps.rb +2 -0
- features/step_definitions/mobile_steps.rb features/step_definitions/mobile_steps.rb +2 -0
- features/step_definitions/modal_steps.rb features/step_definitions/modal_steps.rb +2 -0
- features/step_definitions/notifications_steps.rb features/step_definitions/notifications_steps.rb +3 -1
- features/step_definitions/oembed_steps.rb features/step_definitions/oembed_steps.rb +4 -2
- features/step_definitions/oidc_common_steps.rb features/step_definitions/oidc_common_steps.rb +2 -0
- features/step_definitions/post_preview_steps.rb features/step_definitions/post_preview_steps.rb +2 -0
- features/step_definitions/post_with_poll_steps.rb features/step_definitions/post_with_poll_steps.rb +4 -2
- features/step_definitions/posts_steps.rb features/step_definitions/posts_steps.rb +3 -1
- features/step_definitions/profile_steps.rb features/step_definitions/profile_steps.rb +2 -0
- features/step_definitions/search_steps.rb features/step_definitions/search_steps.rb +2 -0
- features/step_definitions/session_steps.rb features/step_definitions/session_steps.rb +2 -0
- features/step_definitions/single_post_view_steps.rb features/step_definitions/single_post_view_steps.rb +2 -0
- features/step_definitions/stream_steps.rb features/step_definitions/stream_steps.rb +2 -0
- features/step_definitions/tag_steps.rb features/step_definitions/tag_steps.rb +2 -0
- features/step_definitions/user_applications_steps.rb features/step_definitions/user_applications_steps.rb +2 -0
- features/step_definitions/user_steps.rb features/step_definitions/user_steps.rb +3 -1
- features/step_definitions/web_steps.rb features/step_definitions/web_steps.rb +2 -0
- features/support/application_cuke_helpers.rb features/support/application_cuke_helpers.rb +2 -0
- features/support/env.rb features/support/env.rb +5 -0
- features/support/integration_sessions_controller.rb features/support/integration_sessions_controller.rb +2 -0
- features/support/matchers.rb features/support/matchers.rb +2 -0
- features/support/paths.rb features/support/paths.rb +2 -0
- features/support/poor_mans_webmock.rb features/support/poor_mans_webmock.rb +2 -0
- features/support/publishing_cuke_helpers.rb features/support/publishing_cuke_helpers.rb +4 -2
- features/support/user_cuke_helpers.rb features/support/user_cuke_helpers.rb +2 -0
- features/support/webmock.rb features/support/webmock.rb +2 -0
- lib/account_deleter.rb lib/account_deleter.rb +24 -40
- lib/api/openid_connect/authorization_point/endpoint.rb lib/api/openid_connect/authorization_point/endpoint.rb +2 -0
- lib/api/openid_connect/authorization_point/endpoint_confirmation_point.rb ...onnect/authorization_point/endpoint_confirmation_point.rb +2 -0
- lib/api/openid_connect/authorization_point/endpoint_start_point.rb ...penid_connect/authorization_point/endpoint_start_point.rb +2 -0
- lib/api/openid_connect/error.rb lib/api/openid_connect/error.rb +2 -0
- lib/api/openid_connect/id_token.rb lib/api/openid_connect/id_token.rb +2 -0
- lib/api/openid_connect/id_token_config.rb lib/api/openid_connect/id_token_config.rb +2 -0
- lib/api/openid_connect/protected_resource_endpoint.rb lib/api/openid_connect/protected_resource_endpoint.rb +2 -0
- lib/api/openid_connect/subject_identifier_creator.rb lib/api/openid_connect/subject_identifier_creator.rb +2 -0
- lib/api/openid_connect/token_endpoint.rb lib/api/openid_connect/token_endpoint.rb +2 -0
- lib/bookmarklet_renderer.rb lib/bookmarklet_renderer.rb +2 -0
- lib/configuration_methods.rb lib/configuration_methods.rb +3 -1
- lib/connection_tester.rb lib/connection_tester.rb +4 -2
- lib/diaspora.rb lib/diaspora.rb +2 -0
- lib/diaspora/camo.rb lib/diaspora/camo.rb +3 -1
- lib/diaspora/commentable.rb lib/diaspora/commentable.rb +2 -0
- lib/diaspora/exceptions.rb lib/diaspora/exceptions.rb +2 -0
- lib/diaspora/exporter.rb lib/diaspora/exporter.rb +5 -6
- lib/diaspora/exporter/non_contact_authors.rb lib/diaspora/exporter/non_contact_authors.rb +0 -36
- lib/diaspora/exporter/others_relayables.rb lib/diaspora/exporter/others_relayables.rb +2 -0
- lib/diaspora/exporter/posts_with_activity.rb lib/diaspora/exporter/posts_with_activity.rb +0 -59
- lib/diaspora/federated.rb lib/diaspora/federated.rb +2 -0
- lib/diaspora/federated/base.rb lib/diaspora/federated/base.rb +2 -0
- lib/diaspora/federated/contact_retraction.rb lib/diaspora/federated/contact_retraction.rb +2 -0
- lib/diaspora/federated/generator.rb lib/diaspora/federated/generator.rb +2 -0
- lib/diaspora/federated/retraction.rb lib/diaspora/federated/retraction.rb +2 -0
- lib/diaspora/federation.rb lib/diaspora/federation.rb +2 -0
- lib/diaspora/federation/dispatcher.rb lib/diaspora/federation/dispatcher.rb +2 -0
- lib/diaspora/federation/dispatcher/private.rb lib/diaspora/federation/dispatcher/private.rb +2 -0
- lib/diaspora/federation/dispatcher/public.rb lib/diaspora/federation/dispatcher/public.rb +2 -0
- lib/diaspora/federation/entities.rb lib/diaspora/federation/entities.rb +7 -7
- lib/diaspora/federation/mappings.rb lib/diaspora/federation/mappings.rb +2 -0
- lib/diaspora/federation/receive.rb lib/diaspora/federation/receive.rb +27 -20
- lib/diaspora/fetcher.rb lib/diaspora/fetcher.rb +2 -0
- lib/diaspora/fetcher/public.rb lib/diaspora/fetcher/public.rb +2 -0
- lib/diaspora/fields/author.rb lib/diaspora/fields/author.rb +2 -0
- lib/diaspora/fields/guid.rb lib/diaspora/fields/guid.rb +2 -0
- lib/diaspora/fields/target.rb lib/diaspora/fields/target.rb +2 -0
- lib/diaspora/likeable.rb lib/diaspora/likeable.rb +2 -0
- lib/diaspora/logging.rb lib/diaspora/logging.rb +2 -0
- lib/diaspora/markdownify.rb lib/diaspora/markdownify.rb +2 -0
- lib/diaspora/markdownify/email.rb lib/diaspora/markdownify/email.rb +2 -0
- lib/diaspora/markdownify/html.rb lib/diaspora/markdownify/html.rb +2 -0
- lib/diaspora/mentionable.rb lib/diaspora/mentionable.rb +2 -0
- lib/diaspora/mentions_container.rb lib/diaspora/mentions_container.rb +2 -0
- lib/diaspora/message_renderer.rb lib/diaspora/message_renderer.rb +13 -0
- lib/diaspora/relayable.rb lib/diaspora/relayable.rb +15 -7
- lib/diaspora/shareable.rb lib/diaspora/shareable.rb +2 -0
- lib/diaspora/signature.rb lib/diaspora/signature.rb +2 -0
- lib/diaspora/taggable.rb lib/diaspora/taggable.rb +2 -0
- lib/direction_detector.rb lib/direction_detector.rb +2 -0
- lib/email_inviter.rb lib/email_inviter.rb +4 -3
- lib/error_page_renderer.rb lib/error_page_renderer.rb +2 -0
- lib/evil_query.rb lib/evil_query.rb +2 -0
- lib/i18n_interpolation_fallbacks.rb lib/i18n_interpolation_fallbacks.rb +2 -0
- lib/node_info.rb lib/node_info.rb +2 -0
- lib/photo_exporter.rb lib/photo_exporter.rb +2 -0
- lib/publisher.rb lib/publisher.rb +2 -0
- lib/pubsubhubbub.rb lib/pubsubhubbub.rb +2 -0
- lib/rack/internet_explorer_version.rb lib/rack/internet_explorer_version.rb +0 -41
- lib/schemas/archive-format.json lib/schemas/archive-format.json +26 -3
- lib/share_visibility_converter.rb lib/share_visibility_converter.rb +2 -0
- lib/sidekiq_middlewares.rb lib/sidekiq_middlewares.rb +2 -0
- lib/stream.rb lib/stream.rb +2 -0
- lib/stream/activity.rb lib/stream/activity.rb +2 -0
- lib/stream/aspect.rb lib/stream/aspect.rb +2 -0
- lib/stream/base.rb lib/stream/base.rb +2 -0
- lib/stream/comments.rb lib/stream/comments.rb +2 -0
- lib/stream/followed_tag.rb lib/stream/followed_tag.rb +2 -0
- lib/stream/likes.rb lib/stream/likes.rb +2 -0
- lib/stream/mention.rb lib/stream/mention.rb +2 -0
- lib/stream/multi.rb lib/stream/multi.rb +2 -0
- lib/stream/person.rb lib/stream/person.rb +2 -0
- lib/stream/public.rb lib/stream/public.rb +2 -0
- lib/stream/tag.rb lib/stream/tag.rb +2 -0
- lib/tasks/assets.rake lib/tasks/assets.rake +2 -0
- lib/tasks/cucumber.rake lib/tasks/cucumber.rake +2 -0
- lib/tasks/db.rake lib/tasks/db.rake +2 -0
- lib/tasks/default.rake lib/tasks/default.rake +2 -0
- lib/tasks/generate_session_secret.rake lib/tasks/generate_session_secret.rake +7 -7
- lib/tasks/linter.rake lib/tasks/linter.rake +2 -0
- lib/tasks/maintenance.rake lib/tasks/maintenance.rake +2 -0
- lib/tasks/migrations.rake lib/tasks/migrations.rake +24 -0
- lib/tasks/podmin.rake lib/tasks/podmin.rake +2 -0
- lib/tasks/screenshots.rake lib/tasks/screenshots.rake +8 -5
- lib/tasks/tests.rake lib/tasks/tests.rake +2 -0
- script/cucumber script/cucumber +0 -10
- script/get_config.rb script/get_config.rb +2 -0
- script/i18n/xmltoyml.rb script/i18n/xmltoyml.rb +2 -0
- script/i18n/ymltoxml.rb script/i18n/ymltoxml.rb +2 -0
- script/rails script/rails +0 -6
- spec/configuration_methods_spec.rb spec/configuration_methods_spec.rb +2 -0
- spec/controllers/admin/pods_controller_spec.rb spec/controllers/admin/pods_controller_spec.rb +2 -0
- spec/controllers/admin/users_controller_spec.rb spec/controllers/admin/users_controller_spec.rb +2 -0
- spec/controllers/admins_controller_spec.rb spec/controllers/admins_controller_spec.rb +2 -0
- spec/controllers/api/openid_connect/authorizations_controller_spec.rb ...lers/api/openid_connect/authorizations_controller_spec.rb +2 -0
- spec/controllers/api/openid_connect/clients_controller_spec.rb ...controllers/api/openid_connect/clients_controller_spec.rb +2 -0
- spec/controllers/api/openid_connect/discovery_controller_spec.rb ...ntrollers/api/openid_connect/discovery_controller_spec.rb +2 -0
- spec/controllers/api/openid_connect/id_tokens_controller_spec.rb ...ntrollers/api/openid_connect/id_tokens_controller_spec.rb +2 -0
- spec/controllers/api/openid_connect/token_endpoint_controller_spec.rb ...lers/api/openid_connect/token_endpoint_controller_spec.rb +2 -0
- spec/controllers/api/openid_connect/user_applications_spec.rb .../controllers/api/openid_connect/user_applications_spec.rb +2 -0
- spec/controllers/application_controller_spec.rb spec/controllers/application_controller_spec.rb +2 -0
- spec/controllers/aspect_memberships_controller_spec.rb spec/controllers/aspect_memberships_controller_spec.rb +2 -0
- spec/controllers/aspects_controller_spec.rb spec/controllers/aspects_controller_spec.rb +2 -0
- spec/controllers/blocks_controller_spec.rb spec/controllers/blocks_controller_spec.rb +2 -0
- spec/controllers/comments_controller_spec.rb spec/controllers/comments_controller_spec.rb +15 -4
- spec/controllers/contacts_controller_spec.rb spec/controllers/contacts_controller_spec.rb +2 -0
- spec/controllers/conversation_visibilities_controller_spec.rb .../controllers/conversation_visibilities_controller_spec.rb +2 -0
- spec/controllers/conversations_controller_spec.rb spec/controllers/conversations_controller_spec.rb +5 -11
- spec/controllers/help_controller_spec.rb spec/controllers/help_controller_spec.rb +2 -0
- spec/controllers/home_controller_spec.rb spec/controllers/home_controller_spec.rb +2 -0
- spec/controllers/invitation_codes_controller_spec.rb spec/controllers/invitation_codes_controller_spec.rb +2 -0
- spec/controllers/invitations_controller_spec.rb spec/controllers/invitations_controller_spec.rb +2 -0
- spec/controllers/jasmine_fixtures/admins_spec.rb spec/controllers/jasmine_fixtures/admins_spec.rb +2 -0
- spec/controllers/jasmine_fixtures/aspects_spec.rb spec/controllers/jasmine_fixtures/aspects_spec.rb +2 -0
- spec/controllers/jasmine_fixtures/contacts_spec.rb spec/controllers/jasmine_fixtures/contacts_spec.rb +2 -0
- spec/controllers/jasmine_fixtures/conversations_spec.rb spec/controllers/jasmine_fixtures/conversations_spec.rb +2 -0
- spec/controllers/jasmine_fixtures/notifications_spec.rb spec/controllers/jasmine_fixtures/notifications_spec.rb +2 -0
- spec/controllers/jasmine_fixtures/people_spec.rb spec/controllers/jasmine_fixtures/people_spec.rb +2 -0
- spec/controllers/jasmine_fixtures/photos_spec.rb spec/controllers/jasmine_fixtures/photos_spec.rb +2 -0
- spec/controllers/jasmine_fixtures/posts_spec.rb spec/controllers/jasmine_fixtures/posts_spec.rb +2 -0
- spec/controllers/jasmine_fixtures/status_messages_spec.rb spec/controllers/jasmine_fixtures/status_messages_spec.rb +2 -0
- spec/controllers/jasmine_fixtures/streams_spec.rb spec/controllers/jasmine_fixtures/streams_spec.rb +2 -0
- spec/controllers/jasmine_fixtures/users_spec.rb spec/controllers/jasmine_fixtures/users_spec.rb +2 -0
- spec/controllers/likes_controller_spec.rb spec/controllers/likes_controller_spec.rb +18 -1
- spec/controllers/messages_controller_spec.rb spec/controllers/messages_controller_spec.rb +2 -0
- spec/controllers/node_info_controller_spec.rb spec/controllers/node_info_controller_spec.rb +2 -0
- spec/controllers/notifications_controller_spec.rb spec/controllers/notifications_controller_spec.rb +3 -1
- spec/controllers/participations_controller_spec.rb spec/controllers/participations_controller_spec.rb +2 -0
- spec/controllers/passwords_controller_spec.rb spec/controllers/passwords_controller_spec.rb +2 -0
- spec/controllers/people_controller_spec.rb spec/controllers/people_controller_spec.rb +2 -0
- spec/controllers/photos_controller_spec.rb spec/controllers/photos_controller_spec.rb +3 -1
- spec/controllers/posts_controller_spec.rb spec/controllers/posts_controller_spec.rb +3 -1
- spec/controllers/profiles_controller_spec.rb spec/controllers/profiles_controller_spec.rb +2 -0
- spec/controllers/registrations_controller_spec.rb spec/controllers/registrations_controller_spec.rb +2 -0
- spec/controllers/report_controller_spec.rb spec/controllers/report_controller_spec.rb +2 -0
- spec/controllers/reshares_controller_spec.rb spec/controllers/reshares_controller_spec.rb +9 -0
- spec/controllers/search_controller_spec.rb spec/controllers/search_controller_spec.rb +2 -0
- spec/controllers/services_controller_spec.rb spec/controllers/services_controller_spec.rb +2 -0
- spec/controllers/sessions_controller_spec.rb spec/controllers/sessions_controller_spec.rb +2 -0
- spec/controllers/share_visibilities_controller_spec.rb spec/controllers/share_visibilities_controller_spec.rb +2 -0
- spec/controllers/social_relay_controller_spec.rb spec/controllers/social_relay_controller_spec.rb +2 -0
- spec/controllers/status_messages_controller_spec.rb spec/controllers/status_messages_controller_spec.rb +3 -1
- spec/controllers/streams_controller_spec.rb spec/controllers/streams_controller_spec.rb +2 -0
- spec/controllers/tag_followings_controller_spec.rb spec/controllers/tag_followings_controller_spec.rb +2 -0
- spec/controllers/tags_controller_spec.rb spec/controllers/tags_controller_spec.rb +2 -0
- spec/controllers/terms_controller_spec.rb spec/controllers/terms_controller_spec.rb +2 -0
- spec/controllers/users_controller_spec.rb spec/controllers/users_controller_spec.rb +7 -5
- spec/factories.rb spec/factories.rb +16 -0
- spec/federation_callbacks_spec.rb spec/federation_callbacks_spec.rb +2 -1
- spec/helper_methods.rb spec/helper_methods.rb +2 -0
- spec/helpers/application_helper_spec.rb spec/helpers/application_helper_spec.rb +2 -0
- spec/helpers/conversations_helper_spec.rb spec/helpers/conversations_helper_spec.rb +2 -0
- spec/helpers/getting_started_helper_spec.rb spec/helpers/getting_started_helper_spec.rb +2 -0
- spec/helpers/gon_helper_spec.rb spec/helpers/gon_helper_spec.rb +2 -0
- spec/helpers/interim_stream_hackiness_helper_spec.rb spec/helpers/interim_stream_hackiness_helper_spec.rb +2 -0
- spec/helpers/jsxc_helper_spec.rb spec/helpers/jsxc_helper_spec.rb +2 -0
- spec/helpers/language_helper_spec.rb spec/helpers/language_helper_spec.rb +2 -0
- spec/helpers/layout_helper_spec.rb spec/helpers/layout_helper_spec.rb +2 -0
- spec/helpers/meta_data_helper_spec.rb spec/helpers/meta_data_helper_spec.rb +2 -0
- spec/helpers/notifications_helper_spec.rb spec/helpers/notifications_helper_spec.rb +2 -0
- spec/helpers/notifier_helper_spec.rb spec/helpers/notifier_helper_spec.rb +2 -0
- spec/helpers/o_embed_helper_spec.rb spec/helpers/o_embed_helper_spec.rb +2 -0
- spec/helpers/open_graph_helper_spec.rb spec/helpers/open_graph_helper_spec.rb +2 -0
- spec/helpers/people_helper_spec.rb spec/helpers/people_helper_spec.rb +2 -0
- spec/helpers/posts_helper_spec.rb spec/helpers/posts_helper_spec.rb +2 -0
- spec/helpers/publisher_helper_spec.rb spec/helpers/publisher_helper_spec.rb +2 -0
- spec/helpers/report_helper_spec.rb spec/helpers/report_helper_spec.rb +2 -0
- spec/helpers/stream_helper_spec.rb spec/helpers/stream_helper_spec.rb +2 -0
- spec/helpers/tags_helper_spec.rb spec/helpers/tags_helper_spec.rb +2 -0
- spec/helpers/users_helper_spec.rb spec/helpers/users_helper_spec.rb +2 -0
- spec/integration/account_deletion_spec.rb spec/integration/account_deletion_spec.rb +2 -0
- spec/integration/account_migration_spec.rb spec/integration/account_migration_spec.rb +2 -0
- spec/integration/api/user_info_controller_spec.rb spec/integration/api/user_info_controller_spec.rb +2 -0
- spec/integration/application_spec.rb spec/integration/application_spec.rb +2 -0
- spec/integration/contact_deleting_spec.rb spec/integration/contact_deleting_spec.rb +2 -0
- spec/integration/contacts_spec.rb spec/integration/contacts_spec.rb +2 -0
- spec/integration/dispatching_spec.rb spec/integration/dispatching_spec.rb +2 -0
- spec/integration/export/memory_usage_spec.rb spec/integration/export/memory_usage_spec.rb +51 -0
- spec/integration/exporter_spec.rb spec/integration/exporter_spec.rb +10 -95
- spec/integration/federation/attack_vectors_spec.rb spec/integration/federation/attack_vectors_spec.rb +2 -0
- spec/integration/federation/federation_helper.rb spec/integration/federation/federation_helper.rb +2 -0
- spec/integration/federation/receive_federation_messages_spec.rb ...ntegration/federation/receive_federation_messages_spec.rb +7 -4
- spec/integration/federation/shared_receive_relayable.rb spec/integration/federation/shared_receive_relayable.rb +3 -1
- spec/integration/federation/shared_receive_retraction.rb spec/integration/federation/shared_receive_retraction.rb +2 -0
- spec/integration/federation/shared_receive_stream_items.rb spec/integration/federation/shared_receive_stream_items.rb +2 -0
- spec/integration/mentioning_spec.rb spec/integration/mentioning_spec.rb +2 -0
- spec/integration/mobile_posts_spec.rb spec/integration/mobile_posts_spec.rb +2 -0
- spec/integration/profile_spec.rb spec/integration/profile_spec.rb +9 -7
- spec/integration/receiving_spec.rb spec/integration/receiving_spec.rb +2 -0
- spec/integration/tag_people_spec.rb spec/integration/tag_people_spec.rb +2 -0
- spec/javascripts/app/pages/contacts_spec.js spec/javascripts/app/pages/contacts_spec.js +6 -8
- spec/javascripts/app/views/aspects_dropdown_view_spec.js spec/javascripts/app/views/aspects_dropdown_view_spec.js +1 -1
- spec/javascripts/app/views/comment_stream_view_spec.js spec/javascripts/app/views/comment_stream_view_spec.js +8 -2
- spec/javascripts/app/views/conversations_form_view_spec.js spec/javascripts/app/views/conversations_form_view_spec.js +13 -2
- spec/javascripts/app/views/poll_view_spec.js spec/javascripts/app/views/poll_view_spec.js +26 -5
- spec/javascripts/app/views/profile_header_view_spec.js spec/javascripts/app/views/profile_header_view_spec.js +8 -10
- spec/javascripts/app/views/publisher_view_spec.js spec/javascripts/app/views/publisher_view_spec.js +11 -11
- spec/javascripts/jasmine_helpers/factory.js spec/javascripts/jasmine_helpers/factory.js +8 -6
- spec/javascripts/support/jasmine_runner.rb spec/javascripts/support/jasmine_runner.rb +2 -0
- spec/lib/account_deleter_spec.rb spec/lib/account_deleter_spec.rb +27 -20
- spec/lib/api/openid_connect/protected_resource_endpoint_spec.rb ...ib/api/openid_connect/protected_resource_endpoint_spec.rb +2 -0
- spec/lib/api/openid_connect/token_endpoint_spec.rb spec/lib/api/openid_connect/token_endpoint_spec.rb +2 -0
- spec/lib/configuration_methods_spec.rb spec/lib/configuration_methods_spec.rb +2 -0
- spec/lib/connection_tester_spec.rb spec/lib/connection_tester_spec.rb +2 -0
- spec/lib/diaspora/camo_spec.rb spec/lib/diaspora/camo_spec.rb +2 -0
- spec/lib/diaspora/exporter/non_contact_authors_spec.rb spec/lib/diaspora/exporter/non_contact_authors_spec.rb +0 -25
- spec/lib/diaspora/exporter/others_relayables_spec.rb spec/lib/diaspora/exporter/others_relayables_spec.rb +2 -0
- spec/lib/diaspora/exporter/posts_with_activity_spec.rb spec/lib/diaspora/exporter/posts_with_activity_spec.rb +0 -24
- spec/lib/diaspora/exporter_spec.rb spec/lib/diaspora/exporter_spec.rb +3 -1
- spec/lib/diaspora/federated/base_spec.rb spec/lib/diaspora/federated/base_spec.rb +2 -0
- spec/lib/diaspora/federated/contact_retraction_spec.rb spec/lib/diaspora/federated/contact_retraction_spec.rb +2 -0
- spec/lib/diaspora/federated/retraction_spec.rb spec/lib/diaspora/federated/retraction_spec.rb +2 -0
- spec/lib/diaspora/federation/dispatcher/private_spec.rb spec/lib/diaspora/federation/dispatcher/private_spec.rb +4 -2
- spec/lib/diaspora/federation/dispatcher/public_spec.rb spec/lib/diaspora/federation/dispatcher/public_spec.rb +2 -0
- spec/lib/diaspora/federation/dispatcher_spec.rb spec/lib/diaspora/federation/dispatcher_spec.rb +2 -0
- spec/lib/diaspora/federation/entities_spec.rb spec/lib/diaspora/federation/entities_spec.rb +2 -2
- spec/lib/diaspora/federation/receive_spec.rb spec/lib/diaspora/federation/receive_spec.rb +88 -14
- spec/lib/diaspora/fetcher/public_spec.rb spec/lib/diaspora/fetcher/public_spec.rb +2 -0
- spec/lib/diaspora/markdownify_email_spec.rb spec/lib/diaspora/markdownify_email_spec.rb +2 -0
- spec/lib/diaspora/markdownify_spec.rb spec/lib/diaspora/markdownify_spec.rb +2 -0
- spec/lib/diaspora/mentionable_spec.rb spec/lib/diaspora/mentionable_spec.rb +2 -0
- spec/lib/diaspora/message_renderer_spec.rb spec/lib/diaspora/message_renderer_spec.rb +82 -8
- spec/lib/diaspora/shareable_spec.rb spec/lib/diaspora/shareable_spec.rb +2 -0
- spec/lib/diaspora/taggable_spec.rb spec/lib/diaspora/taggable_spec.rb +2 -0
- spec/lib/direction_detector_spec.rb spec/lib/direction_detector_spec.rb +2 -0
- spec/lib/email_inviter_spec.rb spec/lib/email_inviter_spec.rb +4 -9
- spec/lib/evil_query_spec.rb spec/lib/evil_query_spec.rb +2 -0
- spec/lib/i18n_interpolation_fallbacks_spec.rb spec/lib/i18n_interpolation_fallbacks_spec.rb +2 -0
- spec/lib/publisher_spec.rb spec/lib/publisher_spec.rb +2 -0
- spec/lib/pubsubhubbub_spec.rb spec/lib/pubsubhubbub_spec.rb +2 -0
- spec/lib/rack/internet_explorer_version_spec.rb spec/lib/rack/internet_explorer_version_spec.rb +0 -47
- spec/lib/stream/activity_spec.rb spec/lib/stream/activity_spec.rb +2 -0
- spec/lib/stream/aspect_spec.rb spec/lib/stream/aspect_spec.rb +2 -0
- spec/lib/stream/base_spec.rb spec/lib/stream/base_spec.rb +2 -0
- spec/lib/stream/comments_spec.rb spec/lib/stream/comments_spec.rb +2 -0
- spec/lib/stream/followed_tag_spec.rb spec/lib/stream/followed_tag_spec.rb +2 -0
- spec/lib/stream/likes_spec.rb spec/lib/stream/likes_spec.rb +2 -0
- spec/lib/stream/mention_spec.rb spec/lib/stream/mention_spec.rb +2 -0
- spec/lib/stream/multi_spec.rb spec/lib/stream/multi_spec.rb +2 -0
- spec/lib/stream/person_spec.rb spec/lib/stream/person_spec.rb +2 -0
- spec/lib/stream/public_spec.rb spec/lib/stream/public_spec.rb +2 -0
- spec/lib/stream/tag_spec.rb spec/lib/stream/tag_spec.rb +2 -0
- spec/locale_spec.rb spec/locale_spec.rb +2 -0
- spec/mailers/export_spec.rb spec/mailers/export_spec.rb +2 -0
- spec/mailers/maintenance_spec.rb spec/mailers/maintenance_spec.rb +2 -0
- spec/mailers/notifier_spec.rb spec/mailers/notifier_spec.rb +4 -2
- spec/mailers/report_spec.rb spec/mailers/report_spec.rb +2 -0
- spec/models/account_deletion_spec.rb spec/models/account_deletion_spec.rb +2 -0
- spec/models/account_migration_spec.rb spec/models/account_migration_spec.rb +11 -1
- spec/models/acts_as_taggable_on_tag_spec.rb spec/models/acts_as_taggable_on_tag_spec.rb +2 -0
- spec/models/api/openid_connect/id_token_spec.rb spec/models/api/openid_connect/id_token_spec.rb +2 -0
- spec/models/aspect_membership_spec.rb spec/models/aspect_membership_spec.rb +10 -0
- spec/models/aspect_spec.rb spec/models/aspect_spec.rb +2 -0
- spec/models/aspect_visibility_spec.rb spec/models/aspect_visibility_spec.rb +2 -0
- spec/models/block_spec.rb spec/models/block_spec.rb +2 -0
- spec/models/comment_signature_spec.rb spec/models/comment_signature_spec.rb +2 -0
- spec/models/comment_spec.rb spec/models/comment_spec.rb +3 -0
- spec/models/contact_spec.rb spec/models/contact_spec.rb +2 -0
- spec/models/conversation_spec.rb spec/models/conversation_spec.rb +2 -0
- spec/models/conversation_visibilities_spec.rb spec/models/conversation_visibilities_spec.rb +2 -0
- spec/models/invitation_code_spec.rb spec/models/invitation_code_spec.rb +2 -0
- spec/models/like_signature_spec.rb spec/models/like_signature_spec.rb +2 -0
- spec/models/like_spec.rb spec/models/like_spec.rb +15 -0
- spec/models/location_spec.rb spec/models/location_spec.rb +2 -0
- spec/models/mention_spec.rb spec/models/mention_spec.rb +2 -0
- spec/models/message_spec.rb spec/models/message_spec.rb +4 -0
- spec/models/notification_spec.rb spec/models/notification_spec.rb +2 -0
- spec/models/notifications/also_commented_spec.rb spec/models/notifications/also_commented_spec.rb +2 -0
- spec/models/notifications/mentioned_in_post_spec.rb spec/models/notifications/mentioned_in_post_spec.rb +2 -0
- spec/models/notifications/mentioned_spec.rb spec/models/notifications/mentioned_spec.rb +2 -0
- spec/models/notifications/private_message_spec.rb spec/models/notifications/private_message_spec.rb +2 -0
- spec/models/notifications/reshared_spec.rb spec/models/notifications/reshared_spec.rb +2 -0
- spec/models/notifications/started_sharing_spec.rb spec/models/notifications/started_sharing_spec.rb +2 -0
- spec/models/open_graph_cache_spec.rb spec/models/open_graph_cache_spec.rb +2 -0
- spec/models/participation_spec.rb spec/models/participation_spec.rb +2 -0
- spec/models/person_spec.rb spec/models/person_spec.rb +2 -0
- spec/models/photo_spec.rb spec/models/photo_spec.rb +2 -0
- spec/models/pod_spec.rb spec/models/pod_spec.rb +2 -0
- spec/models/poll_answer_spec.rb spec/models/poll_answer_spec.rb +2 -0
- spec/models/poll_participation_signature_spec.rb spec/models/poll_participation_signature_spec.rb +2 -0
- spec/models/poll_participation_spec.rb spec/models/poll_participation_spec.rb +2 -0
- spec/models/poll_spec.rb spec/models/poll_spec.rb +21 -0
- spec/models/post_spec.rb spec/models/post_spec.rb +11 -0
- spec/models/profile_spec.rb spec/models/profile_spec.rb +2 -0
- spec/models/reference_spec.rb spec/models/reference_spec.rb +22 -0
- spec/models/report_spec.rb spec/models/report_spec.rb +2 -0
- spec/models/reshare_spec.rb spec/models/reshare_spec.rb +41 -8
- spec/models/role_spec.rb spec/models/role_spec.rb +2 -0
- spec/models/service_spec.rb spec/models/service_spec.rb +2 -0
- spec/models/services/facebook_spec.rb spec/models/services/facebook_spec.rb +2 -0
- spec/models/services/tumblr_spec.rb spec/models/services/tumblr_spec.rb +2 -0
- spec/models/services/twitter_spec.rb spec/models/services/twitter_spec.rb +2 -0
- spec/models/services/wordpress_spec.rb spec/models/services/wordpress_spec.rb +2 -0
- spec/models/share_visibility_spec.rb spec/models/share_visibility_spec.rb +2 -0
- spec/models/signature_order_spec.rb spec/models/signature_order_spec.rb +2 -0
- spec/models/status_message_spec.rb spec/models/status_message_spec.rb +22 -0
- spec/models/tag_following_spec.rb spec/models/tag_following_spec.rb +2 -0
- spec/models/user/authentication_token_spec.rb spec/models/user/authentication_token_spec.rb +2 -0
- spec/models/user/connecting_spec.rb spec/models/user/connecting_spec.rb +12 -0
- spec/models/user/posting_spec.rb spec/models/user/posting_spec.rb +2 -0
- spec/models/user/querying_spec.rb spec/models/user/querying_spec.rb +2 -0
- spec/models/user/social_actions_spec.rb spec/models/user/social_actions_spec.rb +2 -0
- spec/models/user_preference_spec.rb spec/models/user_preference_spec.rb +2 -0
- spec/models/user_spec.rb spec/models/user_spec.rb +18 -10
- spec/presenters/aspect_membership_presenter_spec.rb spec/presenters/aspect_membership_presenter_spec.rb +2 -0
- spec/presenters/aspect_presenter_spec.rb spec/presenters/aspect_presenter_spec.rb +2 -0
- spec/presenters/avatar_presenter_spec.rb spec/presenters/avatar_presenter_spec.rb +2 -0
- spec/presenters/base_presenter_spec.rb spec/presenters/base_presenter_spec.rb +2 -0
- spec/presenters/contact_presenter_spec.rb spec/presenters/contact_presenter_spec.rb +2 -0
- spec/presenters/node_info_presenter_spec.rb spec/presenters/node_info_presenter_spec.rb +30 -2
- spec/presenters/o_embed_presenter_spec.rb spec/presenters/o_embed_presenter_spec.rb +2 -0
- spec/presenters/person_presenter_spec.rb spec/presenters/person_presenter_spec.rb +2 -0
- spec/presenters/post_interaction_presenter_spec.rb spec/presenters/post_interaction_presenter_spec.rb +2 -0
- spec/presenters/post_presenter_spec.rb spec/presenters/post_presenter_spec.rb +15 -0
- spec/presenters/profile_presenter_spec.rb spec/presenters/profile_presenter_spec.rb +2 -0
- spec/presenters/service_presenter_spec.rb spec/presenters/service_presenter_spec.rb +2 -0
- spec/presenters/social_relay_presenter_spec.rb spec/presenters/social_relay_presenter_spec.rb +2 -0
- spec/presenters/user_presenter_spec.rb spec/presenters/user_presenter_spec.rb +2 -0
- spec/serializers/export/aspect_serializer_spec.rb spec/serializers/export/aspect_serializer_spec.rb +2 -0
- spec/serializers/export/contact_serializer_spec.rb spec/serializers/export/contact_serializer_spec.rb +2 -0
- spec/serializers/export/others_data_serializer_spec.rb spec/serializers/export/others_data_serializer_spec.rb +3 -25
- spec/serializers/export/own_post_serializer_spec.rb spec/serializers/export/own_post_serializer_spec.rb +2 -0
- spec/serializers/export/own_relayables_serializer_spec.rb spec/serializers/export/own_relayables_serializer_spec.rb +2 -0
- spec/serializers/export/person_metadata_serializer_spec.rb spec/serializers/export/person_metadata_serializer_spec.rb +0 -12
- spec/serializers/export/user_serializer_spec.rb spec/serializers/export/user_serializer_spec.rb +3 -1
- spec/serializers/federation_entity_serializer_spec.rb spec/serializers/federation_entity_serializer_spec.rb +2 -0
- spec/serializers/notification_serializer_spec.rb spec/serializers/notification_serializer_spec.rb +2 -0
- spec/serializers/serializer_post_processing_spec.rb spec/serializers/serializer_post_processing_spec.rb +2 -0
- spec/services/comment_service_spec.rb spec/services/comment_service_spec.rb +2 -0
- spec/services/like_service_spec.rb spec/services/like_service_spec.rb +2 -0
- spec/services/notification_service_spec.rb spec/services/notification_service_spec.rb +2 -0
- spec/services/post_service_spec.rb spec/services/post_service_spec.rb +6 -4
- spec/services/reshare_service.rb spec/services/reshare_service.rb +2 -0
- spec/services/status_message_creation_service_spec.rb spec/services/status_message_creation_service_spec.rb +2 -0
- spec/shared_behaviors/account_deletion.rb spec/shared_behaviors/account_deletion.rb +2 -0
- spec/shared_behaviors/account_migration.rb spec/shared_behaviors/account_migration.rb +2 -0
- spec/shared_behaviors/dispatcher.rb spec/shared_behaviors/dispatcher.rb +2 -0
- spec/shared_behaviors/federation_entity_serializer.rb spec/shared_behaviors/federation_entity_serializer.rb +2 -0
- spec/shared_behaviors/mentions_container.rb spec/shared_behaviors/mentions_container.rb +2 -0
- spec/shared_behaviors/receiving.rb spec/shared_behaviors/receiving.rb +3 -1
- spec/shared_behaviors/references.rb spec/shared_behaviors/references.rb +70 -0
- spec/shared_behaviors/relayable.rb spec/shared_behaviors/relayable.rb +2 -0
- spec/shared_behaviors/shareable.rb spec/shared_behaviors/shareable.rb +2 -0
- spec/shared_behaviors/signature.rb spec/shared_behaviors/signature.rb +2 -0
- spec/shared_behaviors/stream.rb spec/shared_behaviors/stream.rb +2 -0
- spec/shared_behaviors/taggable.rb spec/shared_behaviors/taggable.rb +2 -0
- spec/spec-doc.rb spec/spec-doc.rb +0 -25
- spec/spec/data_generator_spec.rb spec/spec/data_generator_spec.rb +2 -0
- spec/spec/misc_spec.rb spec/spec/misc_spec.rb +2 -0
- spec/spec_helper.rb spec/spec_helper.rb +5 -4
- spec/support/account_matchers.rb spec/support/account_matchers.rb +2 -0
- spec/support/data_generator.rb spec/support/data_generator.rb +2 -0
- spec/support/fake_http_request.rb spec/support/fake_http_request.rb +2 -0
- spec/support/fixture_builder.rb spec/support/fixture_builder.rb +36 -32
- spec/support/fixture_generation.rb spec/support/fixture_generation.rb +2 -0
- spec/support/gon.rb spec/support/gon.rb +2 -0
- spec/support/inlined_jobs.rb spec/support/inlined_jobs.rb +2 -0
- spec/support/serializer_matchers.rb spec/support/serializer_matchers.rb +9 -1
- spec/support/user_methods.rb spec/support/user_methods.rb +2 -0
- spec/workers/deferred_dispatch_spec.rb spec/workers/deferred_dispatch_spec.rb +2 -0
- spec/workers/delete_account_spec.rb spec/workers/delete_account_spec.rb +2 -0
- spec/workers/delete_post_from_service_spec.rb spec/workers/delete_post_from_service_spec.rb +2 -0
- spec/workers/export_photos_spec.rb spec/workers/export_photos_spec.rb +2 -0
- spec/workers/export_user_spec.rb spec/workers/export_user_spec.rb +66 -0
- spec/workers/fetch_profile_photo_spec.rb spec/workers/fetch_profile_photo_spec.rb +2 -0
- spec/workers/fetch_webfinger_spec.rb spec/workers/fetch_webfinger_spec.rb +2 -0
- spec/workers/gather_o_embed_data_spec.rb spec/workers/gather_o_embed_data_spec.rb +2 -0
- spec/workers/gather_open_graph_data_spec.rb spec/workers/gather_open_graph_data_spec.rb +2 -0
- spec/workers/mail/csrf_token_fail_spec.rb spec/workers/mail/csrf_token_fail_spec.rb +2 -0
- spec/workers/mail/invite_email_spec.rb spec/workers/mail/invite_email_spec.rb +2 -0
- spec/workers/mail/liked_spec.rb spec/workers/mail/liked_spec.rb +2 -0
- spec/workers/mail/mentioned_spec.rb spec/workers/mail/mentioned_spec.rb +2 -0
- spec/workers/mail/private_message_spec.rb spec/workers/mail/private_message_spec.rb +2 -0
- spec/workers/mail/reshared_spec.rb spec/workers/mail/reshared_spec.rb +2 -0
- spec/workers/post_to_service_spec.rb spec/workers/post_to_service_spec.rb +2 -0
- spec/workers/process_photo_spec.rb spec/workers/process_photo_spec.rb +2 -0
- spec/workers/publish_to_hub_spec.rb spec/workers/publish_to_hub_spec.rb +2 -0
- spec/workers/queue_users_for_removal_spec.rb spec/workers/queue_users_for_removal_spec.rb +2 -0
- spec/workers/receive_private_spec.rb spec/workers/receive_private_spec.rb +2 -0
- spec/workers/receive_public_spec.rb spec/workers/receive_public_spec.rb +2 -0
- spec/workers/recheck_offline_pods_spec.rb spec/workers/recheck_offline_pods_spec.rb +2 -0
- spec/workers/recurring_pod_check_spec.rb spec/workers/recurring_pod_check_spec.rb +2 -0
- spec/workers/remove_old_user_spec.rb spec/workers/remove_old_user_spec.rb +2 -0
- spec/workers/reset_password_spec.rb spec/workers/reset_password_spec.rb +2 -0
- spec/workers/send_base_spec.rb spec/workers/send_base_spec.rb +2 -0
- spec/workers/send_private_spec.rb spec/workers/send_private_spec.rb +2 -0
- spec/workers/send_public_spec.rb spec/workers/send_public_spec.rb +2 -0
- No files found.
# frozen_string_literal: true | ||
source "https://rubygems.org" | ||
gem "rails", "5.1.3" | ||
gem "rails", "5.1.4" | ||
# Legacy Rails features, remove me! | ||
# responders (class level) | ||
... | ... | @@ -13,8 +15,8 @@ gem "unicorn-worker-killer", "0.4.4" |
# Federation | ||
gem "diaspora_federation-json_schema", "0.2.1" | ||
gem "diaspora_federation-rails", "0.2.1" | ||
gem "diaspora_federation-json_schema", "0.2.2" | ||
gem "diaspora_federation-rails", "0.2.2" | ||
# API and JSON | ||
... | ... | @@ -53,12 +55,12 @@ gem "rack-cors", "1.0.1", require: "rack/cors" |
# CSS | ||
gem "autoprefixer-rails", "7.1.2.4" | ||
gem "autoprefixer-rails", "7.1.4.1" | ||
gem "bootstrap-sass", "3.3.7" | ||
gem "bootstrap-switch-rails", "3.3.3" | ||
gem "compass-rails", "3.0.2" | ||
gem "sass-rails", "5.0.6" | ||
gem "sprockets-rails", "3.2.0" | ||
gem "sprockets-rails", "3.2.1" | ||
# Database | ||
... | ... | @@ -70,12 +72,12 @@ group :postgresql, optional: true do |
end | ||
gem "activerecord-import", "0.19.1" | ||
gem "activerecord-import", "0.20.1" | ||
# File uploading | ||
gem "carrierwave", "1.1.0" | ||
gem "fog-aws", "1.4.0" | ||
gem "fog-aws", "1.4.1" | ||
gem "mini_magick", "4.8.0" | ||
# GUID generation | ||
... | ... | @@ -89,7 +91,7 @@ gem "entypo-rails", "3.0.0" |
gem "handlebars_assets", "0.23.2" | ||
gem "jquery-rails", "4.3.1" | ||
gem "js-routes", "1.3.3" | ||
gem "js-routes", "1.4.1" | ||
gem "js_image_paths", "0.1.1" | ||
source "https://rails-assets.org" do | ||
... | ... | @@ -97,7 +99,7 @@ source "https://rails-assets.org" do |
gem "rails-assets-jquery.ui", "1.11.4" | ||
gem "rails-assets-highlightjs", "9.12.0" | ||
gem "rails-assets-markdown-it", "8.3.2" | ||
gem "rails-assets-markdown-it", "8.4.0" | ||
gem "rails-assets-markdown-it-hashtag", "0.4.0" | ||
gem "rails-assets-markdown-it-diaspora-mention", "1.2.0" | ||
gem "rails-assets-markdown-it-sanitizer", "0.4.3" | ||
... | ... | @@ -113,7 +115,7 @@ source "https://rails-assets.org" do |
# jQuery plugins | ||
gem "rails-assets-autosize", "4.0.0" | ||
gem "rails-assets-blueimp-gallery", "2.25.2" | ||
gem "rails-assets-blueimp-gallery", "2.27.0" | ||
gem "rails-assets-jquery.are-you-sure", "1.9.0" | ||
gem "rails-assets-jquery-placeholder", "2.3.1" | ||
gem "rails-assets-jquery-textchange", "0.2.3" | ||
... | ... | @@ -131,7 +133,7 @@ gem "rails-i18n", "5.0.4" |
gem "markerb", "1.1.0" | ||
# Map | ||
gem "leaflet-rails", "1.1.0" | ||
gem "leaflet-rails", "1.2.0" | ||
# Parsing | ||
... | ... | @@ -147,7 +149,7 @@ gem "string-direction", "1.2.0" |
# Security Headers | ||
gem "secure_headers", "3.6.7" | ||
gem "secure_headers", "3.7.1" | ||
# Services | ||
... | ... | @@ -175,17 +177,17 @@ gem "acts-as-taggable-on", "5.0.0" |
# URIs and HTTP | ||
gem "addressable", "2.5.1", require: "addressable/uri" | ||
gem "addressable", "2.5.2", require: "addressable/uri" | ||
gem "faraday", "0.11.0" # also update User-Agent in OpenID specs | ||
gem "faraday_middleware", "0.11.0.1" | ||
gem "faraday_middleware", "0.12.2" | ||
gem "faraday-cookie_jar", "0.0.6" | ||
gem "typhoeus", "1.1.2" | ||
gem "typhoeus", "1.3.0" | ||
# Views | ||
gem "gon", "6.1.0" | ||
gem "hamlit", "2.8.4" | ||
gem "mobile_fu", "1.4.0", require: "mobile-fu" | ||
gem "mobile-fu", "1.4.0" | ||
gem "rails-timeago", "2.16.0" | ||
gem "will_paginate", "3.1.6" | ||
... | ... | @@ -244,12 +246,12 @@ group :development do |
# Linters | ||
gem "haml_lint", "0.26.0", require: false | ||
gem "pronto", "0.9.4", require: false | ||
gem "pronto", "0.9.5", require: false | ||
gem "pronto-eslint", "0.9.1", require: false | ||
gem "pronto-haml", "0.9.0", require: false | ||
gem "pronto-rubocop", "0.9.0", require: false | ||
gem "pronto-scss", "0.9.1", require: false | ||
gem "rubocop", "0.49.1", require: false | ||
gem "rubocop", "0.50.0", require: false | ||
# Preloading environment | ||
... | ... | @@ -290,7 +292,7 @@ group :test do |
gem "timecop", "0.9.1" | ||
gem "webmock", "3.0.1", require: false | ||
gem "diaspora_federation-test", "0.2.1" | ||
gem "diaspora_federation-test", "0.2.2" | ||
# Coverage | ||
gem "coveralls", "0.8.21", require: false | ||
... | ... | @@ -304,7 +306,7 @@ group :development, :test do |
gem "cucumber-rails", "1.5.0", require: false | ||
# Jasmine (client side application tests (JS)) | ||
gem "jasmine", "2.7.0" | ||
gem "jasmine", "2.8.0" | ||
gem "jasmine-jquery-rails", "2.0.3" | ||
gem "rails-assets-jasmine-ajax", "3.3.1", source: "https://rails-assets.org" | ||
gem "sinon-rails", "1.15.0" | ||
... | ... |
This diff is collapsed.