[DRE-commits] [diaspora] 01/04: Merge tag 'upstream/0.5.3.0+debian_rc' into master-0.5.3.0
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Tue Sep 1 08:23:56 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master-0.5.3.0
in repository diaspora.
commit 445abbee6d51c2e055f6bbcb3973ac62a643c02a
Merge: e6723c2 a33cba1
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Tue Sep 1 11:00:55 2015 +0530
Merge tag 'upstream/0.5.3.0+debian_rc' into master-0.5.3.0
Upstream version 0.5.3.0+debian~rc
# gpg: Signature made Tuesday 01 September 2015 11:00:49 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>"
# gpg: aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
# gpg: aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"
.rubocop.yml | 6 +
CODE_OF_CONDUCT.md | 22 +
Changelog.md | 33 +
Gemfile | 48 +-
Gemfile.lock | 878 +++++++++++++++++++++
README.md | 6 +-
app/assets/javascripts/app/app.js | 1 +
app/assets/javascripts/app/models/post.js | 7 -
app/assets/javascripts/app/models/stream.js | 4 +
app/assets/javascripts/app/pages/contacts.js | 4 +-
app/assets/javascripts/app/router.js | 2 +-
.../javascripts/app/views/back_to_top_view.js | 26 +
.../app/views/conversations_form_view.js | 10 +
app/assets/javascripts/app/views/hovercard_view.js | 4 +-
.../javascripts/app/views/stream_faces_view.js | 1 +
.../javascripts/app/views/stream_post_views.js | 1 +
app/assets/javascripts/app/views/tags_view.js | 5 +-
app/assets/javascripts/diaspora.js | 6 -
app/assets/javascripts/jsxc.js | 4 +
app/assets/javascripts/mobile/mobile.js | 2 -
app/assets/javascripts/view.js | 40 -
app/assets/javascripts/widgets/back-to-top.js | 36 -
app/assets/javascripts/widgets/stream.js | 36 -
app/assets/stylesheets/application.scss | 3 +-
app/assets/stylesheets/conversations.scss | 5 +
app/assets/stylesheets/error_pages.scss | 4 +-
app/assets/stylesheets/mobile/mobile.scss | 33 +-
app/assets/stylesheets/single-post-view.scss | 2 +
.../_statistics.scss => statistics.scss} | 2 +-
app/assets/stylesheets/stream_element.scss | 3 +
app/assets/templates/hovercard_tpl.jst.hbs | 4 +-
app/assets/templates/status-message_tpl.jst.hbs | 28 +-
app/assets/templates/stream-element_tpl.jst.hbs | 42 +-
app/controllers/admins_controller.rb | 4 -
app/controllers/application_controller.rb | 6 +-
app/controllers/comments_controller.rb | 76 +-
app/controllers/home_controller.rb | 14 +-
app/controllers/node_info_controller.rb | 24 +
app/controllers/people_controller.rb | 4 +-
app/controllers/photos_controller.rb | 1 +
app/controllers/posts_controller.rb | 82 +-
app/controllers/statistics_controller.rb | 15 -
app/controllers/status_messages_controller.rb | 118 +--
app/helpers/people_helper.rb | 1 +
app/models/comment.rb | 2 +-
app/models/conversation.rb | 4 +-
app/models/message.rb | 2 +-
app/models/person.rb | 44 +-
app/models/poll_participation.rb | 4 +-
app/models/post.rb | 27 +-
app/models/user.rb | 2 +-
app/presenters/node_info_presenter.rb | 104 +++
app/presenters/post_interaction_presenter.rb | 4 +-
app/presenters/post_presenter.rb | 123 +--
app/presenters/statistics_presenter.rb | 100 +--
app/services/comment_service.rb | 43 +
app/services/post_service.rb | 65 ++
app/services/status_message_creation_service.rb | 89 +++
app/views/admins/_admin_bar.haml | 1 -
app/views/admins/correlations.haml | 12 -
app/views/contacts/_aspect_listings.haml | 2 +-
app/views/home/default.haml | 16 +-
.../{statistics => node_info}/_statistic.haml | 0
app/views/node_info/_statistics.haml | 22 +
app/views/node_info/statistics.html.haml | 1 +
app/views/node_info/statistics.mobile.haml | 1 +
app/views/notifications/index.mobile.haml | 7 +-
app/views/people/show.mobile.haml | 26 +-
.../{_index.html.haml => _index.mobile.haml} | 0
app/views/shared/_right_sections.html.haml | 2 +-
app/views/statistics/_statistics.haml | 23 -
app/views/statistics/statistics.html.haml | 1 -
app/views/statistics/statistics.mobile.haml | 1 -
app/views/streams/main_stream.html.haml | 16 +-
app/workers/fetch_webfinger.rb | 2 +-
bin/bundle | 3 +
bin/cucumber | 7 +
bin/eye | 16 +
bin/guard | 16 +
bin/rails | 8 +
bin/rake | 8 +
bin/rspec | 7 +
bin/rubocop | 16 +
bin/spring | 18 +
config/defaults.yml | 4 +-
config/diaspora.yml.example | 4 +-
config/initializers/diaspora_federation.rb | 30 +-
config/initializers/handlebars_assets.rb | 1 +
config/initializers/load_libraries.rb | 4 -
config/load_config.rb | 2 +-
config/locales/diaspora/en.yml | 3 -
config/locales/diaspora/es-VE.yml | 53 +-
config/locales/javascript/javascript.en.yml | 2 +
config/locales/javascript/javascript.es-VE.yml | 37 +-
config/routes.rb | 19 +-
.../20150724152052_remove_favorites_from_posts.rb | 9 +
db/schema.rb | 3 +-
features/desktop/conversations.feature | 13 +-
features/desktop/manages_aspects.feature | 2 +-
features/desktop/posts_from_main_page.feature | 10 +-
features/desktop/posts_from_profile_page.feature | 6 +-
features/mobile/home.feature | 7 +
features/step_definitions/.rubocop.yml | 5 +
features/step_definitions/aspects_steps.rb | 33 +-
features/step_definitions/custom_web_steps.rb | 13 +
features/step_definitions/posts_steps.rb | 4 -
features/support/env.rb | 3 -
features/support/paths.rb | 2 +
features/support/user_cuke_helpers.rb | 4 +-
features/support/webmock.rb | 11 +
lib/diaspora/fetcher/single.rb | 2 +-
lib/federated/relayable.rb | 2 +-
lib/h_card.rb | 21 -
lib/node_info.rb | 160 ++++
lib/postzord/receiver/private.rb | 4 +-
lib/postzord/receiver/public.rb | 2 +-
lib/rake_helpers.rb | 40 -
lib/statistics.rb | 203 -----
lib/webfinger.rb | 123 ---
lib/webfinger_profile.rb | 53 --
spec/controllers/comments_controller_spec.rb | 2 +-
.../diaspora_federation_controller_spec.rb | 36 -
spec/controllers/node_info_controller_spec.rb | 77 ++
spec/controllers/notifications_controller_spec.rb | 18 +
spec/controllers/photos_controller_spec.rb | 10 +
spec/controllers/posts_controller_spec.rb | 183 ++---
spec/controllers/registrations_controller_spec.rb | 2 +-
spec/controllers/statistics_controller_spec.rb | 30 -
spec/factories.rb | 29 +
spec/federation_callbacks_spec.rb | 108 ++-
spec/fixtures/evan_hcard | 72 --
spec/fixtures/finger_xrd | 11 -
spec/fixtures/hcard_response | 64 --
spec/fixtures/host_xrd | 7 -
spec/fixtures/nonseed_finger_xrd | 15 -
spec/helper_methods.rb | 40 -
spec/helpers/people_helper_spec.rb | 3 +
spec/integration/receiving_spec.rb | 5 +-
.../javascripts/app/views/back_to_top_view_spec.js | 38 +
spec/javascripts/app/views/feedback_view_spec.js | 12 +-
.../app/views/stream_faces_view_spec.js | 6 +-
spec/javascripts/app/views/stream_post_spec.js | 2 +-
spec/javascripts/support/jasmine.yml | 3 +
spec/javascripts/widgets/back-to-top-spec.js | 53 --
spec/lib/h_card_spec.rb | 43 -
spec/lib/postzord/receiver/private_spec.rb | 6 +-
spec/lib/rake_helper_spec.rb | 26 -
spec/lib/statistics_spec.rb | 177 -----
spec/lib/webfinger_profile_spec.rb | 42 -
spec/lib/webfinger_spec.rb | 221 ------
spec/models/post_spec.rb | 50 +-
spec/models/reshare_spec.rb | 9 +-
spec/models/user_spec.rb | 8 +-
spec/presenters/node_info_presenter_spec.rb | 134 ++++
spec/presenters/post_presenter_spec.rb | 62 +-
spec/presenters/statistics_presenter_spec.rb | 10 -
spec/services/post_service_spec.rb | 127 +++
spec/workers/fetch_webfinger_spec.rb | 4 +-
vendor/nodeinfo/schemas/1.0.json | 206 +++++
159 files changed, 3056 insertions(+), 2287 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