[DRE-commits] [diaspora] 183/257: Merge tag 'upstream/0.5.0.0_git.20141129.4a80cbc5.no.bin'

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora.

commit e9ea88f072c687c0c7399cdb964ba8181f35888f
Merge: 2c44b62 d23fcce
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Nov 29 23:05:56 2014 +0530

    Merge tag 'upstream/0.5.0.0_git.20141129.4a80cbc5.no.bin'
    
    Upstream version 0.5.0.0~git.20141129.4a80cbc5.no.bin
    
    # gpg: Signature made Saturday 29 November 2014 11:05:47 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"

 .foreman                                           |   2 +-
 .gitignore                                         |   4 +
 Changelog.md                                       |  11 +
 Gemfile                                            |  32 ++-
 Gemfile.lock                                       | 191 ++++++++++-----
 Procfile                                           |   1 +
 app/assets/images/facebox/loading.gif              | Bin
 app/assets/images/icons/menu.png                   | Bin
 app/assets/javascripts/app/helpers/open_graph.js   |   8 +-
 app/assets/javascripts/app/helpers/truncate.js     |  10 +
 app/assets/javascripts/app/views/contacts_view.js  |  18 ++
 app/assets/javascripts/app/views/content_view.js   |  20 +-
 .../single-post-viewer/single_post_content_view.js |   2 +-
 app/assets/javascripts/jsxc.js                     |  50 ++++
 app/assets/javascripts/widgets/search.js           |  15 +-
 app/assets/stylesheets/application.css.scss        |   6 +-
 app/assets/stylesheets/aspects.css.scss            |   5 +-
 app/assets/stylesheets/autocomplete.css.scss       |  20 +-
 app/assets/stylesheets/bootstrap-fix.css.scss      |  11 +
 app/assets/stylesheets/chat.css.scss               |   7 +
 app/assets/stylesheets/contacts.css.scss           |   3 +
 app/assets/stylesheets/default.css.scss            |   1 +
 app/assets/stylesheets/getting-started.css.scss    |   4 +
 app/assets/stylesheets/header.css.scss             |   3 +-
 app/assets/stylesheets/mobile/mobile.css.scss      |   8 +-
 app/assets/stylesheets/new-templates.css.scss      |   2 +
 app/assets/stylesheets/publisher.css.scss          |   2 +-
 app/assets/stylesheets/vendor/facebox.css          |   0
 app/controllers/api/v1/tokens_controller.rb        |  16 ++
 app/controllers/aspects_controller.rb              |  10 +-
 app/controllers/sessions_controller.rb             |   6 +
 app/helpers/jsxc_helper.rb                         |  13 +
 app/helpers/open_graph_helper.rb                   |   2 +-
 app/models/user.rb                                 |   2 +-
 app/views/aspects/new.haml                         |   4 +
 app/views/contacts/_header.html.haml               |   6 +
 app/views/people/show.mobile.haml                  |   6 +-
 app/views/shared/_stream_more_button.mobile.haml   |  15 ++
 app/views/streams/main_stream.html.haml            |   3 +
 app/views/streams/main_stream.mobile.haml          |   6 +-
 app/views/tags/show.mobile.haml                    |   6 +-
 app/views/users/privacy_settings.html.haml         |   3 +
 config/application.rb                              |   1 +
 config/defaults.yml                                |  28 +++
 config/diaspora.yml.example                        | 271 +++++++++++++++------
 config/locales/diaspora/en.yml                     |   6 +
 config/oembed_providers.yml                        |   6 +-
 config/routes.rb                                   |   5 +
 config/vines/README                                |   7 +
 db/migrate/20140801101230_create_chat_contacts.rb  |  16 ++
 db/migrate/20140801101352_create_chat_fragments.rb |  17 ++
 .../20141007003922_add_chat_enabled_to_aspects.rb  |   9 +
 .../20141024170120_create_chat_offline_messages.rb |  14 ++
 db/schema.rb                                       |  39 ++-
 features/support/env.rb                            |   4 +
 graphics/camera.svg                                |   0
 graphics/check_box_checked.svg                     |   0
 graphics/heart.svg                                 |   0
 graphics/pencil.svg                                |   0
 lib/csv_generator.rb                               | 248 -------------------
 lib/development_mail_interceptor.rb                |   7 -
 script/server                                      |  25 +-
 spec/controllers/users_controller_spec.rb          |   4 +-
 spec/helpers/jsxc_helper_spec.rb                   |  21 ++
 spec/javascripts/app/views/contacts_view_spec.js   |  25 ++
 spec/javascripts/app/views/stream_post_spec.js     |  14 ++
 spec/lib/csv_generator_spec.rb                     |  19 --
 67 files changed, 850 insertions(+), 470 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git