[DRE-commits] [ruby-rails-assets-diaspora-jsxc] 01/03: Merge tag 'upstream/0.1.4_alpha.1'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-rails-assets-diaspora-jsxc.

commit 6843a7c1f4d957833a9abda14d4f5afd776a1464
Merge: 4415024 54d0d1d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Sep 4 13:40:27 2015 +0530

    Merge tag 'upstream/0.1.4_alpha.1'
    
    Upstream version 0.1.4~alpha.1
    
    # gpg: Signature made Friday 04 September 2015 01:40:14 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>"

 app/assets/documents/diaspora_jsxc/dep.json        |    72 +-
 app/assets/javascripts/diaspora_jsxc.js            |    10 +-
 app/assets/javascripts/diaspora_jsxc/jsxc.js       |  9633 ++++++
 .../lib/i18next/release/i18next-latest.min.js      |     6 +
 .../javascripts/diaspora_jsxc/lib/jsxc.dep.js      | 31846 +++++++++++++++++++
 .../magnific-popup/dist/jquery.magnific-popup.js   |  2060 ++
 .../diaspora_jsxc/lib/otr/build/dep/bigint.js      |  1705 +
 .../diaspora_jsxc/lib/otr/build/dep/crypto.js      |  2434 ++
 .../lib/otr/build/dep/eventemitter.js              |   455 +
 .../diaspora_jsxc/lib/otr/build/dep/salsa20.js     |   254 +
 .../diaspora_jsxc/lib/otr/build/dsa-webworker.js   |    52 +
 .../javascripts/diaspora_jsxc/lib/otr/build/otr.js |  2634 ++
 .../diaspora_jsxc/lib/otr/build/sm-webworker.js    |    60 +
 .../javascripts/diaspora_jsxc/lib/otr/lib/const.js |    55 +
 .../diaspora_jsxc/lib/otr/lib/dsa-webworker.js     |    52 +
 .../javascripts/diaspora_jsxc/lib/otr/lib/dsa.js   |   405 +
 .../diaspora_jsxc/lib/otr/lib/helpers.js           |   349 +
 .../diaspora_jsxc/lib/otr/lib/sm-webworker.js      |    60 +
 .../diaspora_jsxc/lib/otr/vendor/bigint.js         |  1705 +
 .../diaspora_jsxc/lib/otr/vendor/crypto.js         |  2434 ++
 .../diaspora_jsxc/lib/otr/vendor/eventemitter.js   |   455 +
 .../diaspora_jsxc/lib/otr/vendor/salsa20.js        |   254 +
 .../strophe.jinglejs/strophe.jinglejs-bundle.js    | 17543 ++++++++++
 .../javascripts/diaspora_jsxc/lib/strophe.muc.js   |     4 +-
 .../javascripts/diaspora_jsxc/lib/translation.js   |     1 +
 app/assets/stylesheets/diaspora_jsxc.scss          |     7 +-
 .../diaspora_jsxc/{lib => }/jquery-ui.min.scss     |     0
 .../diaspora_jsxc/{lib => }/jquery.colorbox.scss   |     0
 .../diaspora_jsxc/{build/css => }/jsxc.scss        |  2316 +-
 .../diaspora_jsxc/{build/css => }/jsxc.webrtc.scss |     3 +-
 .../diaspora_jsxc/lib/jquery.mCustomScrollbar.scss |   241 -
 .../stylesheets/diaspora_jsxc/magnific-popup.scss  |   374 +
 .../stylesheets/diaspora_jsxc/scss/_buddylist.scss |   148 -
 .../stylesheets/diaspora_jsxc/scss/_colors.scss    |   115 -
 .../stylesheets/diaspora_jsxc/scss/_jsxc.scss      |   721 -
 .../stylesheets/diaspora_jsxc/scss/_modules.scss   |    28 -
 .../stylesheets/diaspora_jsxc/scss/_roster.scss    |   161 -
 .../stylesheets/diaspora_jsxc/scss/_state.scss     |    25 -
 .../stylesheets/diaspora_jsxc/scss/_webrtc.scss    |   245 -
 .../stylesheets/diaspora_jsxc/scss/emoticons.scss  |    72 -
 lib/rails-assets-diaspora_jsxc.rb                  |    12 +-
 lib/rails-assets-diaspora_jsxc/version.rb          |     2 +-
 metadata.yml                                       |   117 +-
 rails-assets-diaspora_jsxc.gemspec                 |    15 +-
 44 files changed, 77203 insertions(+), 1937 deletions(-)

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