[DRE-commits] [diaspora] 01/05: Merge tag 'upstream/0.5.9.1+debian'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Tue Jun 28 17:11:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository diaspora.
commit c320c82b671408c1b3fb45ac8ad9c656728148ad
Merge: 1c89d7e ae9d8a4
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Tue Jun 28 19:50:24 2016 +0530
Merge tag 'upstream/0.5.9.1+debian'
Upstream version 0.5.9.1+debian
# gpg: Signature made Tuesday 28 June 2016 07:50:20 PM 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>"
.travis.yml | 2 +-
Changelog.md | 36 +
Gemfile | 20 +-
Gemfile.lock | 115 +--
app/assets/javascripts/app/pages/contacts.js | 2 +
.../javascripts/app/views/back_to_top_view.js | 2 +-
app/controllers/conversations_controller.rb | 2 -
app/controllers/invitations_controller.rb | 2 +-
app/controllers/notifications_controller.rb | 7 +-
app/controllers/sessions_controller.rb | 2 +-
app/helpers/people_helper.rb | 6 +-
app/helpers/posts_helper.rb | 4 +-
app/models/acts_as_taggable_on-tag.rb | 2 +-
app/models/mention.rb | 2 -
app/models/notification.rb | 6 +-
app/models/profile.rb | 12 +-
app/presenters/o_embed_presenter.rb | 2 +-
app/views/notifier/invite.markerb | 2 +-
config.ru | 12 +-
config/defaults.yml | 2 +-
config/environments/development.rb | 3 +
config/initializers/diaspora_federation.rb | 15 +-
config/locales/devise/devise.nds.yml | 42 +-
config/locales/devise/devise.te.yml | 5 +
config/locales/diaspora/ar.yml | 14 -
config/locales/diaspora/art-nvi.yml | 1 -
config/locales/diaspora/ast.yml | 6 -
config/locales/diaspora/az.yml | 7 -
config/locales/diaspora/be.yml | 3 -
config/locales/diaspora/bg.yml | 13 -
config/locales/diaspora/br.yml | 13 -
config/locales/diaspora/bs.yml | 13 -
config/locales/diaspora/cs.yml | 67 +-
config/locales/diaspora/cy.yml | 9 -
config/locales/diaspora/da.yml | 17 +-
config/locales/diaspora/de.yml | 33 +-
config/locales/diaspora/de_formal.yml | 183 ++--
config/locales/diaspora/el.yml | 16 +-
config/locales/diaspora/en.yml | 4 +-
config/locales/diaspora/en_1337.yml | 8 -
config/locales/diaspora/en_pirate.yml | 10 -
config/locales/diaspora/en_shaw.yml | 8 -
config/locales/diaspora/en_valspeak.yml | 65 +-
config/locales/diaspora/eo.yml | 38 +-
config/locales/diaspora/es-AR.yml | 19 +-
config/locales/diaspora/es-BO.yml | 3 -
config/locales/diaspora/es-CL.yml | 13 -
config/locales/diaspora/es-CO.yml | 6 -
config/locales/diaspora/es-MX.yml | 13 -
config/locales/diaspora/es.yml | 27 +-
config/locales/diaspora/eu.yml | 13 -
config/locales/diaspora/fa.yml | 3 -
config/locales/diaspora/fi.yml | 13 -
config/locales/diaspora/fil.yml | 5 -
config/locales/diaspora/fr.yml | 102 +-
config/locales/diaspora/fy.yml | 3 -
config/locales/diaspora/ga.yml | 6 -
config/locales/diaspora/gd.yml | 70 +-
config/locales/diaspora/he.yml | 13 -
config/locales/diaspora/hu.yml | 13 -
config/locales/diaspora/hy.yml | 106 +-
config/locales/diaspora/ia.yml | 17 +-
config/locales/diaspora/id.yml | 13 +-
config/locales/diaspora/io.yml | 2 -
config/locales/diaspora/is.yml | 8 -
config/locales/diaspora/it.yml | 13 -
config/locales/diaspora/ja.yml | 9 -
config/locales/diaspora/ka.yml | 6 -
config/locales/diaspora/kk.yml | 1 -
config/locales/diaspora/ko.yml | 13 -
config/locales/diaspora/lt.yml | 8 -
config/locales/diaspora/lv.yml | 6 -
config/locales/diaspora/mk.yml | 6 -
config/locales/diaspora/ml.yml | 13 -
config/locales/diaspora/ms.yml | 6 -
config/locales/diaspora/nb.yml | 33 +-
config/locales/diaspora/nds.yml | 1022 ++++++++++++--------
config/locales/diaspora/nl.yml | 23 +-
config/locales/diaspora/nn.yml | 70 +-
config/locales/diaspora/pa.yml | 5 -
config/locales/diaspora/pl.yml | 13 -
config/locales/diaspora/pt-BR.yml | 283 +++---
config/locales/diaspora/pt-PT.yml | 19 -
config/locales/diaspora/ro.yml | 9 -
config/locales/diaspora/ru.yml | 37 +-
config/locales/diaspora/sc.yml | 3 -
config/locales/diaspora/si.yml | 2 -
config/locales/diaspora/sk.yml | 13 -
config/locales/diaspora/sl.yml | 13 -
config/locales/diaspora/sr.yml | 10 -
config/locales/diaspora/sv.yml | 29 +-
config/locales/diaspora/ta.yml | 3 -
config/locales/diaspora/te.yml | 207 +++-
config/locales/diaspora/tr.yml | 15 +-
config/locales/diaspora/uk.yml | 13 -
config/locales/diaspora/ur-PK.yml | 5 -
config/locales/diaspora/vi.yml | 13 -
config/locales/diaspora/wo.yml | 1 -
config/locales/diaspora/zh-CN.yml | 13 -
config/locales/diaspora/zh-TW.yml | 16 +-
config/locales/javascript/javascript.br.yml | 1 -
config/locales/javascript/javascript.bs.yml | 1 -
config/locales/javascript/javascript.cs.yml | 1 -
config/locales/javascript/javascript.da.yml | 1 -
config/locales/javascript/javascript.de.yml | 3 +-
config/locales/javascript/javascript.de_formal.yml | 15 +-
config/locales/javascript/javascript.el.yml | 1 -
.../locales/javascript/javascript.en_valspeak.yml | 5 +-
config/locales/javascript/javascript.es-AR.yml | 1 -
config/locales/javascript/javascript.es-MX.yml | 1 -
config/locales/javascript/javascript.es.yml | 1 -
config/locales/javascript/javascript.fi.yml | 1 -
config/locales/javascript/javascript.fr.yml | 1 -
config/locales/javascript/javascript.he.yml | 1 -
config/locales/javascript/javascript.hu.yml | 1 -
config/locales/javascript/javascript.hy.yml | 5 +-
config/locales/javascript/javascript.ia.yml | 2 +-
config/locales/javascript/javascript.is.yml | 1 -
config/locales/javascript/javascript.it.yml | 1 -
config/locales/javascript/javascript.ml.yml | 1 -
config/locales/javascript/javascript.ms.yml | 1 -
config/locales/javascript/javascript.nb.yml | 2 +-
config/locales/javascript/javascript.nds.yml | 137 ++-
config/locales/javascript/javascript.nl.yml | 3 +-
config/locales/javascript/javascript.nn.yml | 1 -
config/locales/javascript/javascript.pl.yml | 1 -
config/locales/javascript/javascript.pt-BR.yml | 49 +-
config/locales/javascript/javascript.pt-PT.yml | 1 -
config/locales/javascript/javascript.ru.yml | 16 +-
config/locales/javascript/javascript.sk.yml | 1 -
config/locales/javascript/javascript.sv.yml | 7 +-
config/locales/javascript/javascript.te.yml | 99 +-
config/locales/javascript/javascript.uk.yml | 1 -
config/locales/javascript/javascript.zh-TW.yml | 1 -
...103605_add_author_id_index_to_participations.rb | 5 +
db/schema.rb | 3 +-
lib/diaspora.rb | 19 +-
lib/diaspora/federation.rb | 78 ++
lib/rack/chrome_frame.rb | 71 --
lib/rack/internet_explorer_version.rb | 41 +
spec/controllers/notifications_controller_spec.rb | 13 +
spec/controllers/sessions_controller_spec.rb | 22 +
spec/federation_callbacks_spec.rb | 53 +
spec/helpers/jsxc_helper_spec.rb | 7 +-
spec/helpers/people_helper_spec.rb | 12 +
spec/integration/federation/federation_helper.rb | 12 +-
.../federation/receive_federation_messages_spec.rb | 14 +-
.../federation/shared_receive_retraction.rb | 2 +-
.../federation/shared_receive_stream_items.rb | 4 +-
spec/javascripts/app/pages/contacts_spec.js | 7 +
.../{widgets/i18n-spec.js => helpers/i18n_spec.js} | 0
.../{helpers => jasmine_helpers}/SpecHelper.js | 0
.../{helpers => jasmine_helpers}/factory.js | 0
spec/javascripts/support/jasmine.yml | 2 +-
spec/javascripts/widgets/aspect-nav.js | 9 -
spec/lib/rack/chrome_frame_spec.rb | 63 --
spec/lib/rack/internet_explorer_version_spec.rb | 48 +
spec/models/acts_as_taggable_on_tag_spec.rb | 6 +
spec/models/notification_spec.rb | 4 +-
159 files changed, 2095 insertions(+), 2017 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