[Pkg-javascript-commits] [libjs-jsxc] 02/04: Merge tag 'upstream/2.1.5+dfsg'

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Fri Jan 29 08:31:24 UTC 2016


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

praveen pushed a commit to branch master
in repository libjs-jsxc.

commit b6f9b3b12f5bb05d546073aa2a3ddc1b8334e5d2
Merge: 3258f79 07cdc6d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Jan 29 13:06:28 2016 +0530

    Merge tag 'upstream/2.1.5+dfsg'
    
    Upstream version 2.1.5+dfsg
    
    # gpg: Signature made Friday 29 January 2016 01:06:23 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>"

 .bowerrc                                           |     4 +
 .gitignore                                         |    13 +
 .gitmodules                                        |    15 +
 .jsbeautifyrc                                      |     5 +
 .jshintrc                                          |    39 +
 CHANGELOG.md                                       |   251 +
 CONTRIBUTING.md                                    |     1 +
 Gruntfile.js                                       |   389 +
 README.md                                          |     7 +
 banner.js                                          |    12 +
 bower.json                                         |    32 +
 build/LICENSE                                      |    21 +
 build/css/jquery-ui.min.css                        |     4 +
 build/css/jquery.colorbox.css                      |   189 +
 build/css/jsxc.css                                 |  3515 ++
 build/css/jsxc.webrtc.css                          |   244 +
 build/css/magnific-popup.css                       |   374 +
 build/img/XMPP_logo.png                            |   Bin 0 -> 9572 bytes
 build/img/XMPP_logo.svg                            |   105 +
 build/img/bookmark_red.svg                         |    74 +
 build/img/camera_icon_grey.svg                     |    34 +
 build/img/camera_icon_white.svg                    |    72 +
 {img => build/img}/edit.png                        |   Bin
 {img => build/img}/emotions/angel.png              |   Bin
 {img => build/img}/emotions/angry.png              |   Bin
 {img => build/img}/emotions/beer.png               |   Bin
 {img => build/img}/emotions/biggrin.png            |   Bin
 {img => build/img}/emotions/crysad.png             |   Bin
 {img => build/img}/emotions/dead.png               |   Bin
 {img => build/img}/emotions/devil.png              |   Bin
 {img => build/img}/emotions/dontknow.png           |   Bin
 {img => build/img}/emotions/doubt.png              |   Bin
 {img => build/img}/emotions/grin.png               |   Bin
 {img => build/img}/emotions/kiss.png               |   Bin
 {img => build/img}/emotions/kissing.png            |   Bin
 {img => build/img}/emotions/lol.png                |   Bin
 {img => build/img}/emotions/love.png               |   Bin
 {img => build/img}/emotions/music.png              |   Bin
 {img => build/img}/emotions/nerv.png               |   Bin
 {img => build/img}/emotions/rose.png               |   Bin
 {img => build/img}/emotions/sad.png                |   Bin
 {img => build/img}/emotions/sick.png               |   Bin
 {img => build/img}/emotions/smile.png              |   Bin
 {img => build/img}/emotions/strange.png            |   Bin
 {img => build/img}/emotions/sunglassess.png        |   Bin
 {img => build/img}/emotions/surprised.png          |   Bin
 {img => build/img}/emotions/thumbsdown.png         |   Bin
 {img => build/img}/emotions/thumbsup.png           |   Bin
 {img => build/img}/emotions/tired.png              |   Bin
 {img => build/img}/emotions/tonguesmile.png        |   Bin
 {img => build/img}/emotions/weird.png              |   Bin
 {img => build/img}/emotions/wink.png               |   Bin
 {img => build/img}/emotions/xp.png                 |   Bin
 {img => build/img}/emotions/yesyes.png             |   Bin
 {img => build/img}/emotions/zip.png                |   Bin
 build/img/gear_grey.svg                            |    87 +
 build/img/gear_white.svg                           |    86 +
 build/img/group_grey.svg                           |    59 +
 build/img/group_white.svg                          |    58 +
 build/img/loading.gif                              |   Bin 0 -> 2767 bytes
 build/img/padlock_close_green.svg                  |    86 +
 build/img/padlock_close_grey.svg                   |    94 +
 build/img/padlock_close_orange.svg                 |    94 +
 build/img/padlock_open.svg                         |    39 +
 build/img/padlock_open_grey.svg                    |    66 +
 build/img/padlock_open_white.svg                   |    64 +
 build/img/resize_gray.svg                          |    76 +
 build/img/smiley.png                               |   Bin 0 -> 560 bytes
 build/img/speech_balloon_white.svg                 |    66 +
 build/jsxc.js                                      |  9705 +++++
 build/jsxc.min.js.map                              |     1 +
 build/lib/dsa-ww.js                                |    50 +
 build/lib/favico.js/favico.js                      |   851 +
 build/lib/i18next/release/i18next-latest.min.js    |     5 +
 build/lib/jquery.fullscreen.js                     |    88 +
 build/lib/jquery.slimscroll.js                     |   474 +
 build/lib/jsxc.dep.js                              | 35237 +++++++++++++++++++
 build/lib/jsxc.dep.min.js.map                      |     1 +
 .../magnific-popup/dist/jquery.magnific-popup.js   |  2060 ++
 .../dist/jquery.magnific-popup.min.js              |     4 +
 .../vendor => build/lib/otr/build/dep}/bigint.js   |     6 +-
 {lib => build/lib}/otr/build/dep/crypto.js         |     0
 {lib => build/lib}/otr/build/dep/eventemitter.js   |     0
 {lib => build/lib}/otr/build/dep/salsa20.js        |     0
 {lib => build/lib}/otr/build/dsa-webworker.js      |     0
 {lib => build/lib}/otr/build/otr.js                |    37 +-
 {lib => build/lib}/otr/build/sm-webworker.js       |     0
 {lib => build/lib}/otr/lib/const.js                |     0
 {lib => build/lib}/otr/lib/dsa-webworker.js        |    23 +-
 {lib => build/lib}/otr/lib/dsa.js                  |     0
 {lib => build/lib}/otr/lib/helpers.js              |     0
 {lib => build/lib}/otr/lib/sm-webworker.js         |    18 +-
 .../build/dep => build/lib/otr/vendor}/bigint.js   |     0
 {lib => build/lib}/otr/vendor/crypto.js            |     0
 {lib => build/lib}/otr/vendor/eventemitter.js      |     0
 {lib => build/lib}/otr/vendor/salsa20.js           |     0
 build/lib/strophe.bookmarks/index.js               |   116 +
 {lib => build/lib}/strophe.caps.js                 |    29 +-
 build/lib/strophe.disco.js                         |   232 +
 .../strophe.jinglejs/strophe.jinglejs-bundle.js    | 19092 ++++++++++
 build/lib/strophe.js                               |  5153 +++
 {lib => build/lib}/strophe.muc.js                  |     4 +-
 build/lib/strophe.vcard.js                         |    66 +
 build/lib/strophe.x/index.js                       |   845 +
 build/lib/translation.js                           |     1 +
 build/sound/Ping1.mp3                              |   Bin 0 -> 56841 bytes
 build/sound/Rotary-Phone6.mp3                      |   Bin 0 -> 114624 bytes
 build/sound/credential                             |    11 +
 build/sound/incomingMessage.wav                    |   Bin 0 -> 100452 bytes
 dep.json                                           |   104 +
 doc/global.html                                    |   353 +
 doc/index.html                                     |    63 +
 doc/jsxc.gui.dialog.html                           |   556 +
 doc/jsxc.gui.html                                  |  3413 ++
 doc/jsxc.gui.queryActions.html                     |   473 +
 doc/jsxc.gui.roster.html                           |  1542 +
 doc/jsxc.gui.template.html                         |   124 +
 doc/jsxc.gui.window.html                           |  2538 ++
 doc/jsxc.html                                      |  4452 +++
 doc/jsxc.l10n.html                                 |   124 +
 doc/jsxc.lib.gui.js.html                           |  2543 ++
 doc/jsxc.lib.js.html                               |   889 +
 doc/jsxc.lib.muc.js.html                           |  1525 +
 doc/jsxc.lib.notice.js.html                        |   166 +
 doc/jsxc.lib.notification.js.html                  |   324 +
 doc/jsxc.lib.options.js.html                       |   284 +
 doc/jsxc.lib.otr.js.html                           |   536 +
 doc/jsxc.lib.storage.js.html                       |   679 +
 doc/jsxc.lib.webrtc.js.html                        |  1049 +
 doc/jsxc.lib.xmpp.bookmarks.js.html                |   391 +
 doc/jsxc.lib.xmpp.js.html                          |  1248 +
 doc/jsxc.muc.html                                  |  3362 ++
 doc/jsxc.notification.html                         |  1265 +
 doc/jsxc.options.html                              |  2207 ++
 doc/jsxc.otr.html                                  |  2033 ++
 doc/jsxc.storage.html                              |  2338 ++
 doc/jsxc.webrtc.html                               |  3333 ++
 doc/jsxc.xmpp.bookmarks.html                       |  1796 +
 doc/jsxc.xmpp.carbons.html                         |   464 +
 doc/jsxc.xmpp.html                                 |  2766 ++
 doc/scripts/linenumber.js                          |    17 +
 doc/scripts/prettify/Apache-License-2.0.txt        |   202 +
 doc/scripts/prettify/lang-css.js                   |     2 +
 doc/scripts/prettify/prettify.js                   |    28 +
 doc/styles/jsdoc-default.css                       |   290 +
 doc/styles/prettify-jsdoc.css                      |   111 +
 doc/styles/prettify-tomorrow.css                   |   132 +
 example/ajax/getturncredentials.json               |     1 +
 example/css/bootstrap.min.css                      |     5 +
 example/css/example.css                            |    28 +
 example/dev.html                                   |   200 +
 example/favicon.ico                                |   Bin 0 -> 39315 bytes
 example/fonts/glyphicons-halflings-regular.eot     |   Bin 0 -> 20127 bytes
 example/fonts/glyphicons-halflings-regular.svg     |   288 +
 example/fonts/glyphicons-halflings-regular.ttf     |   Bin 0 -> 45404 bytes
 example/fonts/glyphicons-halflings-regular.woff    |   Bin 0 -> 23424 bytes
 example/fonts/glyphicons-halflings-regular.woff2   |   Bin 0 -> 18028 bytes
 example/index.html                                 |   200 +
 example/js/bootstrap.min.js                        |     7 +
 example/js/dev.js                                  |    75 +
 example/js/example.js                              |    75 +
 example/login.html                                 |    71 +
 img/bookmark_red.svg                               |    74 +
 img/edit.png                                       |   Bin
 img/emotions/angel.png                             |   Bin
 img/emotions/angry.png                             |   Bin
 img/emotions/beer.png                              |   Bin
 img/emotions/biggrin.png                           |   Bin
 img/emotions/crysad.png                            |   Bin
 img/emotions/dead.png                              |   Bin
 img/emotions/devil.png                             |   Bin
 img/emotions/dontknow.png                          |   Bin
 img/emotions/doubt.png                             |   Bin
 img/emotions/grin.png                              |   Bin
 img/emotions/kiss.png                              |   Bin
 img/emotions/kissing.png                           |   Bin
 img/emotions/lol.png                               |   Bin
 img/emotions/love.png                              |   Bin
 img/emotions/music.png                             |   Bin
 img/emotions/nerv.png                              |   Bin
 img/emotions/rose.png                              |   Bin
 img/emotions/sad.png                               |   Bin
 img/emotions/sick.png                              |   Bin
 img/emotions/smile.png                             |   Bin
 img/emotions/strange.png                           |   Bin
 img/emotions/sunglassess.png                       |   Bin
 img/emotions/surprised.png                         |   Bin
 img/emotions/thumbsdown.png                        |   Bin
 img/emotions/thumbsup.png                          |   Bin
 img/emotions/tired.png                             |   Bin
 img/emotions/tonguesmile.png                       |   Bin
 img/emotions/weird.png                             |   Bin
 img/emotions/wink.png                              |   Bin
 img/emotions/xp.png                                |   Bin
 img/emotions/yesyes.png                            |   Bin
 img/emotions/zip.png                               |   Bin
 img/group_grey.svg                                 |    59 +
 img/group_white.svg                                |    58 +
 img/resize_gray.svg                                |    76 +
 jsxc.css                                           |  1243 -
 jsxc.js                                            |  6925 ----
 jsxc.lib.js                                        |  5871 ---
 jsxc.lib.webrtc.js                                 |  1051 -
 jsxc.min.js.map                                    |     1 -
 jsxc.webrtc.css                                    |   379 -
 lib/jquery-ui.min.css                              |     4 +
 lib/jquery.colorbox.css                            |   189 +
 lib/jquery.mCustomScrollbar.scss                   |   241 +
 lib/jsxc.dep.js                                    | 16644 ---------
 lib/jsxc.dep.min.js.map                            |     1 -
 lib/strophe.caps.js                                |    29 +-
 lib/strophe.jingle/strophe.jingle.adapter.js       |   386 -
 lib/strophe.jingle/strophe.jingle.js               |   266 -
 lib/strophe.jingle/strophe.jingle.sdp.js           |   822 -
 lib/strophe.jingle/strophe.jingle.session.js       |   914 -
 lib/strophe.muc.js                                 |     4 +-
 locales/de.json                                    |   276 +
 locales/el.json                                    |   276 +
 locales/en.json                                    |   285 +
 locales/es.json                                    |   276 +
 locales/fr.json                                    |   276 +
 locales/it.json                                    |   276 +
 locales/nds.json                                   |   276 +
 locales/pl.json                                    |   276 +
 locales/pt-BR.json                                 |   276 +
 locales/ro.json                                    |   276 +
 locales/ru.json                                    |   276 +
 package.json                                       |    40 +
 pre-commit                                         |     3 +
 scss/_buddylist.scss                               |   181 +
 scss/_colors.scss                                  |   104 +
 scss/_dep.scss                                     |    55 +
 scss/_jsxc.scss                                    |   866 +
 scss/_modules.scss                                 |    26 +
 scss/_muc.scss                                     |   130 +
 scss/_roster.scss                                  |   196 +
 scss/_state.scss                                   |    31 +
 scss/_webrtc.scss                                  |   292 +
 scss/emoticons.scss                                |    15 +
 scss/jsxc.scss                                     |    15 +
 scss/jsxc.webrtc.scss                              |     3 +
 src/jsxc.intro.js                                  |     4 +
 src/jsxc.lib.gui.js                                |  2493 ++
 src/jsxc.lib.js                                    |   839 +
 src/jsxc.lib.muc.js                                |  1475 +
 src/jsxc.lib.notice.js                             |   116 +
 src/jsxc.lib.notification.js                       |   274 +
 src/jsxc.lib.options.js                            |   234 +
 src/jsxc.lib.otr.js                                |   486 +
 src/jsxc.lib.storage.js                            |   629 +
 src/jsxc.lib.webrtc.js                             |   999 +
 src/jsxc.lib.xmpp.bookmarks.js                     |   341 +
 src/jsxc.lib.xmpp.js                               |  1198 +
 src/jsxc.outro.js                                  |     1 +
 template/aboutDialog.html                          |    21 +
 template/alert.html                                |     4 +
 template/allowMediaAccess.html                     |     1 +
 template/approveDialog.html                        |     7 +
 template/authFailDialog.html                       |     5 +
 template/authenticationDialog.html                 |    63 +
 template/bookmarkDialog.html                       |    39 +
 template/chatWindow.html                           |    29 +
 template/confirmDialog.html                        |     4 +
 template/contactDialog.html                        |    23 +
 template/fingerprintsDialog.html                   |    11 +
 template/incomingCall.html                         |     7 +
 template/joinChat.html                             |    65 +
 template/loginBox.html                             |    22 +
 template/pleaseAccept.html                         |     1 +
 template/removeDialog.html                         |     5 +
 template/roster.html                               |    35 +
 template/rosterBuddy.html                          |    14 +
 template/selectionDialog.html                      |     5 +
 template/settings.html                             |   115 +
 template/vCard.html                                |     7 +
 template/videoWindow.html                          |    43 +
 template/waitAlert.html                            |     6 +
 template/windowList.html                           |     7 +
 278 files changed, 140371 insertions(+), 34552 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/libjs-jsxc.git



More information about the Pkg-javascript-commits mailing list