[DRE-commits] [diaspora] 210/257: Merge tag 'upstream/0.5.0.0_git.20150329.6c3a3f1b.no.bin'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sun Apr 12 14:17:28 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 4e23daf50dba496f1fb588fc16e645006bf1a732
Merge: bf639a4 f99962d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Mon Mar 30 11:54:15 2015 +0530
Merge tag 'upstream/0.5.0.0_git.20150329.6c3a3f1b.no.bin'
Upstream version 0.5.0.0~git.20150329.6c3a3f1b.no.bin
# gpg: Signature made Monday 30 March 2015 11:54:10 AM IST using RSA key ID 4512C22A
# gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
# gpg: aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
# gpg: aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
.editorconfig | 17 +
.gitignore | 8 +
.hound.yml | 9 +
.jshintignore | 1 +
.jshintrc | 1 +
.pairs | 15 -
.powenv | 1 -
.powrc | 4 -
.rspec | 1 -
.rubocop.yml | 130 ++
.travis.yml | 20 +-
Changelog.md | 111 +-
Gemfile | 258 +--
Gemfile.lock | 609 ++++---
Guardfile | 65 +-
Procfile | 6 +-
README.md | 2 +-
app/assets/images/branding-s78f0383719.png | Bin 247843 -> 0 bytes
app/assets/images/close_label.png | Bin 212 -> 0 bytes
app/assets/images/icons-s71323e8d98.png | Bin 50590 -> 0 bytes
app/assets/images/icons/create_participation.png | Bin 0 -> 1330 bytes
app/assets/images/icons/destroy_participation.png | Bin 0 -> 1405 bytes
{public => app/assets/images}/peeping-tom.png | Bin
.../images/social_media_logos-s87df44da1f.png | Bin 39864 -> 0 bytes
app/assets/javascripts/app/app.js | 29 +-
.../app/collections/aspect_memberships.js | 6 +
app/assets/javascripts/app/collections/aspects.js | 3 +-
app/assets/javascripts/app/collections/comments.js | 5 +-
app/assets/javascripts/app/collections/contacts.js | 21 +
app/assets/javascripts/app/collections/likes.js | 3 +-
app/assets/javascripts/app/collections/photos.js | 3 +-
.../javascripts/app/helpers/date_formatter.js | 3 +-
.../javascripts/app/helpers/handlebars-helpers.js | 37 +-
.../javascripts/app/helpers/handlebars-partials.js | 3 +-
app/assets/javascripts/app/helpers/o_embed.js | 9 +-
.../javascripts/app/helpers/text_formatter.js | 171 +-
app/assets/javascripts/app/helpers/timeago.js | 9 +
app/assets/javascripts/app/helpers/truncate.js | 4 +
app/assets/javascripts/app/models/contact.js | 13 +
app/assets/javascripts/app/models/person.js | 8 +-
app/assets/javascripts/app/models/post.js | 35 +-
.../javascripts/app/models/post/interactions.js | 81 +-
app/assets/javascripts/app/models/profile.js | 14 +-
app/assets/javascripts/app/models/reshare.js | 6 +-
.../javascripts/app/models/status_message.js | 2 +-
app/assets/javascripts/app/models/stream.js | 25 +-
.../javascripts/app/models/stream_aspects.js | 11 +-
app/assets/javascripts/app/models/user.js | 6 +-
app/assets/javascripts/app/pages/contacts.js | 75 +
app/assets/javascripts/app/pages/profile.js | 9 +-
.../javascripts/app/pages/single-post-viewer.js | 7 +-
app/assets/javascripts/app/router.js | 28 +-
app/assets/javascripts/app/views.js | 56 +-
.../app/views/aspect_membership_blueprint_view.js | 172 --
.../app/views/aspect_membership_view.js | 4 +-
app/assets/javascripts/app/views/aspect_view.js | 9 +-
.../javascripts/app/views/aspects_dropdown_view.js | 4 +-
.../javascripts/app/views/aspects_list_view.js | 24 +-
.../javascripts/app/views/bookmarklet_view.js | 6 +-
.../javascripts/app/views/comment_stream_view.js | 18 +-
app/assets/javascripts/app/views/comment_view.js | 15 +-
.../javascripts/app/views/contact_stream_view.js | 77 +
app/assets/javascripts/app/views/contact_view.js | 71 +
app/assets/javascripts/app/views/contacts_view.js | 134 --
app/assets/javascripts/app/views/content_view.js | 37 +-
.../javascripts/app/views/conversations_view.js | 53 +-
.../javascripts/app/views/faq_question_view.js | 4 +-
app/assets/javascripts/app/views/feedback_view.js | 53 +-
app/assets/javascripts/app/views/header_view.js | 34 +-
.../javascripts/app/views/help_section_view.js | 4 +-
app/assets/javascripts/app/views/help_view.js | 82 +-
app/assets/javascripts/app/views/hovercard_view.js | 35 +-
.../javascripts/app/views/infinite_stream_view.js | 11 +-
.../javascripts/app/views/likes_info_view.js | 5 +-
app/assets/javascripts/app/views/location_view.js | 9 +-
.../app/views/notification_dropdown_view.js | 118 ++
.../javascripts/app/views/notifications_view.js | 111 +-
app/assets/javascripts/app/views/photo_view.js | 3 +-
app/assets/javascripts/app/views/photo_viewer.js | 3 +-
app/assets/javascripts/app/views/photos_view.js | 7 +-
app/assets/javascripts/app/views/poll_view.js | 17 +-
app/assets/javascripts/app/views/post_view.js | 7 +-
.../javascripts/app/views/profile_header_view.js | 9 +-
.../publisher/aspect_selector_blueprint_view.js | 94 -
.../app/views/publisher/aspect_selector_view.js | 2 +-
.../app/views/publisher/getting_started_view.js | 2 +-
.../app/views/publisher/poll_creator_view.js | 5 +-
.../app/views/publisher/uploader_view.js | 11 +-
app/assets/javascripts/app/views/publisher_view.js | 80 +-
app/assets/javascripts/app/views/search_view.js | 72 +
.../single-post-viewer/single_post_actions.js | 8 +-
.../single_post_comment_stream.js | 23 +-
.../single-post-viewer/single_post_content_view.js | 9 +-
.../single-post-viewer/single_post_interactions.js | 7 +-
.../single-post-viewer/single_post_moderation.js | 68 +
.../javascripts/app/views/stream/shortcuts.js | 46 +-
.../javascripts/app/views/stream_faces_view.js | 7 +-
.../javascripts/app/views/stream_post_views.js | 45 +-
app/assets/javascripts/app/views/stream_view.js | 24 +-
.../app/views/tag_following_action_view.js | 5 +-
.../app/views/tag_following_list_view.js | 6 +-
.../javascripts/app/views/tag_following_view.js | 3 +-
app/assets/javascripts/app/views/tags_view.js | 9 +
app/assets/javascripts/aspects-dropdown.js | 17 +-
app/assets/javascripts/contact-list.js | 3 +
app/assets/javascripts/diaspora.js | 19 +-
app/assets/javascripts/helpers/alert.js | 34 -
app/assets/javascripts/helpers/i18n.js | 9 +-
app/assets/javascripts/home.js | 6 -
app/assets/javascripts/inbox.js | 59 +-
app/assets/javascripts/jasmine-load-all.js | 7 +-
app/assets/javascripts/jsxc.js | 26 +-
app/assets/javascripts/mailchimp.js | 3 -
app/assets/javascripts/main.js | 11 +-
app/assets/javascripts/{ => mobile}/mobile.js | 123 +-
.../javascripts/mobile/mobile_file_uploader.js | 84 +
app/assets/javascripts/mobile/profile_aspects.js | 84 +
app/assets/javascripts/osmlocator.js | 16 +-
app/assets/javascripts/pages/contacts-index.js | 14 -
app/assets/javascripts/pages/invitations-edit.js | 12 -
app/assets/javascripts/pages/invitations-new.js | 15 -
.../javascripts/pages/notifications-index.js | 12 -
.../javascripts/pages/users-getting-started.js | 10 +-
app/assets/javascripts/profile.js | 6 -
app/assets/javascripts/view.js | 50 +-
app/assets/javascripts/widgets/back-to-top.js | 3 +-
app/assets/javascripts/widgets/header.js | 25 -
app/assets/javascripts/widgets/lightbox.js | 12 +-
.../javascripts/widgets/notifications-badge.js | 116 --
app/assets/javascripts/widgets/notifications.js | 148 --
app/assets/javascripts/widgets/search.js | 84 -
app/assets/javascripts/widgets/timeago.js | 7 +-
app/assets/stylesheets/_flash_messages.scss | 4 +-
.../stylesheets/{_mixins.css.scss => _mixins.scss} | 62 +-
.../stylesheets/{admin.css.scss => admin.scss} | 0
app/assets/stylesheets/application.css.scss | 1821 --------------------
.../{new-templates.css.scss => application.scss} | 31 +-
.../stylesheets/{aspects.css.scss => aspects.scss} | 11 +-
.../{autocomplete.css.scss => autocomplete.scss} | 5 -
app/assets/stylesheets/blueprint.css | 3 -
.../{bookmarklet.css.scss => bookmarklet.scss} | 0
...p-complete.css.scss => bootstrap-complete.scss} | 0
app/assets/stylesheets/bootstrap-fix.css.scss | 11 -
app/assets/stylesheets/bootstrap-fix.scss | 24 +
app/assets/stylesheets/bootstrap-headerfix.scss | 2 +-
.../stylesheets/{chat.css.scss => chat.scss} | 4 +-
.../stylesheets/{colors.css.scss => colors.scss} | 3 +
.../{comments.css.scss => comments.scss} | 16 +-
.../{contacts.css.scss => contacts.scss} | 5 +-
.../{conversations.css.scss => conversations.scss} | 62 +-
app/assets/stylesheets/default.css.scss | 15 -
.../stylesheets/{entypo.css.scss => entypo.scss} | 0
app/assets/stylesheets/error_pages.css.scss | 25 -
app/assets/stylesheets/error_pages.scss | 107 ++
.../stylesheets/{facebox.css.scss => facebox.scss} | 0
.../stylesheets/{footer.css.scss => footer.scss} | 2 +-
app/assets/stylesheets/getting-started.css.scss | 41 -
app/assets/stylesheets/getting-started.scss | 81 +
.../stylesheets/{header.css.scss => header.scss} | 74 +-
.../stylesheets/{help.css.scss => help.scss} | 34 +-
app/assets/stylesheets/home.scss | 84 +
.../{hovercard.css.scss => hovercard.scss} | 7 +-
.../{invitations.css.scss => invitations.scss} | 6 +
app/assets/stylesheets/leftnavbar.css.scss | 48 -
app/assets/stylesheets/leftnavbar.scss | 127 ++
.../{lightbox.css.scss => lightbox.scss} | 16 +-
app/assets/stylesheets/markdown-content.scss | 11 +
.../{media-box.css.scss => media-box.scss} | 0
.../{mentions.css.scss => mentions.scss} | 9 +-
.../mobile/{header.css.scss => header.scss} | 22 +-
.../mobile/{mobile.css.scss => mobile.scss} | 138 +-
app/assets/stylesheets/new_styles/_animations.scss | 75 +-
app/assets/stylesheets/new_styles/_base.scss | 123 +-
.../{_buttons.css.scss => _buttons.scss} | 28 +-
app/assets/stylesheets/new_styles/_code.scss | 7 +
.../stylesheets/new_styles/_flash_messages.scss | 13 -
app/assets/stylesheets/new_styles/_forms.scss | 172 +-
.../stylesheets/new_styles/_interactions.scss | 62 +-
app/assets/stylesheets/new_styles/_landing.scss | 113 --
app/assets/stylesheets/new_styles/_login.scss | 75 +-
app/assets/stylesheets/new_styles/_new_mixins.scss | 86 -
app/assets/stylesheets/new_styles/_poll.scss | 8 +-
.../stylesheets/new_styles/_registration.scss | 69 +-
app/assets/stylesheets/new_styles/_settings.scss | 7 +-
app/assets/stylesheets/new_styles/_spinner.scss | 24 +-
app/assets/stylesheets/new_styles/_statistics.scss | 28 +
app/assets/stylesheets/new_styles/_variables.scss | 11 -
.../{notifications.css.scss => notifications.scss} | 29 +-
app/assets/stylesheets/oembed.scss | 12 +
.../{opengraph.css.scss => opengraph.scss} | 0
.../stylesheets/{people.css.scss => people.scss} | 0
app/assets/stylesheets/photo.css.scss | 19 -
app/assets/stylesheets/poll.css.scss | 32 -
app/assets/stylesheets/popover.css.scss | 28 -
app/assets/stylesheets/popup.css.scss | 106 --
app/assets/stylesheets/post-content.scss | 21 +
.../stylesheets/{profile.css.scss => profile.scss} | 14 +-
.../{publisher.css.scss => publisher.scss} | 56 +-
.../stylesheets/publisher_blueprint.css.scss | 410 -----
.../stylesheets/{report.css.scss => report.scss} | 0
app/assets/stylesheets/{rtl.css.scss => rtl.scss} | 4 -
app/assets/stylesheets/scaffolds.css.scss | 56 -
app/assets/stylesheets/sessions.css.scss | 162 --
app/assets/stylesheets/sidebar.css.scss | 194 ---
app/assets/stylesheets/sidebar.scss | 44 +
...le-post-view.css.scss => single-post-view.scss} | 89 +-
app/assets/stylesheets/sizes.scss | 2 +
.../stylesheets/{sprites.css.scss => sprites.scss} | 0
.../{stream-faces.css.scss => stream-faces.scss} | 2 +-
app/assets/stylesheets/stream.css.scss | 6 -
app/assets/stylesheets/stream.scss | 11 +
...stream_element.css.scss => stream_element.scss} | 106 +-
.../stylesheets/stream_element_blueprint.css.scss | 288 ----
app/assets/stylesheets/{tag.css.scss => tag.scss} | 12 +-
app/assets/stylesheets/ui.css.scss | 253 ---
app/assets/stylesheets/vendor/autoSuggest.css.erb | 24 +-
app/assets/stylesheets/vendor/blank.gif | Bin 43 -> 0 bytes
.../stylesheets/vendor/blueprint/AUTHORS.textile | 42 -
.../stylesheets/vendor/blueprint/LICENSE.txt | 22 -
app/assets/stylesheets/vendor/blueprint/ie.css | 35 -
.../blueprint/plugins/buttons/icons/cross.png | Bin 655 -> 0 bytes
.../vendor/blueprint/plugins/buttons/icons/key.png | Bin 455 -> 0 bytes
.../blueprint/plugins/buttons/icons/tick.png | Bin 537 -> 0 bytes
.../vendor/blueprint/plugins/buttons/readme.txt | 32 -
.../vendor/blueprint/plugins/buttons/screen.css | 97 --
.../vendor/blueprint/plugins/fancy-type/readme.txt | 14 -
.../vendor/blueprint/plugins/fancy-type/screen.css | 71 -
.../blueprint/plugins/link-icons/icons/doc.png | Bin 777 -> 0 bytes
.../blueprint/plugins/link-icons/icons/email.png | Bin 641 -> 0 bytes
.../plugins/link-icons/icons/external.png | Bin 46828 -> 0 bytes
.../blueprint/plugins/link-icons/icons/feed.png | Bin 691 -> 0 bytes
.../blueprint/plugins/link-icons/icons/im.png | Bin 741 -> 0 bytes
.../blueprint/plugins/link-icons/icons/pdf.png | Bin 591 -> 0 bytes
.../blueprint/plugins/link-icons/icons/visited.png | Bin 46925 -> 0 bytes
.../blueprint/plugins/link-icons/icons/xls.png | Bin 663 -> 0 bytes
.../vendor/blueprint/plugins/link-icons/readme.txt | 18 -
.../vendor/blueprint/plugins/link-icons/screen.css | 40 -
.../vendor/blueprint/plugins/rtl/readme.txt | 10 -
.../vendor/blueprint/plugins/rtl/screen.css | 110 --
app/assets/stylesheets/vendor/blueprint/print.css | 29 -
app/assets/stylesheets/vendor/blueprint/screen.css | 258 ---
.../stylesheets/vendor/blueprint/src/forms.css | 65 -
.../stylesheets/vendor/blueprint/src/grid.css | 280 ---
.../stylesheets/vendor/blueprint/src/grid.png | Bin 132 -> 0 bytes
app/assets/stylesheets/vendor/blueprint/src/ie.css | 76 -
.../stylesheets/vendor/blueprint/src/print.css | 85 -
.../stylesheets/vendor/blueprint/src/reset.css | 45 -
.../vendor/blueprint/src/typography.css | 106 --
app/assets/stylesheets/vendor/facebox.css | 6 -
app/assets/stylesheets/vendor/fileuploader.css | 73 +-
.../vendor/html5-boilerplate-mobile.css | 315 ----
.../vendor/images/icon-search-black.png | Bin 1245 -> 0 bytes
.../stylesheets/vendor/images/icons-18-black.png | Bin 2138 -> 0 bytes
.../stylesheets/vendor/images/icons-18-white.png | Bin 2207 -> 0 bytes
.../stylesheets/vendor/images/icons-36-black.png | Bin 4011 -> 0 bytes
.../stylesheets/vendor/images/icons-36-white.png | Bin 4343 -> 0 bytes
.../stylesheets/vendor/interim-bootstrap.css.scss | 13 -
.../stylesheets/vendor/jquery.mentionsInput.css | 4 -
.../stylesheets/vendor/jquery.mobile-1.0b2.min.css | 8 -
.../stylesheets/vendor/jquery.ui.autocomplete.css | 56 -
app/assets/stylesheets/vendor/tipsy.css | 12 -
app/assets/templates/aspect_tpl.jst.hbs | 8 +-
app/assets/templates/comment-stream_tpl.jst.hbs | 4 +-
app/assets/templates/comment_tpl.jst.hbs | 22 +-
app/assets/templates/contact_tpl.jst.hbs | 23 +
app/assets/templates/faq_chat_tpl.jst.hbs | 6 +
app/assets/templates/faq_getting_help_tpl.jst.hbs | 1 +
.../templates/faq_keyboard_shortcuts_tpl.jst.hbs | 4 +
app/assets/templates/faq_tags_tpl.jst.hbs | 30 +
app/assets/templates/header_tpl.jst.hbs | 6 +-
app/assets/templates/help_tpl.jst.hbs | 8 +-
app/assets/templates/likes-info_tpl.jst.hbs | 8 +-
app/assets/templates/photo_tpl.jst.hbs | 34 +-
app/assets/templates/poll_tpl.jst.hbs | 7 +
app/assets/templates/reshare_tpl.jst.hbs | 6 +-
.../single-post-actions_tpl.jst.hbs | 6 -
.../single-post-content_tpl.jst.hbs | 44 +-
.../single-post-interactions_tpl.jst.hbs | 8 +-
.../single-post-moderation_tpl.jst.hbs | 28 +
app/assets/templates/status-message_tpl.jst.hbs | 4 +-
app/assets/templates/stream-element_tpl.jst.hbs | 37 +-
app/assets/templates/stream-faces_tpl.jst.hbs | 4 +-
app/assets/templates/stream-frame_tpl.jst.hbs | 31 -
app/assets/templates/stream_tpl.jst.hbs | 75 -
.../templates/tag_following_action_tpl.jst.hbs | 2 +-
app/assets/templates/tag_following_tpl.jst.hbs | 2 +-
app/controllers/admin/users_controller.rb | 17 +-
app/controllers/admins_controller.rb | 2 -
app/controllers/application_controller.rb | 13 +-
app/controllers/aspect_memberships_controller.rb | 9 +-
app/controllers/contacts_controller.rb | 25 +-
.../conversation_visibilities_controller.rb | 7 +-
app/controllers/conversations_controller.rb | 33 +-
app/controllers/help_controller.rb | 5 +-
app/controllers/home_controller.rb | 11 +-
app/controllers/invitations_controller.rb | 2 +-
app/controllers/likes_controller.rb | 8 +-
app/controllers/notifications_controller.rb | 9 +-
app/controllers/participations_controller.rb | 23 +
app/controllers/passwords_controller.rb | 4 -
app/controllers/people_controller.rb | 42 +-
app/controllers/photos_controller.rb | 7 +-
app/controllers/posts_controller.rb | 15 +-
app/controllers/profiles_controller.rb | 8 +-
app/controllers/registrations_controller.rb | 1 -
app/controllers/report_controller.rb | 2 -
app/controllers/services_controller.rb | 21 +-
app/controllers/sessions_controller.rb | 4 -
app/controllers/statistics_controller.rb | 8 +-
app/controllers/status_messages_controller.rb | 5 +-
app/controllers/streams_controller.rb | 3 +
app/controllers/tags_controller.rb | 5 +-
app/controllers/terms_controller.rb | 3 +-
app/controllers/users_controller.rb | 67 +-
app/helpers/application_helper.rb | 10 +-
app/helpers/aspect_global_helper.rb | 27 +-
app/helpers/aspects_helper.rb | 58 -
app/helpers/contacts_helper.rb | 24 +-
app/helpers/conversations_helper.rb | 9 +
app/helpers/error_messages_helper.rb | 3 +-
app/helpers/layout_helper.rb | 12 +-
app/helpers/notifications_helper.rb | 25 +-
app/helpers/notifier_helper.rb | 17 +-
app/helpers/open_graph_helper.rb | 73 +-
app/helpers/profile_helper.rb | 15 +
app/helpers/statistics_helper.rb | 37 +
app/helpers/tags_helper.rb | 13 +-
app/mailers/export_mailer.rb | 39 +
app/mailers/maintenance.rb | 2 +-
app/mailers/report_mailer.rb | 3 +-
app/models/comment.rb | 2 +-
app/models/conversation.rb | 20 +-
app/models/conversation_visibility.rb | 10 +
app/models/open_graph_cache.rb | 15 +-
app/models/person.rb | 4 +-
app/models/photo.rb | 5 +-
app/models/poll.rb | 2 +-
app/models/profile.rb | 2 +
app/models/reshare.rb | 6 +-
app/models/role.rb | 13 +-
app/models/user.rb | 78 +-
app/models/user/querying.rb | 3 +
app/presenters/aspect_membership_presenter.rb | 11 +
app/presenters/contact_presenter.rb | 17 +
app/presenters/post_presenter.rb | 18 +-
app/presenters/statistics_presenter.rb | 134 +-
app/serializers/export/aspect_serializer.rb | 7 +
app/serializers/export/comment_serializer.rb | 10 +
app/serializers/export/contact_serializer.rb | 12 +
app/serializers/export/post_serializer.rb | 15 +
app/serializers/export/profile_serializer.rb | 14 +
app/serializers/export/user_serializer.rb | 23 +
app/uploaders/exported_photos.rb | 21 +
app/uploaders/exported_user.rb | 19 +
app/uploaders/processed_image.rb | 12 -
app/uploaders/unprocessed_image.rb | 12 +-
app/views/admins/_user_entry.haml | 6 +
app/views/admins/correlations.haml | 22 +-
app/views/admins/stats.html.haml | 112 +-
app/views/admins/user_search.html.haml | 98 +-
app/views/admins/weekly_user_stats.haml | 26 +-
app/views/aspect_memberships/_add_to_aspect.haml | 7 -
....html.haml => _aspect_membership_dropdown.haml} | 0
.../_aspect_membership_dropdown.mobile.haml | 13 +
..._aspect_membership_dropdown_blueprint.html.haml | 19 -
.../aspect_memberships/_remove_from_aspect.haml | 7 -
app/views/aspect_memberships/add_to_aspect.js.haml | 7 -
app/views/aspect_memberships/create.js.erb | 20 -
app/views/aspect_memberships/destroy.js.erb | 10 -
.../aspect_memberships/remove_from_aspect.js.haml | 7 -
app/views/aspects/_no_contacts_message.haml | 3 +-
app/views/aspects/new.haml | 44 +-
app/views/comments/index.mobile.haml | 15 +-
app/views/contacts/_contact.html.haml | 12 -
app/views/contacts/_header.html.haml | 15 +-
app/views/contacts/_sidebar.html.haml | 11 +-
app/views/contacts/index.html.haml | 11 +-
app/views/conversations/_conversation.haml | 2 +-
app/views/conversations/_show.haml | 21 +-
app/views/conversations/index.haml | 4 +-
app/views/conversations/index.mobile.haml | 2 +-
app/views/conversations/new.mobile.haml | 1 -
app/views/conversations/show.js.erb | 19 +-
app/views/devise/passwords/edit.haml | 31 +
app/views/{ => devise}/passwords/edit.mobile.haml | 0
app/views/devise/passwords/new.haml | 24 +
app/views/{ => devise}/passwords/new.mobile.haml | 0
app/views/errors/error_404.haml | 10 +
app/views/errors/error_422.haml | 8 +
app/views/errors/error_500.haml | 10 +
app/views/home/default.haml | 64 +
app/views/invitations/new.mobile.haml | 28 -
app/views/invitations/new_blueprint.html.haml | 34 -
app/views/layouts/_header.html.haml | 2 +-
app/views/layouts/_open_graph.haml | 5 +
app/views/layouts/application.html.haml | 21 +-
app/views/layouts/application.mobile.haml | 25 +-
.../centered_with_header_with_footer.html.haml | 9 -
app/views/layouts/error_page.haml | 14 +
...{_notification.html.haml => _notification.haml} | 0
app/views/notifications/_notification.mobile.haml | 7 +
app/views/notifications/_notify_popup_item.haml | 7 -
app/views/notifications/index.html.haml | 30 +-
app/views/notifications/index.mobile.haml | 4 +-
app/views/notifier/mentioned.markerb | 2 +-
app/views/notifier/private_message.markerb | 2 +-
app/views/passwords/edit.haml | 27 -
app/views/passwords/new.haml | 22 -
.../{_add_contact.html.haml => _add_contact.haml} | 4 +-
app/views/people/_aspect_membership_dropdown.haml | 2 +-
app/views/people/show.mobile.haml | 2 +
app/views/photos/_new_profile_photo.haml | 2 +-
app/views/profiles/_edit.haml | 2 +-
app/views/profiles/_edit_public.haml | 6 -
app/views/profiles/edit.haml | 4 +-
app/views/publisher/_publisher.html.haml | 84 +-
app/views/publisher/_publisher.mobile.haml | 8 +-
app/views/publisher/_publisher_blueprint.html.haml | 104 --
app/views/publisher/_publisher_bootstrap.html.haml | 80 -
app/views/registrations/_form.haml | 33 +
app/views/registrations/edit.html.haml | 28 -
app/views/registrations/new.haml | 12 +
app/views/registrations/new.html.erb | 81 -
app/views/registrations/new.mobile.haml | 8 +-
app/views/report/index.html.haml | 56 +-
app/views/services/index.html.haml | 2 -
app/views/sessions/new.html.haml | 68 +-
app/views/shared/_contact_list.html.haml | 19 -
app/views/shared/_donatepod.html.haml | 25 +-
app/views/shared/_invitations.haml | 2 +-
app/views/shared/_invitations_blueprint.haml | 3 -
app/views/shared/_links.haml | 2 +-
app/views/shared/_post_stats.mobile.haml | 21 +
app/views/shared/_right_sections.html.haml | 23 +-
app/views/shared/_stream_element.mobile.haml | 31 +-
app/views/simple_captcha/_simple_captcha.haml | 5 +-
app/views/statistics/_statistic.haml | 5 +
app/views/statistics/_statistics.haml | 23 +
app/views/statistics/statistics.html.haml | 1 +
app/views/statistics/statistics.mobile.haml | 1 +
app/views/status_messages/bookmarklet.html.haml | 6 -
app/views/status_messages/bookmarklet.mobile.haml | 2 +-
app/views/status_messages/new.html.haml | 4 +-
app/views/streams/main_stream.html.haml | 96 +-
app/views/tags/show.haml | 4 +-
app/views/users/edit.html.haml | 74 +-
app/views/users/edit.mobile.haml | 24 +-
app/views/users/export_email.markerb | 1 +
app/views/users/export_failure_email.markerb | 1 +
app/views/users/export_photos_email.markerb | 1 +
.../users/export_photos_failure_email.markerb | 1 +
app/views/users/getting_started.haml | 7 -
app/views/users/privacy_settings.html.haml | 24 +-
app/workers/export_photos.rb | 21 +
app/workers/export_user.rb | 21 +
app/workers/mail/also_commented.rb | 2 +-
app/workers/mail/comment_on_post.rb | 2 +-
app/workers/mail/confirm_email.rb | 2 +-
app/workers/mail/liked.rb | 2 +-
app/workers/mail/mentioned.rb | 2 +-
app/workers/mail/private_message.rb | 2 +-
app/workers/mail/report_worker.rb | 2 +-
app/workers/mail/reshared.rb | 2 +-
app/workers/mail/started_sharing.rb | 2 +-
app/workers/queue_users_for_removal.rb | 2 +-
browserlist | 2 +
config/.jshint.json | 68 +
config/.jshint_ignore | 4 +
config/application.rb | 29 +-
config/database.yml.example | 6 +-
config/defaults.yml | 8 +-
config/diaspora.yml.example | 26 +-
config/environments/production.rb | 6 +-
config/environments/test.rb | 2 +-
config/initializers/assets.rb | 2 +-
config/initializers/faraday.rb | 3 +-
config/initializers/load_libraries.rb | 1 -
config/initializers/oembed.rb | 2 -
config/initializers/open_graph_reader.rb | 6 +
config/initializers/sidekiq.rb | 24 +-
config/load_config.rb | 17 +-
config/locales/cldr/plurals.rb | 113 +-
config/locales/devise/devise.cs.yml | 4 +
config/locales/devise/devise.da.yml | 10 +-
config/locales/devise/devise.de_formal.yml | 4 +-
config/locales/devise/devise.el.yml | 5 +
config/locales/devise/devise.en_valspeak.yml | 2 +-
config/locales/devise/devise.hy.yml | 5 +
config/locales/devise/devise.it.yml | 4 +-
config/locales/devise/devise.ms.yml | 6 +
config/locales/devise/devise.nds.yml | 12 +-
config/locales/devise/devise.sk.yml | 2 +-
config/locales/devise/devise.sv.yml | 2 +-
config/locales/devise/devise.zh-TW.yml | 8 +-
config/locales/diaspora/ar.yml | 157 +-
config/locales/diaspora/art-nvi.yml | 6 -
config/locales/diaspora/ast.yml | 28 -
config/locales/diaspora/az.yml | 153 ++
config/locales/diaspora/be.yml | 24 -
config/locales/diaspora/bg.yml | 39 -
config/locales/diaspora/br.yml | 243 ++-
config/locales/diaspora/bs.yml | 47 +-
config/locales/diaspora/cs.yml | 330 +++-
config/locales/diaspora/cy.yml | 22 -
config/locales/diaspora/da.yml | 582 ++++---
config/locales/diaspora/de.yml | 238 ++-
config/locales/diaspora/de_formal.yml | 237 ++-
config/locales/diaspora/el.yml | 637 ++++---
config/locales/diaspora/en.yml | 738 ++++----
config/locales/diaspora/en_1337.yml | 37 -
config/locales/diaspora/en_pirate.yml | 37 -
config/locales/diaspora/en_shaw.yml | 36 -
config/locales/diaspora/en_valspeak.yml | 51 +-
config/locales/diaspora/eo.yml | 47 +-
config/locales/diaspora/es-AR.yml | 453 +++--
config/locales/diaspora/es-BO.yml | 21 -
config/locales/diaspora/es-CL.yml | 47 +-
config/locales/diaspora/es-CO.yml | 35 -
config/locales/diaspora/es-MX.yml | 52 +-
config/locales/diaspora/es.yml | 381 ++--
config/locales/diaspora/eu.yml | 47 +-
config/locales/diaspora/fa.yml | 22 -
config/locales/diaspora/fi.yml | 484 +++---
config/locales/diaspora/fil.yml | 10 -
config/locales/diaspora/fr.yml | 398 +++--
config/locales/diaspora/fy.yml | 11 -
config/locales/diaspora/ga.yml | 14 -
config/locales/diaspora/gd.yml | 300 ++++
config/locales/diaspora/gl.yml | 53 +-
config/locales/diaspora/he.yml | 53 +-
config/locales/diaspora/hi.yml | 2 -
config/locales/diaspora/hu.yml | 99 +-
config/locales/diaspora/hy.yml | 322 +++-
config/locales/diaspora/ia.yml | 155 +-
config/locales/diaspora/id.yml | 36 -
config/locales/diaspora/io.yml | 14 -
config/locales/diaspora/is.yml | 41 +-
config/locales/diaspora/it.yml | 191 +-
config/locales/diaspora/ja.yml | 51 +-
config/locales/diaspora/ka.yml | 35 -
config/locales/diaspora/kk.yml | 56 +-
config/locales/diaspora/kn.yml | 4 +-
config/locales/diaspora/ko.yml | 49 +-
config/locales/diaspora/lt.yml | 37 -
config/locales/diaspora/lv.yml | 28 -
config/locales/diaspora/mk.yml | 29 -
config/locales/diaspora/ml.yml | 47 +-
config/locales/diaspora/ms.yml | 79 +-
config/locales/diaspora/nb.yml | 49 -
config/locales/diaspora/nds.yml | 234 +--
config/locales/diaspora/ne.yml | 2 -
config/locales/diaspora/nl.yml | 259 ++-
config/locales/diaspora/nn.yml | 47 +-
config/locales/diaspora/pa.yml | 10 -
config/locales/diaspora/pl.yml | 176 +-
config/locales/diaspora/pt-BR.yml | 51 +-
config/locales/diaspora/pt-PT.yml | 138 +-
config/locales/diaspora/ro.yml | 56 +-
config/locales/diaspora/ru.yml | 101 +-
config/locales/diaspora/sc.yml | 110 ++
config/locales/diaspora/si.yml | 22 -
config/locales/diaspora/sk.yml | 126 +-
config/locales/diaspora/sl.yml | 56 +-
config/locales/diaspora/sr.yml | 331 +++-
config/locales/diaspora/sv.yml | 472 ++---
config/locales/diaspora/ta.yml | 11 +-
config/locales/diaspora/te.yml | 47 -
config/locales/diaspora/tr.yml | 98 +-
config/locales/diaspora/uk.yml | 127 +-
config/locales/diaspora/ur-PK.yml | 22 -
config/locales/diaspora/vi.yml | 66 +-
config/locales/diaspora/wo.yml | 7 -
config/locales/diaspora/zh-CN.yml | 49 +-
config/locales/diaspora/zh-TW.yml | 427 +++--
config/locales/javascript/javascript.ar.yml | 11 +-
config/locales/javascript/javascript.cs.yml | 74 +
config/locales/javascript/javascript.da.yml | 38 +-
config/locales/javascript/javascript.de.yml | 18 +-
config/locales/javascript/javascript.de_formal.yml | 35 +-
config/locales/javascript/javascript.el.yml | 26 +-
config/locales/javascript/javascript.en.yml | 72 +-
.../locales/javascript/javascript.en_valspeak.yml | 2 +-
config/locales/javascript/javascript.es-AR.yml | 33 +-
config/locales/javascript/javascript.es.yml | 16 +-
config/locales/javascript/javascript.fi.yml | 48 +-
config/locales/javascript/javascript.fr.yml | 35 +-
config/locales/javascript/javascript.gd.yml | 15 +
config/locales/javascript/javascript.gl.yml | 35 +-
config/locales/javascript/javascript.hu.yml | 18 +
config/locales/javascript/javascript.hy.yml | 99 +-
config/locales/javascript/javascript.ia.yml | 9 +
config/locales/javascript/javascript.is.yml | 2 +-
config/locales/javascript/javascript.kk.yml | 17 +
config/locales/javascript/javascript.ms.yml | 90 +
config/locales/javascript/javascript.nds.yml | 29 +-
config/locales/javascript/javascript.nl.yml | 22 +-
config/locales/javascript/javascript.pl.yml | 4 +
config/locales/javascript/javascript.ro.yml | 2 +
config/locales/javascript/javascript.ru.yml | 16 +
config/locales/javascript/javascript.sk.yml | 2 +-
config/locales/javascript/javascript.sv.yml | 18 +-
config/locales/javascript/javascript.uk.yml | 12 +-
config/locales/javascript/javascript.zh-TW.yml | 68 +
config/routes.rb | 14 +-
config/sidekiq.yml | 19 +
config/unicorn.rb | 4 +-
db/migrate/0000_create_schema.rb | 80 +-
db/migrate/20130429073928_add_tweet_id_to_post.rb | 2 +-
...3203350_remove_limit_from_root_guid_in_posts.rb | 4 +
db/migrate/20140801101230_create_chat_contacts.rb | 11 +-
db/migrate/20140801101352_create_chat_fragments.rb | 2 +-
...241_drop_open_graph_caches_with_invalid_urls.rb | 9 +
.../20141216213423_purge_orphan_conversations.rb | 13 +
db/migrate/20141227120907_add_export_to_user.rb | 7 +
db/migrate/20141230214830_user_pref_strip_exif.rb | 9 +
.../20150106050733_set_mysql_to_unicode_mb4.rb | 124 ++
...150209230946_disable_mail_for_closed_account.rb | 9 +
.../20150220001357_add_photos_export_to_user.rb | 13 +
db/schema.rb | 721 ++++----
features/desktop/accepts_invitation.feature | 10 +-
features/desktop/aspect_navigation.feature | 9 +-
features/desktop/blocks_user.feature | 4 +-
features/desktop/change_email.feature | 8 +
features/desktop/change_password.feature | 29 +-
features/desktop/connects_users.feature | 44 +-
features/desktop/conversations.feature | 4 +-
features/desktop/donations.feature | 4 +-
features/desktop/follows_tags.feature | 2 +-
features/desktop/invitations.feature | 3 +-
features/desktop/keyboard_navigation.feature | 11 +-
features/desktop/likes.feature | 35 +
features/desktop/logged_out_browsing.feature | 2 +-
features/desktop/manages_aspects.feature | 10 +-
features/desktop/mentions.feature | 2 -
.../desktop/mentions_from_profile_page.feature | 9 +-
features/desktop/not_safe_for_work.feature | 9 +-
features/desktop/notifications.feature | 4 +-
features/desktop/oembed.feature | 11 +-
features/desktop/photo_lightbox.feature | 10 +-
features/desktop/post_preview.feature | 3 +-
features/desktop/post_with_a_poll.feature | 27 +-
features/desktop/posts_from_main_page.feature | 21 +-
features/desktop/posts_from_profile_page.feature | 16 +-
features/desktop/posts_from_tag_page.feature | 22 +
features/desktop/profile_photos.feature | 3 +-
features/desktop/reshare.feature | 23 +-
features/desktop/search.feature | 33 +
features/desktop/show_more.feature | 6 +-
features/desktop/signs_up.feature | 28 +-
.../desktop/single_post_view_moderation.feature | 62 +
features/desktop/stops_following_users.feature | 17 +-
features/mobile/activity_stream.feature | 16 +-
features/mobile/conversations.feature | 4 +-
features/mobile/drawer.feature | 87 +
features/{desktop => mobile}/invitations.feature | 6 +-
features/mobile/multiphoto.feature | 2 +-
features/mobile/people_aspects.feature | 43 +
features/mobile/posts_from_main_page.feature | 4 +-
features/mobile/reactions.feature | 4 +-
features/mobile/reshare.feature | 10 +-
features/mobile/signs_up.feature | 4 +-
features/mobile/tags.feature | 4 +-
features/step_definitions/aspects_steps.rb | 27 +-
features/step_definitions/conversations_steps.rb | 4 +
features/step_definitions/custom_web_steps.rb | 12 +-
features/step_definitions/hovercard_steps.rb | 4 +-
features/step_definitions/mobile_steps.rb | 6 +
features/step_definitions/post_with_poll_steps.rb | 6 -
features/step_definitions/profile_steps.rb | 3 +-
features/step_definitions/search_steps.rb | 9 +
features/step_definitions/session_steps.rb | 7 +
.../step_definitions/single_post_view_steps.rb | 20 +
features/step_definitions/stream_steps.rb | 4 +-
features/step_definitions/tag_steps.rb | 7 +-
features/step_definitions/user_steps.rb | 4 +
features/support/database_cleaner_patches.rb | 24 -
features/support/env.rb | 157 +-
.../support/integration_sessions_controller.rb | 2 +-
features/support/matchers.rb | 36 +
features/support/paths.rb | 3 +-
features/support/publishing_cuke_helpers.rb | 26 +-
features/support/server.rb | 73 -
features/support/user_cuke_helpers.rb | 5 +
graphics/ball.svg | 217 +++
lib/account_deleter.rb | 2 +-
{app => lib}/assets/javascripts/clear-form.js | 6 +-
.../javascripts/posix-bracket-expressions.js | 448 +++++
lib/collect_user_photos.rb | 25 -
lib/configuration_methods.rb | 9 +-
lib/diaspora/exporter.rb | 86 +-
lib/diaspora/fetcher/single.rb | 2 +-
lib/diaspora/message_renderer.rb | 15 +-
lib/diaspora/taggable.rb | 15 +-
lib/email_inviter.rb | 2 +-
lib/rack/chrome_frame.rb | 2 +-
lib/stream/tag.rb | 6 +-
lib/tasks/assets.rake | 59 +
lib/tasks/linter.rake | 12 +
lib/tasks/tests.rake | 11 +-
public/404.css | 52 -
public/404.html | 14 -
public/422.html | 26 -
public/500.html | 47 -
public/Roboto-BoldCondensed.ttf | Bin 161308 -> 0 bytes
public/Roboto-Regular.ttf | Bin 158604 -> 0 bytes
public/apple-touch-icon.png | Bin 6618 -> 0 bytes
public/bgpattern.png | Bin 4064 -> 0 bytes
public/default.html | 158 --
public/icon_128.gif | Bin 6388 -> 0 bytes
script/get_config.rb | 2 +-
script/install/setup | 2 +-
script/server | 8 +-
spec/controllers/admin/users_controller_spec.rb | 17 +
.../aspect_memberships_controller_spec.rb | 4 +-
spec/controllers/aspects_controller_spec.rb | 2 +-
.../conversation_visibilities_controller_spec.rb | 15 +-
spec/controllers/conversations_controller_spec.rb | 14 +-
spec/controllers/jasmine_fixtures/aspects_spec.rb | 13 +-
spec/controllers/jasmine_fixtures/contacts_spec.rb | 11 +-
.../jasmine_fixtures/conversations_spec.rb | 34 +
spec/controllers/jasmine_fixtures/people_spec.rb | 9 +-
spec/controllers/jasmine_fixtures/photos_spec.rb | 20 +
.../jasmine_fixtures/status_messages_spec.rb | 15 +
spec/controllers/likes_controller_spec.rb | 21 +
spec/controllers/notifications_controller_spec.rb | 51 +-
spec/controllers/participations_controller_spec.rb | 79 +
spec/controllers/passwords_controller_spec.rb | 4 +-
spec/controllers/people_controller_spec.rb | 34 +
spec/controllers/photos_controller_spec.rb | 13 +-
spec/controllers/services_controller_spec.rb | 11 +-
spec/controllers/statistics_controller_spec.rb | 33 +-
.../controllers/status_messages_controller_spec.rb | 9 -
spec/controllers/users_controller_spec.rb | 67 +-
spec/fixtures/exif.jpg | Bin 0 -> 117835 bytes
spec/helpers/conversations_helper_spec.rb | 34 +
spec/helpers/notifications_helper_spec.rb | 19 +
spec/helpers/notifier_helper_spec.rb | 43 +-
spec/helpers/open_graph_helper_spec.rb | 15 +
spec/helpers/tags_helper_spec.rb | 2 +-
spec/javascripts/alert-spec.js | 30 -
spec/javascripts/app/app_spec.js | 2 +-
.../app/collections/comments_collection_spec.js | 13 +-
.../app/collections/contacts_collection_spec.js | 37 +
.../app/collections/likes_collections_spec.js | 13 +-
.../collections/tag_following_collection_spec.js | 22 +-
.../javascripts/app/helpers/date_formatter_spec.js | 19 +-
.../javascripts/app/helpers/text_formatter_spec.js | 334 ++--
spec/javascripts/app/helpers/timeago_spec.js | 20 +
spec/javascripts/app/helpers/truncate_spec.js | 9 +
spec/javascripts/app/models/contact_spec.js | 20 +
spec/javascripts/app/models/photo_spec.js | 2 +-
.../app/models/post/interacations_spec.js | 36 +-
spec/javascripts/app/models/post_spec.js | 54 +-
spec/javascripts/app/models/reshare_spec.js | 14 +-
spec/javascripts/app/models/status_message_spec.js | 14 +-
spec/javascripts/app/models/user_spec.js | 11 +-
spec/javascripts/app/pages/contacts_spec.js | 101 ++
spec/javascripts/app/router_spec.js | 6 +-
.../views/aspect_membership_blueprint_view_spec.js | 126 --
.../app/views/aspect_membership_view_spec.js | 14 +-
spec/javascripts/app/views/aspect_view_spec.js | 3 +-
.../app/views/aspects_dropdown_view_spec.js | 2 +-
.../app/views/aspects_list_view_spec.js | 5 +-
.../javascripts/app/views/bookmarklet_view_spec.js | 2 +-
.../app/views/comment_stream_view_spec.js | 28 +-
spec/javascripts/app/views/comment_view_spec.js | 84 +-
.../app/views/contact_stream_view_spec.js | 77 +
spec/javascripts/app/views/contact_view_spec.js | 136 ++
spec/javascripts/app/views/contacts_view_spec.js | 240 ---
spec/javascripts/app/views/content_view_spec.js | 10 +-
.../app/views/conversations_view_spec.js | 54 +
spec/javascripts/app/views/feedback_view_spec.js | 115 +-
spec/javascripts/app/views/header_view_spec.js | 44 +-
spec/javascripts/app/views/help_view_spec.js | 85 +-
spec/javascripts/app/views/likes_info_view_spec.js | 33 +-
spec/javascripts/app/views/location_view_spec.js | 2 +-
.../app/views/notification_dropdown_view_spec.js | 107 ++
.../app/views/notifications_view_spec.js | 46 +-
spec/javascripts/app/views/oembed_view_spec.js | 14 +-
spec/javascripts/app/views/open_graph_view_spec.js | 2 +-
spec/javascripts/app/views/photo_viewer_spec.js | 18 +-
spec/javascripts/app/views/photos_view_spec.js | 40 +-
spec/javascripts/app/views/poll_view_spec.js | 35 +-
.../app/views/profile_sidebar_view_spec.js | 1 -
.../app/views/publisher_poll_creator_view_spec.js | 16 +-
spec/javascripts/app/views/publisher_view_spec.js | 168 +-
spec/javascripts/app/views/search_view_spec.js | 14 +
.../javascripts/app/views/stream/shortcuts_spec.js | 113 +-
.../app/views/stream_faces_view_spec.js | 64 +-
spec/javascripts/app/views/stream_post_spec.js | 74 +-
spec/javascripts/app/views/stream_view_spec.js | 2 +-
.../app/views/tag_following_action_view_spec.js | 38 +-
spec/javascripts/app/views_spec.js | 78 +-
spec/javascripts/diaspora-spec.js | 8 +-
spec/javascripts/helpers/SpecHelper.js | 104 +-
spec/javascripts/helpers/factory.js | 50 +-
spec/javascripts/helpers/mock-ajax.js | 283 ---
spec/javascripts/osmlocator-spec.js | 18 +-
spec/javascripts/rails-spec.js | 4 +-
spec/javascripts/search-spec.js | 1 +
spec/javascripts/support/jasmine.yml | 3 +-
spec/javascripts/widgets/i18n-spec.js | 2 +-
spec/javascripts/widgets/lightbox-spec.js | 6 +-
spec/javascripts/widgets/notifications-spec.js | 122 --
spec/javascripts/widgets/search-spec.js | 12 -
spec/lib/account_deleter_spec.rb | 19 +-
spec/lib/diaspora/exporter_spec.rb | 145 +-
spec/lib/diaspora/message_renderer_spec.rb | 35 +-
spec/lib/evil_query_spec.rb | 4 +-
spec/lib/statistics_spec.rb | 9 +-
spec/lib/stream/tag_spec.rb | 7 -
spec/locale_spec.rb | 12 +-
spec/mailers/export_spec.rb | 67 +
spec/mailers/maintenance_spec.rb | 10 +-
spec/mailers/notifier_spec.rb | 34 +-
spec/mailers/report_spec.rb | 6 +-
spec/models/comment_spec.rb | 8 +-
spec/models/conversation_spec.rb | 40 +-
spec/models/conversation_visibilities_spec.rb | 28 +
spec/models/photo_spec.rb | 33 +
spec/models/profile_spec.rb | 17 +
spec/models/report_spec.rb | 4 +-
spec/models/reshare_spec.rb | 33 +-
spec/models/role_spec.rb | 55 +-
spec/models/status_message_spec.rb | 14 +
spec/models/user_spec.rb | 97 +-
.../presenters/aspect_membership_presenter_spec.rb | 15 +
spec/presenters/contact_presenter_spec.rb | 26 +
spec/presenters/statistics_presenter_spec.rb | 15 +-
spec/shared_behaviors/taggable.rb | 1 +
spec/spec_helper.rb | 185 +-
spec/support/deferred_garbage_collection.rb | 41 -
spec/support/fixture_builder.rb | 13 +-
spec/support/user_methods.rb | 7 +-
spec/workers/export_photos_spec.rb | 26 +
spec/workers/export_user_spec.rb | 26 +
spec/workers/gather_open_graph_data_spec.rb | 13 +-
spec/workers/mail/invite_email_spec.rb | 2 +-
spec/workers/mail/mentioned_spec.rb | 2 +-
spec/workers/mail/private_message_spec.rb | 2 +-
spec/workers/mail/reshared_spec.rb | 2 +-
vendor/assets/javascripts/mailchimp/jquery.form.js | 872 ----------
.../javascripts/mailchimp/jquery.validate.js | 1118 ------------
.../assets/javascripts/mailchimp/jquery126.min.js | 32 -
vendor/assets/javascripts/markdown.js | 1 -
.../javascripts/markdown/Markdown.Converter.js | 1332 --------------
.../javascripts/markdown/Markdown.Sanitizer.js | 108 --
vendor/assets/javascripts/parse_url.js | 51 -
848 files changed, 17239 insertions(+), 22140 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