[DRE-commits] [diaspora] 07/11: Merge tag 'upstream/0.5.0.0+debian'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Wed May 6 07:45:06 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 e63a791a6ed7384ccef38b5e1d79c6e8980265b7
Merge: e54108e 7591cd9
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Wed May 6 13:01:50 2015 +0530
Merge tag 'upstream/0.5.0.0+debian'
Upstream version 0.5.0.0+debian
# gpg: Signature made Wednesday 06 May 2015 01:01:41 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>"
Changelog.md | 15 +-
Gemfile | 4 +-
Gemfile.lock | 821 ---------------------
.../javascripts/app/helpers/text_formatter.js | 21 +-
.../javascripts/app/models/post/interactions.js | 4 +-
app/assets/javascripts/app/views/hovercard_view.js | 24 +-
.../javascripts/app/views/notifications_view.js | 3 +-
app/assets/javascripts/app/views/publisher_view.js | 4 +-
app/assets/stylesheets/conversations.scss | 2 +
app/assets/stylesheets/mobile/mobile.scss | 1 +
.../stylesheets/new_styles/_interactions.scss | 2 +-
app/assets/stylesheets/sidebar.scss | 17 +
.../templates/faq_posts_and_posting_tpl.jst.hbs | 73 +-
app/assets/templates/faq_question_tpl.jst.hbs | 2 +-
app/assets/templates/faq_sharing_tpl.jst.hbs | 7 +
app/assets/templates/help_tpl.jst.hbs | 2 +-
app/controllers/users_controller.rb | 2 +-
app/helpers/contacts_helper.rb | 2 -
app/helpers/services_helper.rb | 9 +-
app/uploaders/exported_photos.rb | 8 +-
app/uploaders/exported_user.rb | 4 +-
app/uploaders/secure_uploader.rb | 7 +
app/views/admins/user_search.html.haml | 16 +-
app/views/errors/not_public.haml | 12 +-
app/views/profiles/edit.haml | 11 +-
app/views/registrations/new.mobile.haml | 12 +-
app/views/sessions/new.mobile.haml | 10 +-
app/views/shared/_donatepod.html.haml | 4 +-
app/views/users/edit.html.haml | 8 +-
app/workers/receive_local_batch.rb | 2 +-
config/.jshint.json | 6 +-
config/application.rb | 7 +
config/defaults.yml | 2 +-
config/initializers/mailer_config.rb | 9 +-
config/locales/devise/devise.hy.yml | 4 +-
config/locales/diaspora/ar.yml | 1 -
config/locales/diaspora/bg.yml | 1 -
config/locales/diaspora/br.yml | 1 -
config/locales/diaspora/bs.yml | 1 -
config/locales/diaspora/cs.yml | 13 +-
config/locales/diaspora/da.yml | 6 +-
config/locales/diaspora/de.yml | 14 +-
config/locales/diaspora/de_formal.yml | 14 +-
config/locales/diaspora/el.yml | 1 -
config/locales/diaspora/en.yml | 166 +++--
config/locales/diaspora/en_1337.yml | 1 -
config/locales/diaspora/en_pirate.yml | 1 -
config/locales/diaspora/en_shaw.yml | 1 -
config/locales/diaspora/en_valspeak.yml | 1 -
config/locales/diaspora/eo.yml | 1 -
config/locales/diaspora/es-AR.yml | 3 +-
config/locales/diaspora/es-CL.yml | 1 -
config/locales/diaspora/es-CO.yml | 1 -
config/locales/diaspora/es-MX.yml | 1 -
config/locales/diaspora/es.yml | 15 +-
config/locales/diaspora/eu.yml | 1 -
config/locales/diaspora/fi.yml | 1 -
config/locales/diaspora/fr.yml | 13 +-
config/locales/diaspora/he.yml | 1 -
config/locales/diaspora/hu.yml | 1 -
config/locales/diaspora/hy.yml | 334 ++++++---
config/locales/diaspora/ia.yml | 1 -
config/locales/diaspora/id.yml | 1 -
config/locales/diaspora/it.yml | 1 -
config/locales/diaspora/ja.yml | 1 -
config/locales/diaspora/ka.yml | 1 -
config/locales/diaspora/ko.yml | 1 -
config/locales/diaspora/lt.yml | 1 -
config/locales/diaspora/ml.yml | 1 -
config/locales/diaspora/ms.yml | 1 -
config/locales/diaspora/nb.yml | 1 -
config/locales/diaspora/nds.yml | 13 +-
config/locales/diaspora/nl.yml | 411 +++++------
config/locales/diaspora/nn.yml | 1 -
config/locales/diaspora/pl.yml | 2 +-
config/locales/diaspora/pt-BR.yml | 52 +-
config/locales/diaspora/pt-PT.yml | 1 -
config/locales/diaspora/ro.yml | 9 +
config/locales/diaspora/ru.yml | 226 ++++--
config/locales/diaspora/sk.yml | 1 -
config/locales/diaspora/sl.yml | 5 +-
config/locales/diaspora/sv.yml | 77 +-
config/locales/diaspora/te.yml | 1 -
config/locales/diaspora/tr.yml | 1 -
config/locales/diaspora/uk.yml | 1 -
config/locales/diaspora/vi.yml | 1 -
config/locales/diaspora/zh-CN.yml | 1 -
config/locales/diaspora/zh-TW.yml | 2 +-
config/locales/javascript/javascript.de.yml | 2 +
config/locales/javascript/javascript.de_formal.yml | 2 +
config/locales/javascript/javascript.es-AR.yml | 1 +
config/locales/javascript/javascript.hy.yml | 4 +-
config/locales/javascript/javascript.nl.yml | 34 +-
config/locales/javascript/javascript.pt-BR.yml | 14 +
config/locales/javascript/javascript.ru.yml | 16 +-
config/routes.rb | 4 +-
.../20150106050733_set_mysql_to_unicode_mb4.rb | 21 +-
script/server | 2 +-
spec/controllers/users_controller_spec.rb | 11 +-
.../javascripts/app/helpers/text_formatter_spec.js | 7 +-
.../app/models/post/interacations_spec.js | 28 +-
spec/javascripts/app/views/publisher_view_spec.js | 20 +-
spec/workers/receive_local_batch_spec.rb | 14 +
103 files changed, 1179 insertions(+), 1548 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