[DRE-commits] [ruby-rails-assets-diaspora-jsxc] 01/05: Merge tag 'upstream/0.1.5+dfsg_develop.7'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sun Sep 25 07:05:29 UTC 2016
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 8621ba021ed589304fdf003c5199986123a77edf
Merge: e1f4a89 a667d0c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Sun Sep 25 11:42:56 2016 +0530
Merge tag 'upstream/0.1.5+dfsg_develop.7'
Upstream version 0.1.5+dfsg~develop.7
# gpg: Signature made Sunday 25 September 2016 11:42:56 AM IST using RSA key ID CE1F9C674512C22A
# gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>" [ultimate]
# gpg: aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>" [ultimate]
# gpg: aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>" [ultimate]
# gpg: aka "Pirate Praveen (PP) <praveen at privacyrequired.com>" [ultimate]
# gpg: aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>" [ultimate]
Rakefile | 2 +-
app/assets/documents/diaspora_jsxc/dep.json | 30 +-
app/assets/fonts/diaspora_jsxc/img/XMPP_logo.svg | 105 +
.../fonts/diaspora_jsxc/img/bookmark_black.svg | 57 +
.../fonts/diaspora_jsxc/img/bookmark_red.svg | 74 +
.../fonts/diaspora_jsxc/img/bookmark_white.svg | 58 +
.../img/camera_disabled_icon_black.svg | 67 +
.../img/camera_disabled_icon_white.svg | 67 +
.../fonts/diaspora_jsxc/img/camera_icon_black.svg | 36 +
.../fonts/diaspora_jsxc/img/camera_icon_grey.svg | 34 +
.../fonts/diaspora_jsxc/img/camera_icon_white.svg | 72 +
.../fonts/diaspora_jsxc/img/contact_black.svg | 58 +
.../fonts/diaspora_jsxc/img/contact_white.svg | 58 +
.../fonts/diaspora_jsxc/img/delete_black.svg | 4 +
.../fonts/diaspora_jsxc/img/delete_white.svg | 55 +
app/assets/fonts/diaspora_jsxc/img/edit_black.svg | 6 +
app/assets/fonts/diaspora_jsxc/img/edit_white.svg | 60 +
.../fonts/diaspora_jsxc/img/emotions/jabber.svg | 82 +
.../fonts/diaspora_jsxc/img/emotions/jsxc.svg | 197 +
.../fonts/diaspora_jsxc/img/emotions/klaus.svg | 101 +
.../fonts/diaspora_jsxc/img/emotions/owncloud.svg | 164 +
.../fonts/diaspora_jsxc/img/emotions/xmpp.svg | 170 +
.../img/filetypes/application-pdf.svg | 4 +
.../diaspora_jsxc/img/filetypes/application.svg | 6 +
.../fonts/diaspora_jsxc/img/filetypes/audio.svg | 4 +
.../fonts/diaspora_jsxc/img/filetypes/file.svg | 4 +
.../img/filetypes/folder-drag-accept.svg | 4 +
.../img/filetypes/folder-external.svg | 4 +
.../diaspora_jsxc/img/filetypes/folder-public.svg | 4 +
.../diaspora_jsxc/img/filetypes/folder-shared.svg | 4 +
.../diaspora_jsxc/img/filetypes/folder-starred.svg | 4 +
.../fonts/diaspora_jsxc/img/filetypes/folder.svg | 6 +
.../fonts/diaspora_jsxc/img/filetypes/image.svg | 4 +
.../img/filetypes/package-x-generic.svg | 6 +
.../diaspora_jsxc/img/filetypes/text-calendar.svg | 6 +
.../diaspora_jsxc/img/filetypes/text-code.svg | 4 +
.../diaspora_jsxc/img/filetypes/text-vcard.svg | 4 +
.../fonts/diaspora_jsxc/img/filetypes/text.svg | 4 +
.../fonts/diaspora_jsxc/img/filetypes/video.svg | 4 +
.../img/filetypes/x-office-document.svg | 4 +
.../img/filetypes/x-office-presentation.svg | 4 +
.../img/filetypes/x-office-spreadsheet.svg | 4 +
.../fonts/diaspora_jsxc/img/fullscreen_black.svg | 57 +
.../fonts/diaspora_jsxc/img/fullscreen_white.svg | 60 +
app/assets/fonts/diaspora_jsxc/img/gear_black.svg | 87 +
app/assets/fonts/diaspora_jsxc/img/gear_grey.svg | 87 +
app/assets/fonts/diaspora_jsxc/img/gear_white.svg | 86 +
app/assets/fonts/diaspora_jsxc/img/group_black.svg | 59 +
app/assets/fonts/diaspora_jsxc/img/group_grey.svg | 59 +
app/assets/fonts/diaspora_jsxc/img/group_white.svg | 58 +
.../fonts/diaspora_jsxc/img/groupcontact_black.svg | 57 +
.../fonts/diaspora_jsxc/img/groupcontact_white.svg | 57 +
.../fonts/diaspora_jsxc/img/hang_up_black.svg | 62 +
app/assets/fonts/diaspora_jsxc/img/hang_up_red.svg | 64 +
.../fonts/diaspora_jsxc/img/hang_up_white.svg | 64 +
app/assets/fonts/diaspora_jsxc/img/help_black.svg | 68 +
app/assets/fonts/diaspora_jsxc/img/help_white.svg | 68 +
app/assets/fonts/diaspora_jsxc/img/info_black.svg | 72 +
app/assets/fonts/diaspora_jsxc/img/info_white.svg | 72 +
app/assets/fonts/diaspora_jsxc/img/menu_black.svg | 12 +
app/assets/fonts/diaspora_jsxc/img/menu_white.svg | 54 +
app/assets/fonts/diaspora_jsxc/img/more_black.svg | 65 +
app/assets/fonts/diaspora_jsxc/img/more_white.svg | 65 +
.../diaspora_jsxc/img/padlock_close_green.svg | 86 +
.../fonts/diaspora_jsxc/img/padlock_close_grey.svg | 94 +
.../diaspora_jsxc/img/padlock_close_orange.svg | 94 +
.../fonts/diaspora_jsxc/img/padlock_open.svg | 39 +
.../fonts/diaspora_jsxc/img/padlock_open_black.svg | 38 +
.../img/padlock_open_disabled_black.svg | 67 +
.../fonts/diaspora_jsxc/img/padlock_open_grey.svg | 66 +
.../fonts/diaspora_jsxc/img/padlock_open_white.svg | 64 +
.../fonts/diaspora_jsxc/img/presence_away.svg | 57 +
.../fonts/diaspora_jsxc/img/presence_chat.svg | 65 +
.../fonts/diaspora_jsxc/img/presence_dnd.svg | 56 +
app/assets/fonts/diaspora_jsxc/img/presence_xa.svg | 69 +
app/assets/fonts/diaspora_jsxc/img/resize_gray.svg | 76 +
app/assets/fonts/diaspora_jsxc/img/smiley.svg | 71 +
.../diaspora_jsxc/img/speech_balloon_black.svg | 66 +
.../diaspora_jsxc/img/speech_balloon_white.svg | 66 +
app/assets/images/diaspora_jsxc/img/XMPP_logo.png | Bin 0 -> 9572 bytes
app/assets/images/diaspora_jsxc/img/edit.png | Bin 0 -> 610 bytes
.../img/filetypes/application-pdf.png | Bin 0 -> 892 bytes
.../diaspora_jsxc/img/filetypes/application.png | Bin 0 -> 805 bytes
.../images/diaspora_jsxc/img/filetypes/audio.png | Bin 0 -> 640 bytes
.../images/diaspora_jsxc/img/filetypes/file.png | Bin 0 -> 306 bytes
.../img/filetypes/folder-drag-accept.png | Bin 0 -> 283 bytes
.../img/filetypes/folder-external.png | Bin 0 -> 595 bytes
.../diaspora_jsxc/img/filetypes/folder-public.png | Bin 0 -> 693 bytes
.../diaspora_jsxc/img/filetypes/folder-shared.png | Bin 0 -> 655 bytes
.../diaspora_jsxc/img/filetypes/folder-starred.png | Bin 0 -> 655 bytes
.../images/diaspora_jsxc/img/filetypes/folder.png | Bin 0 -> 276 bytes
.../images/diaspora_jsxc/img/filetypes/image.png | Bin 0 -> 486 bytes
.../img/filetypes/package-x-generic.png | Bin 0 -> 302 bytes
.../diaspora_jsxc/img/filetypes/text-calendar.png | Bin 0 -> 570 bytes
.../diaspora_jsxc/img/filetypes/text-code.png | Bin 0 -> 591 bytes
.../diaspora_jsxc/img/filetypes/text-vcard.png | Bin 0 -> 889 bytes
.../images/diaspora_jsxc/img/filetypes/text.png | Bin 0 -> 382 bytes
.../images/diaspora_jsxc/img/filetypes/video.png | Bin 0 -> 318 bytes
.../img/filetypes/x-office-document.png | Bin 0 -> 380 bytes
.../img/filetypes/x-office-presentation.png | Bin 0 -> 259 bytes
.../img/filetypes/x-office-spreadsheet.png | Bin 0 -> 362 bytes
app/assets/images/diaspora_jsxc/img/loading.gif | Bin 0 -> 2767 bytes
.../images/diaspora_jsxc/img/presence_xa.png | Bin 0 -> 245 bytes
app/assets/images/diaspora_jsxc/img/smiley.png | Bin 0 -> 560 bytes
app/assets/javascripts/diaspora_jsxc.js | 2 +-
app/assets/javascripts/diaspora_jsxc/jsxc.dep.js | 34619 +++++++++++++++++++
.../javascripts/diaspora_jsxc/jsxc.dep.min.js | 143 +
app/assets/javascripts/diaspora_jsxc/jsxc.js | 2480 +-
app/assets/javascripts/diaspora_jsxc/lib/dsa-ww.js | 50 -
.../diaspora_jsxc/lib/jquery.fullscreen.js | 88 -
.../diaspora_jsxc/lib/jquery.slimscroll.js | 474 -
.../javascripts/diaspora_jsxc/lib/jsxc.dep.js | 33400 ------------------
.../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 -
.../javascripts/diaspora_jsxc/lib/strophe.caps.js | 275 -
.../javascripts/diaspora_jsxc/lib/strophe.disco.js | 232 -
.../strophe.jinglejs/strophe.jinglejs-bundle.js | 19092 ----------
.../javascripts/diaspora_jsxc/lib/strophe.js | 5153 ---
.../javascripts/diaspora_jsxc/lib/strophe.muc.js | 1020 -
.../javascripts/diaspora_jsxc/lib/strophe.vcard.js | 66 -
.../javascripts/diaspora_jsxc/lib/translation.js | 1 -
.../javascripts/diaspora_jsxc/sound/Ping1.js | 1 +
.../diaspora_jsxc/sound/Rotary-Phone6.js | 1 +
.../diaspora_jsxc/sound/incomingMessage.js | 1 +
app/assets/stylesheets/diaspora_jsxc.scss | 1 -
.../stylesheets/diaspora_jsxc/jquery.colorbox.scss | 189 -
app/assets/stylesheets/diaspora_jsxc/jsxc.scss | 657 +-
.../stylesheets/diaspora_jsxc/jsxc.webrtc.scss | 289 -
lib/rails-assets-diaspora_jsxc.rb | 10 +-
lib/rails-assets-diaspora_jsxc/version.rb | 2 +-
metadata.yml | 203 -
rails-assets-diaspora_jsxc.gemspec | 4 +-
rails-assets-diaspora_jsxc.json | 74 +
148 files changed, 41256 insertions(+), 76746 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rails-assets-diaspora-jsxc.git
More information about the Pkg-ruby-extras-commits
mailing list