[DRE-commits] [diaspora] branch master updated (e6723c2 -> d970e04)
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Tue Sep 15 19:18:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a change to branch master
in repository diaspora.
from e6723c2 filter bin only
adds a33cba1 Imported Upstream version 0.5.3.0+debian~rc
adds 445abbe Merge tag 'upstream/0.5.3.0+debian_rc' into master-0.5.3.0
adds 0696411 update changelog
adds 7e914ba remove already applied patch deleted: debian/patches/042-remove-minified-js-require.patch
adds 936960e tighten dependencies
adds d586d01 tighten uglifier dependency
adds 4642c64 fog, gon, perfect-scrollbar tightened
adds 6cca2f5 update rails-admin version
adds b2832fd refresh patch
adds 1406403 refresh more patches
adds 6f8b096 more refresh
adds 6a23056 refresh
adds 6cf2fa6 refresh patches
adds b3336e8 loosen diaspora-jsxc
adds 1fe551d hardcode variables in preinst
adds f4d167e hardcode diaspora_home
adds 5d126d2 update README with notes
adds 30ca4af backbone-on-rails is in sync
adds 69bb3f6 add colorbox to depends
adds 0355032 refresh patches to include colorbox
adds 6c37e56 add favico.js dep
adds 2fcfa94 refresh patches
adds 82dd6c6 add jquery-fullscreen-plugin to depends
adds a160388 move rake dependency to diaspora
adds f713afc update dversionmagle
adds 75ba409 Imported Upstream version 0.5.3.0+debian
adds 2a90aef Merge tag 'upstream/0.5.3.0+debian' into master-0.5.3.0
adds 3dbe3be update changelog
adds 1852c6a update devise_lastseenable version
adds d970e04 colorbox is same as jquery-colorbox
No new revisions were added by this update.
Summary of changes:
.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 +-
config/defaults.yml | 4 +-
config/diaspora.yml.example | 25 +-
config/initializers/diaspora_federation.rb | 30 +-
config/initializers/handlebars_assets.rb | 1 +
config/initializers/load_libraries.rb | 4 -
config/load_config.rb | 2 +-
.../devise/{devise.af.yml => devise.az.yml} | 10 +-
config/locales/devise/devise.hy.yml | 4 +-
config/locales/devise/devise.nb.yml | 2 +-
config/locales/diaspora/az.yml | 34 +-
config/locales/diaspora/bs.yml | 3 -
config/locales/diaspora/cs.yml | 3 -
config/locales/diaspora/da.yml | 7 +-
config/locales/diaspora/de.yml | 3 -
config/locales/diaspora/de_formal.yml | 3 -
config/locales/diaspora/el.yml | 220 +++---
config/locales/diaspora/en.yml | 3 -
config/locales/diaspora/en_valspeak.yml | 3 -
config/locales/diaspora/eo.yml | 3 -
config/locales/diaspora/es-AR.yml | 59 +-
config/locales/diaspora/es-CL.yml | 3 -
config/locales/diaspora/es-MX.yml | 3 -
config/locales/diaspora/es-VE.yml | 28 +
config/locales/diaspora/es.yml | 4 +-
config/locales/diaspora/eu.yml | 3 -
config/locales/diaspora/fi.yml | 6 +-
config/locales/diaspora/fr.yml | 3 -
config/locales/diaspora/he.yml | 3 -
config/locales/diaspora/hu.yml | 3 -
config/locales/diaspora/hy.yml | 302 +++----
config/locales/diaspora/ia.yml | 3 -
config/locales/diaspora/it.yml | 3 -
config/locales/diaspora/ko.yml | 3 -
config/locales/diaspora/ml.yml | 3 -
config/locales/diaspora/nb.yml | 352 ++++++---
config/locales/diaspora/nds.yml | 11 +-
config/locales/diaspora/nl.yml | 3 -
config/locales/diaspora/nn.yml | 3 -
config/locales/diaspora/pl.yml | 3 -
config/locales/diaspora/pt-BR.yml | 17 +-
config/locales/diaspora/pt-PT.yml | 3 -
config/locales/diaspora/ru.yml | 3 -
config/locales/diaspora/sc.yml | 41 +-
config/locales/diaspora/sk.yml | 3 -
config/locales/diaspora/sl.yml | 3 -
config/locales/diaspora/sv.yml | 89 +--
config/locales/diaspora/te.yml | 3 -
config/locales/diaspora/tr.yml | 3 -
config/locales/diaspora/uk.yml | 3 -
config/locales/diaspora/vi.yml | 3 -
config/locales/diaspora/zh-CN.yml | 3 -
config/locales/diaspora/zh-TW.yml | 3 -
config/locales/javascript/javascript.cs.yml | 2 +
config/locales/javascript/javascript.da.yml | 2 +
config/locales/javascript/javascript.de.yml | 2 +
config/locales/javascript/javascript.de_formal.yml | 2 +
config/locales/javascript/javascript.el.yml | 4 +-
config/locales/javascript/javascript.en.yml | 2 +
config/locales/javascript/javascript.es-AR.yml | 7 +
config/locales/javascript/javascript.es-VE.yml | 35 +
config/locales/javascript/javascript.es.yml | 2 +
config/locales/javascript/javascript.fr.yml | 2 +
config/locales/javascript/javascript.hy.yml | 18 +-
config/locales/javascript/javascript.nb.yml | 69 +-
config/locales/javascript/javascript.nl.yml | 2 +
config/locales/javascript/javascript.pl.yml | 2 +
config/locales/javascript/javascript.sv.yml | 30 +-
config/locales/javascript/javascript.uk.yml | 12 +-
config/routes.rb | 19 +-
.../20150724152052_remove_favorites_from_posts.rb | 9 +
db/schema.rb | 3 +-
debian/README | 9 +
debian/changelog | 9 +-
debian/control | 21 +-
.../002-remove-development-test-from-gemfile.patch | 19 +-
debian/patches/007-loosen-roxml-version.patch | 2 +-
debian/patches/008-loosen-diaspora-jsxc.patch | 16 +
debian/patches/019-remove-diaspora-vines.patch | 12 +-
debian/patches/020-loosen-minor-versions.patch | 2 +-
debian/patches/030-loosen-tiny-versions.patch | 26 +-
debian/patches/031-embedded-gems.patch | 2 +-
.../patches/042-remove-minified-js-require.patch | 23 -
debian/patches/series | 2 +-
debian/preinst | 6 +-
debian/watch | 2 +-
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 +++++
222 files changed, 3843 insertions(+), 2947 deletions(-)
create mode 100644 CODE_OF_CONDUCT.md
create mode 100644 Gemfile.lock
create mode 100644 app/assets/javascripts/app/views/back_to_top_view.js
delete mode 100644 app/assets/javascripts/widgets/back-to-top.js
delete mode 100644 app/assets/javascripts/widgets/stream.js
rename app/assets/stylesheets/{new_styles/_statistics.scss => statistics.scss} (92%)
create mode 100644 app/controllers/node_info_controller.rb
delete mode 100644 app/controllers/statistics_controller.rb
create mode 100644 app/presenters/node_info_presenter.rb
create mode 100644 app/services/comment_service.rb
create mode 100644 app/services/post_service.rb
create mode 100644 app/services/status_message_creation_service.rb
delete mode 100644 app/views/admins/correlations.haml
rename app/views/{statistics => node_info}/_statistic.haml (100%)
create mode 100644 app/views/node_info/_statistics.haml
create mode 100644 app/views/node_info/statistics.html.haml
create mode 100644 app/views/node_info/statistics.mobile.haml
rename app/views/photos/{_index.html.haml => _index.mobile.haml} (100%)
delete mode 100644 app/views/statistics/_statistics.haml
delete mode 100644 app/views/statistics/statistics.html.haml
delete mode 100644 app/views/statistics/statistics.mobile.haml
create mode 100644 config/initializers/handlebars_assets.rb
copy config/locales/devise/{devise.af.yml => devise.az.yml} (63%)
create mode 100644 db/migrate/20150724152052_remove_favorites_from_posts.rb
create mode 100644 debian/patches/008-loosen-diaspora-jsxc.patch
delete mode 100644 debian/patches/042-remove-minified-js-require.patch
create mode 100644 features/step_definitions/.rubocop.yml
create mode 100644 features/support/webmock.rb
delete mode 100644 lib/h_card.rb
create mode 100644 lib/node_info.rb
delete mode 100644 lib/rake_helpers.rb
delete mode 100644 lib/statistics.rb
delete mode 100644 lib/webfinger.rb
delete mode 100644 lib/webfinger_profile.rb
delete mode 100644 spec/controllers/diaspora_federation_controller_spec.rb
create mode 100644 spec/controllers/node_info_controller_spec.rb
delete mode 100644 spec/controllers/statistics_controller_spec.rb
delete mode 100644 spec/fixtures/evan_hcard
delete mode 100644 spec/fixtures/finger_xrd
delete mode 100644 spec/fixtures/hcard_response
delete mode 100644 spec/fixtures/host_xrd
delete mode 100644 spec/fixtures/nonseed_finger_xrd
create mode 100644 spec/javascripts/app/views/back_to_top_view_spec.js
delete mode 100644 spec/javascripts/widgets/back-to-top-spec.js
delete mode 100644 spec/lib/h_card_spec.rb
delete mode 100644 spec/lib/rake_helper_spec.rb
delete mode 100644 spec/lib/statistics_spec.rb
delete mode 100644 spec/lib/webfinger_profile_spec.rb
delete mode 100644 spec/lib/webfinger_spec.rb
create mode 100644 spec/presenters/node_info_presenter_spec.rb
create mode 100644 spec/services/post_service_spec.rb
create mode 100644 vendor/nodeinfo/schemas/1.0.json
--
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