Merge branch 'master' into plugins-refactor

.gitignore

@@ -15,7 +15,6 @@ analytics.js
 .sass-cache
 ruby
 bourbon
-Gemfile.lock
 
 Backbone.Overview
 tags
@@ -41,3 +40,11 @@ develop-eggs
 
 # OSX
 .DS_Store
+
+# Builds
+converse-no-locales-no-otr.js
+converse-no-locales-no-otr.min.js
+converse-no-otr.js
+converse-no-otr.min.js
+converse.nojquery.js
+converse.nojquery.min.js

Gemfile.lock

+GEM
+  remote: https://rubygems.org/
+  specs:
+    bourbon (4.2.1)
+      sass (~> 3.4)
+      thor
+    sass (3.4.13)
+    thor (0.19.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bourbon
+  sass (~> 3.3)

Makefile

@@ -16,7 +16,7 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./d
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./docs/source
 
-.PHONY: all help clean html epub changes linkcheck gettext po pot po2json merge release css minjs build dev-ruby
+.PHONY: all help clean html epub changes linkcheck gettext po pot po2json merge release css minjs build
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of the following:"
@@ -103,10 +103,10 @@ dev: stamp-bower stamp-bundler
 ########################################################################
 ## Builds
 
-css:: dev-ruby
+css:: stamp-bundler
 	$(SASS) -I .bundle/bin sass/converse.scss css/converse.css
 
-watch:: dev-ruby
+watch:: stamp-bundler
 	$(SASS) --watch -I .bundle/bin sass/converse.scss:css/converse.css
 
 jsmin:

README.rst

@@ -26,15 +26,16 @@ It has the following features:
 * In-band registration `XEP 77 <http://xmpp.org/extensions/xep-0077.html>`_
 * Contact rosters and groups
 * Contact subscriptions
-* Accept or decline contact requests
 * Roster item exchange `XEP 144 <http://xmpp.org/extensions/tmp/xep-0144-1.1.html>`_
 * Chat statuses (online, busy, away, offline)
 * Custom status messages
+* Typing and state notifications `XEP 85 <http://xmpp.org/extensions/xep-0085.html>`_
 * Messages appear in all connnected chat clients `XEP 280 <http://xmpp.org/extensions/xep-0280.html>`_
-* Typing and chat state notifications `XEP 85 <http://xmpp.org/extensions/xep-0085.html>`_
-* Third person messages (/me )
-* Translated into 16 languages
+* Third person "/me" messages `XEP 245 <http://xmpp.org/extensions/xep-0245.html>`_
+* XMPP Ping `XEP 199 <http://xmpp.org/extensions/xep-0199.html>`_
+* Client state indication `XEP 352 <http://xmpp.org/extensions/xep-0352.html>`_
 * Off-the-record encryption
+* Translated into 16 languages
 
 -----------
 Screencasts

bower.json

@@ -2,7 +2,7 @@
   "name": "converse.js",
   "description": "Web-based XMPP/Jabber chat client written in javascript",
   "version": "0.9.3",
-  "license": "MPL",
+  "license": "MPL-2.0",
   "devDependencies": {
     "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x",
     "otr": "0.2.12",

css/converse.css

@@ -32,11 +32,12 @@
   bottom: 0;
   direction: ltr;
   height: 35px;
-  left: 0;
+  left: auto;
   position: fixed;
-  right: 0;
+  right: 15px;
   z-index: 30;
   display: block;
+  width: auto;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
@@ -286,7 +287,8 @@
     content: "\2369"; }
   #conversejs .icon-wrench:before {
     content: "\e024"; }
-  #conversejs .icon-xa:before,
+  #conversejs .icon-xa:before {
+    content: "\e602"; }
   #conversejs .icon-unavailable:before,
   #conversejs .icon-offline:before {
     content: "\e002"; }
@@ -762,7 +764,8 @@
     display: block;
     margin-left: 5px; }
   #conversejs div.room-info {
-    clear: left; }
+    clear: left;
+    width: 100%; }
   #conversejs p.room-info {
     margin: 0;
     padding: 0;
@@ -793,7 +796,7 @@
     #conversejs dd.available-chatroom:hover {
       background-color: #E3C9C1; }
       #conversejs dd.available-chatroom:hover .room-info {
-        display: inline-block;
+        display: block;
         font-size: 14px; }
   #conversejs #converse-roster dd {
     border: none;

dev.html

@@ -53,7 +53,6 @@
     require(['converse'], function (converse) {
         converse.initialize({
             bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
-            i18n: locales['en'], // Refer to ./locale/locales.js to see which locales are supported
             keepalive: true,
             message_carbons: true,
             play_sounds: true,

docs/CHANGES.rst

@@ -4,12 +4,21 @@ Changelog
 0.9.4 (Unreleased)
 ------------------
 
-* Refactored in order to remove the strophe.roster.js dependency. [jcbrand]
+* #144 Add Ping funcionnality and Pong Handler [thierrytiti]
+* #389 Allow login panel placeholders and roster item 'Name' translations. [gbonvehi]
+* #415 closeAllChatBoxes is giving ReferenceError when 2 chats are open [nevcos, jcbrand]
+* Add automatic Away mode and XEP-0352 support [thierrytiti]
+* Add icon for XA status [thierrytiti]
+* Allow offline pretty status and placeholder for "Insert a smiley" to be translated [thierrytiti]
 * Bugfix. Manual login doesn't work when only websocket_url is set and not bosh_service_url. [jcbrand]
 * Bugfix. clearSessions during unload event would throw an error when not logged in. [gbonvehi]
 * Bugfix. wrong callback argument mapping in XmppStatus initialize: fullname is null [thierrytiti]
-* #389 Allow login panel placeholders and roster item 'Name' translations. [gbonvehi]
-* Add placeholder for "Insert a smiley" translation [thierrytiti]
+* CSS fix: position and width of the div #conversejs [thierrytiti]
+* CSS fix: room-info bug on hover after room description loaded [thierrytiti]
+* CSS: Fonts Path: editabable $font-path via sass/variables.scss [thierrytiti]
+* I18N: Autodetection of User Locale if no i18n setting is set. [thierrytiti]
+* MUC: missing toggle call handler and updated documentation about call. [thierrytiti]
+* Refactored in order to remove the strophe.roster.js dependency. [jcbrand]
 * Updated French translation [thierrytiti]
 
 0.9.3 (2015-05-01)

docs/source/configuration.rst

@@ -175,6 +175,27 @@ It should be used either with ``authentication`` set to ``anonymous`` or to
 If ``authentication`` is set to ``login``, then you will also need to provide a
 valid ``jid`` and ``password`` values.
 
+auto_away
+---------
+
+* Default:  ``0``
+
+This option can be used to let converse.js automatically change user presence
+
+This set the number a seconds before user presence become ``away``
+If the value if negative or ``0``, the function is disabled.
+
+auto_xa
+-------
+
+* Default:  ``0``
+
+This option can be used to let converse.js automatically change user presence
+
+This set the number a seconds before user presence become ``xa`` (eXtended Away)
+The value must be greater than ``auto_away``
+If the value if negative or ``0``, the function is disabled.
+
 auto_reconnect
 --------------
 
@@ -360,11 +381,25 @@ If set to ``true``, then don't show offline users.
 i18n
 ----
 
+* Default:  Auto-detection of the User/Browser language
+
+If no locale is matching available locales, the default is ``en``.
 Specify the locale/language. The language must be in the ``locales`` object. Refer to
 ``./locale/locales.js`` to see which locales are supported.
 
 .. _`play-sounds`:
 
+ping_interval
+-------------
+
+* Default:  ``300``
+
+Make ping to server in order to keep connection with server killing sessions after idle timeout.
+The ping are sent only if no messages are sent in the last ``ping_interval`` seconds
+You need to set the value to any positive value to enable this functionality.
+
+If you set this value to ``0`` or any negative value, il will disable this functionality.
+
 play_sounds
 -----------
 
@@ -525,7 +560,7 @@ Allows you to show or hide buttons on the chat boxes' toolbars.
     Provides a button with a picture of a telephone on it.
     When the call button is pressed, it will emit an event that can be used by a third-party library to initiate a call.::
 
-        converse.on('callButtonClicked', function(event, data) {
+        converse.listen.on('callButtonClicked', function(event, data) {
             console.log('Strophe connection is', data.connection);
             console.log('Bare buddy JID is', data.model.get('jid'));
             // ... Third-party library code ...

fonticons/demo-files/demo.css

@@ -108,9 +108,6 @@ p {
 .pvs, .pts {
 	padding-top: .25em;
 }
-.clearfix {
-	zoom: 1;
-}
 .unit {
 	float: left;
 }
@@ -141,6 +138,7 @@ p {
 	height: 1.5em;
 }
 #testDrive {
+	display: block;
 	padding-top: 24px;
 	line-height: 1.5;
 }

fonticons/fonts/icomoon.svg

@@ -98,4 +98,5 @@
 <glyph unicode="&#xe05a;" d="M0 272v-96c0-8.836 7.164-16 16-16h480c8.836 0 16 7.164 16 16v96c0 8.836-7.164 16-16 16h-480c-8.836 0-16-7.164-16-16z" />
 <glyph unicode="&#xe600;" d="M39.349 399.017c-17.206 0-31.051-13.844-31.051-31.051v-361.923c0-17.207 13.845-31.068 31.051-31.068h323.589c17.207 0 31.068 13.861 31.068 31.068v361.923c0 17.207-13.861 31.051-31.068 31.051h-323.589zM46.803 392.288h309.317c16.698 0 30.151-13.454 30.151-30.151v-118.928l-46.498-52.778h-269.841l-5.207-4.325-47.364-54.733-0.761 83.5 0.242 2.526c-0.109 1.043-0.173 2.092-0.173 3.166v141.571c0 16.698 13.437 30.152 30.134 30.152zM274.731 341.379c-27.38 0-49.578-22.182-49.578-49.561s22.198-49.578 49.578-49.578c27.38 0 49.578 22.198 49.578 49.578s-22.199 49.561-49.578 49.561zM125.65 133.691c0.425 0.010 0.853 0 1.28 0 27.38 0 49.56-22.181 49.56-49.56s-22.181-49.578-49.56-49.578c-27.38 0-49.578 22.199-49.578 49.578 0 26.952 21.51 48.882 48.298 49.56z" horiz-adv-x="410" />
 <glyph unicode="&#xe601;" d="M384 160v64h-160v64h160v64l96-96zM352 192v-128h-160v-96l-192 96v416h352v-160h-32v128h-256l128-64v-288h128v96z" />
+<glyph unicode="&#xe602;" d="M353.825-31.334c-7.731 0.603-18.904 2.467-26.955 4.5-31.274 7.894-61.113 27.811-80.623 53.813l-4.316 5.753-6.785 0.453c-3.732 0.249-9.418 0.76-12.637 1.137l-5.853 0.684-4.602-4.351c-42.045-39.748-93.922-58.769-167.866-61.551l-11.84-0.445v14.216l3.395 1.834c13.346 7.21 24.137 15.128 33.861 24.846 12.21 12.202 19.795 24.279 23.617 37.604 2.056 7.17 3.198 16.551 2.683 22.043-0.975 10.388-0.341 9.2-7.671 14.407-17.231 12.243-36.264 30.14-47.508 44.673-15.707 20.301-27.456 42.712-33.645 64.178-10.544 36.57-8.728 76.714 5.058 111.801 35.493 90.334 141.651 150.144 257.076 144.836 36.486-1.678 67.24-8.061 98.589-20.464 70.337-27.826 121.201-80.164 138.156-142.162 4.647-16.993 6.614-33.061 6.051-49.422-0.656-19.032-3.22-33.797-8.839-50.891l-2.351-7.154 1.998-5.519c12.073-33.353 12.431-69.262 1.027-103.235-3.092-9.213-11.693-26.695-17.157-34.877-14.281-21.379-32.64-38.055-55.062-50.013-23.134-12.337-52.597-18.66-77.8-16.696v0zM377.786 8.294c11.009 1.305 24.373 5.429 35.034 10.81 19.764 9.974 38.827 29.211 48.958 49.404 25.974 51.769 9.822 114.569-37.703 146.593-11.748 7.916-25.447 13.569-40.299 16.629-10.827 2.231-29.448 2.262-40.399 0.069-73.502-14.72-112.105-95.584-78.077-163.556 12.747-25.462 36.724-46.281 63.726-55.334 15.912-5.334 30.803-6.743 48.76-4.614v0zM375.29 80.832l-30.783 31.428v84.055h37.938v-67.702l24.959-25.536c13.728-14.045 24.952-25.75 24.943-26.012s-5.924-6.592-13.145-14.067l-13.13-13.591-30.783 31.428zM168.934 79.403c2.823 2.651 7.016 6.212 9.318 7.912 9.934 7.339 23.738 12.284 34.286 12.284h3.566l-0.527 5.169c-0.906 8.889-0.505 29.149 0.744 37.519 4.928 33.042 18.965 61.7 41.608 84.95 12.924 13.27 25.206 22.282 40.984 30.072 19.443 9.6 37.712 14.121 59.903 14.825 29.371 0.931 55.94-6.053 81.034-21.303l7.155-4.348v2.429c-0.006 3.828-1.878 14.427-3.697 20.908-6.327 22.552-20.584 44.728-39.897 62.057-30.675 27.524-68.606 44.101-116.477 50.902-10.048 1.428-39.526 2.019-50.95 1.022-46.279-4.039-86.225-19.189-119.439-45.298-6.522-5.127-21.262-20.093-26.063-26.464-27.791-36.876-33.073-78.923-14.783-117.696 10.785-22.863 29.244-43.615 53.472-60.116 10.876-7.408 18.928-16.449 24.006-26.957 3.623-7.498 5.441-14.452 6.362-24.327 0.394-4.229 0.855-8.399 1.024-9.265 0.303-1.552 0.329-1.557 1.774-0.336 0.806 0.682 3.776 3.409 6.599 6.060h-0.002z" />
 </font></defs></svg>
\ No newline at end of file

fonticons/style.css

 @font-face {
 	font-family: 'icomoon';
-	src:url('fonts/icomoon.eot?-mnoxh0');
-	src:url('fonts/icomoon.eot?#iefix-mnoxh0') format('embedded-opentype'),
-		url('fonts/icomoon.woff?-mnoxh0') format('woff'),
-		url('fonts/icomoon.ttf?-mnoxh0') format('truetype'),
-		url('fonts/icomoon.svg?-mnoxh0#icomoon') format('svg');
+	src:url('fonts/icomoon.eot?dvaucx');
+	src:url('fonts/icomoon.eot?#iefixdvaucx') format('embedded-opentype'),
+		url('fonts/icomoon.ttf?dvaucx') format('truetype'),
+		url('fonts/icomoon.woff?dvaucx') format('woff'),
+		url('fonts/icomoon.svg?dvaucx#icomoon') format('svg');
 	font-weight: normal;
 	font-style: normal;
 }
@@ -23,276 +23,279 @@
 	-moz-osx-font-smoothing: grayscale;
 }
 
-#conversejs .icon-conversejs:before {
+.icon-xa:before {
+	content: "\e602";
+}
+.icon-conversejs:before {
 	content: "\e600";
 }
-#conversejs .icon-closed:before {
+.icon-closed:before {
 	content: "\25ba";
 }
-#conversejs .icon-opened:before {
+.icon-opened:before {
 	content: "\25bc";
 }
-#conversejs .icon-checkmark:before {
+.icon-checkmark:before {
 	content: "\2713";
 }
-#conversejs .icon-home:before {
+.icon-home:before {
 	content: "\e000";
 }
-#conversejs .icon-pencil:before {
+.icon-pencil:before {
 	content: "\270e";
 }
-#conversejs .icon-camera:before {
+.icon-camera:before {
 	content: "\e003";
 }
-#conversejs .icon-camera-2:before {
+.icon-camera-2:before {
 	content: "\2616";
 }
-#conversejs .icon-play:before {
+.icon-play:before {
 	content: "\25d9";
 }
-#conversejs .icon-music:before {
+.icon-music:before {
 	content: "\266b";
 }
-#conversejs .icon-headphones:before {
+.icon-headphones:before {
 	content: "\266c";
 }
-#conversejs .icon-phone:before {
+.icon-phone:before {
 	content: "\260f";
 }
-#conversejs .icon-phone-hang-up:before {
+.icon-phone-hang-up:before {
 	content: "\260e";
 }
-#conversejs .icon-address-book:before {
+.icon-address-book:before {
 	content: "\270f";
 }
-#conversejs .icon-notebook:before {
+.icon-notebook:before {
 	content: "\2710";
 }
-#conversejs .icon-envelop:before {
+.icon-envelop:before {
 	content: "\2709";
 }
-#conversejs .icon-pushpin:before {
+.icon-pushpin:before {
 	content: "\e012";
 }
-#conversejs .icon-online:before {
+.icon-online:before {
 	content: "\25fc";
 }
-#conversejs .icon-away:before {
+.icon-away:before {
 	content: "\25fb";
 }
-#conversejs .icon-bubbles:before {
+.icon-bubbles:before {
 	content: "\e015";
 }
-#conversejs .icon-bubbles2:before {
+.icon-bubbles2:before {
 	content: "\e016";
 }
-#conversejs .icon-bubbles3:before {
+.icon-bubbles3:before {
 	content: "\e017";
 }
-#conversejs .icon-user:before {
+.icon-user:before {
 	content: "\e01a";
 }
-#conversejs .icon-hide-users:before {
+.icon-hide-users:before {
 	content: "\e01c";
 }
-#conversejs .icon-show-users:before {
+.icon-show-users:before {
 	content: "\e01e";
 }
-#conversejs .icon-users:before {
+.icon-users:before {
 	content: "\e01b";
 }
-#conversejs .icon-quotes-left:before {
+.icon-quotes-left:before {
 	content: "\e01d";
 }
-#conversejs .icon-spinner:before {
+.icon-spinner:before {
 	content: "\231b";
 }
-#conversejs .icon-search:before {
+.icon-search:before {
 	content: "\e021";
 }
-#conversejs .icon-cogs:before {
+.icon-cogs:before {
 	content: "\e022";
 }
-#conversejs .icon-wrench:before {
+.icon-wrench:before {
 	content: "\e024";
 }
-#conversejs .icon-unlocked:before {
+.icon-unlocked:before {
 	content: "\e025";
 }
-#conversejs .icon-lock:before {
+.icon-lock:before {
 	content: "\e026";
 }
-#conversejs .icon-lock-2:before {
+.icon-lock-2:before {
 	content: "\e027";
 }
-#conversejs .icon-key:before {
+.icon-key:before {
 	content: "\e028";
 }
-#conversejs .icon-key-2:before {
+.icon-key-2:before {
 	content: "\e029";
 }
-#conversejs .icon-zoomout:before {
+.icon-zoomout:before {
 	content: "\e02a";
 }
-#conversejs .icon-zoomin:before {
+.icon-zoomin:before {
 	content: "\e02b";
 }
-#conversejs .icon-cog:before {
+.icon-cog:before {
 	content: "\e02f";
 }
-#conversejs .icon-remove:before {
+.icon-remove:before {
 	content: "\e02d";
 }
-#conversejs .icon-eye:before {
+.icon-eye:before {
 	content: "\e030";
 }
-#conversejs .icon-eye-blocked:before {
+.icon-eye-blocked:before {
 	content: "\e031";
 }
-#conversejs .icon-attachment:before {
+.icon-attachment:before {
 	content: "\e032";
 }
-#conversejs .icon-globe:before {
+.icon-globe:before {
 	content: "\e033";
 }
-#conversejs .icon-heart:before {
+.icon-heart:before {
 	content: "\2764";
 }
-#conversejs .icon-happy:before {
+.icon-happy:before {
 	content: "\263b";
 }
-#conversejs .icon-thumbs-up:before {
+.icon-thumbs-up:before {
 	content: "\261d";
 }
-#conversejs .icon-smiley:before {
+.icon-smiley:before {
 	content: "\263a";
 }
-#conversejs .icon-tongue:before {
+.icon-tongue:before {
 	content: "\e038";
 }
-#conversejs .icon-sad:before {
+.icon-sad:before {
 	content: "\2639";
 }
-#conversejs .icon-wink:before {
+.icon-wink:before {
 	content: "\e03a";
 }
-#conversejs .icon-wondering:before {
+.icon-wondering:before {
 	content: "\2369";
 }
-#conversejs .icon-confused:before {
+.icon-confused:before {
 	content: "\2368";
 }
-#conversejs .icon-shocked:before {
+.icon-shocked:before {
 	content: "\2364";
 }
-#conversejs .icon-evil:before {
+.icon-evil:before {
 	content: "\261f";
 }
-#conversejs .icon-angry:before {
+.icon-angry:before {
 	content: "\e03f";
 }
-#conversejs .icon-cool:before {
+.icon-cool:before {
 	content: "\e040";
 }
-#conversejs .icon-grin:before {
+.icon-grin:before {
 	content: "\e041";
 }
-#conversejs .icon-info:before {
+.icon-info:before {
 	content: "\2360";
 }
-#conversejs .icon-notification:before {
+.icon-notification:before {
 	content: "\e01f";
 }
-#conversejs .icon-warning:before {
+.icon-warning:before {
 	content: "\26a0";
 }
-#conversejs .icon-spell-check:before {
+.icon-spell-check:before {
 	content: "\e045";
 }
-#conversejs .icon-volume-high:before {
+.icon-volume-high:before {
 	content: "\e046";
 }
-#conversejs .icon-volume-medium:before {
+.icon-volume-medium:before {
 	content: "\e047";
 }
-#conversejs .icon-volume-low:before {
+.icon-volume-low:before {
 	content: "\e048";
 }
-#conversejs .icon-volume-mute:before {
+.icon-volume-mute:before {
 	content: "\e049";
 }
-#conversejs .icon-volume-mute2:before {
+.icon-volume-mute2:before {
 	content: "\e04a";
 }
-#conversejs .icon-volume-decrease:before {
+.icon-volume-decrease:before {
 	content: "\e04b";
 }
-#conversejs .icon-volume-increase:before {
+.icon-volume-increase:before {
 	content: "\e04c";
 }
-#conversejs .icon-bold:before {
+.icon-bold:before {
 	content: "\e04d";
 }
-#conversejs .icon-underline:before {
+.icon-underline:before {
 	content: "\e04e";
 }
-#conversejs .icon-italic:before {
+.icon-italic:before {
 	content: "\e04f";
 }
-#conversejs .icon-strikethrough:before {
+.icon-strikethrough:before {
 	content: "\e050";
 }
-#conversejs .icon-newtab:before {
+.icon-newtab:before {
 	content: "\e053";
 }
-#conversejs .icon-youtube:before {
+.icon-youtube:before {
 	content: "\e055";
 }
-#conversejs .icon-close:before {
+.icon-close:before {
 	content: "\2715";
 }
-#conversejs .icon-blocked:before {
+.icon-blocked:before {
 	content: "\2718";
 }
-#conversejs .icon-cancel-circle:before {
+.icon-cancel-circle:before {
 	content: "\e058";
 }
-#conversejs .icon-minus:before {
+.icon-minus:before {
 	content: "\e05a";
 }
-#conversejs .icon-plus:before {
+.icon-plus:before {
 	content: "\271a";
 }
-#conversejs .icon-checkbox-checked:before {
+.icon-checkbox-checked:before {
 	content: "\2611";
 }
-#conversejs .icon-checkbox-unchecked:before {
+.icon-checkbox-unchecked:before {
 	content: "\2b27";
 }
-#conversejs .icon-checkbox-partial:before {
+.icon-checkbox-partial:before {
 	content: "\2b28";
 }
-#conversejs .icon-radio-checked:before {
+.icon-radio-checked:before {
 	content: "\2b26";
 }
-#conversejs .icon-radio-unchecked:before {
+.icon-radio-unchecked:before {
 	content: "\2b25";
 }
-#conversejs .icon-room-info:before {
+.icon-room-info:before {
 	content: "\e059";
 }
-#conversejs .icon-newspaper:before {
+.icon-newspaper:before {
 	content: "\e001";
 }
-#conversejs .icon-image:before {
+.icon-image:before {
 	content: "\2b14";
 }
-#conversejs .icon-offline:before {
+.icon-offline:before {
 	content: "\e002";
 }
-#conversejs .icon-busy:before {
+.icon-busy:before {
 	content: "\e004";
 }
-#conversejs .icon-exit:before {
+.icon-exit:before {
 	content: "\e601";
 }

index.html

@@ -144,18 +144,22 @@
                         <ul class="features">
                             <li>Single-user chat</li>
                             <li>Multi-user chatrooms (<a href="http://xmpp.org/extensions/xep-0045.html" target="_blank">XEP 45</a>)</li>
+                            <li>Direct invitations to chat rooms (<a href="http://xmpp.org/extensions/xep-0249.html" target="_blank">XEP 249</a>)</li>
                             <li>vCard support (<a href="http://xmpp.org/extensions/xep-0054.html" target="_blank">XEP 54</a>)</li>
                             <li>Service discovery (<a href="http://xmpp.org/extensions/xep-0030.html" target="_blank">XEP 30</a>)</li>
+                            <li>In-band registration (<a href="http://xmpp.org/extensions/xep-0077.html" target="_blank">XEP 77</a>)</li>
                             <li>Contact rosters and groups</li>
                             <li>Contact subscriptions</li>
-                            <li>Accept or decline contact requests</li>
                             <li>Roster item exchange (<a href="http://xmpp.org/extensions/tmp/xep-0144-1.1.html" target="_blank">XEP 144</a>)</li>
                             <li>Chat statuses (online, busy, away, offline)</li>
                             <li>Custom status messages</li>
-                            <li>Typing notifications</li>
-                            <li>Third person messages (/me )</li>
+                            <li>Typing and state notifications (<a href="http://xmpp.org/extensions/xep-0085.html" target="_blank">XEP 85</a>)</li>
+                            <li>Messages appear in all connected chat clients (<a href="http://xmpp.org/extensions/xep-0280.html" target="_blank">XEP 280</a>)</li>
+                            <li>Third person "/me" messages (<a href="http://xmpp.org/extensions/xep-0245.html" target="_blank">XEP 245</a>)</li>
+                            <li>XMPP Ping (<a href="http://xmpp.org/extensions/xep-0199.html" target="_blank">XEP 199</a>)</li>
+                            <li>Client state indication (<a href="http://xmpp.org/extensions/xep-0352.html" target="_blank">XEP 352</a>)</li>A
+                            <li>Off-the-record encryption</li>
                             <li>Translated into 16 languages</li>
-                            <li>Off-the-record encryption
                         </ul>
                 </div>
                 <div class="col-lg-4">
@@ -251,7 +255,6 @@
         })();
         converse.initialize({
             bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
-            i18n: locales['en'], // Refer to ./locale/locales.js to see which locales are supported
             keepalive: true,
             message_carbons: true,
             play_sounds: true,

main.js

@@ -38,6 +38,7 @@ require.config({
         "strophe.disco":            "components/strophejs-plugins/disco/strophe.disco",
         "strophe.roster":           "src/strophe.roster",
         "strophe.vcard":            "src/strophe.vcard",
+        "strophe.ping":             "src/strophe.ping",
         "text":                     'components/requirejs-text/text',
         "tpl":                      'components/requirejs-tpl-jcbrand/tpl',
         "typeahead":                "components/typeahead.js/index",
@@ -170,7 +171,8 @@ require.config({
         'strophe.disco':        { deps: ['strophe'] },
         'strophe.register':     { deps: ['strophe'] },
         'strophe.roster':       { deps: ['strophe'] },
-        'strophe.vcard':        { deps: ['strophe'] }
+        'strophe.vcard':        { deps: ['strophe'] },
+        'strophe.ping':         { deps: ['strophe'] }
     }
 });
 

non_amd.html

@@ -35,6 +35,7 @@
     <script type="text/javascript" src="src/strophe.roster.js"></script>
     <script type="text/javascript" src="components/strophejs-plugins/vcard/strophe.vcard.js"></script>
     <script type="text/javascript" src="components/strophejs-plugins/disco/strophe.disco.js"></script>
+	<script type="text/javascript" src="src/strophe.ping.js"></script>
     <script type="text/javascript" src="components/underscore/underscore.js"></script>
     <script type="text/javascript" src="components/backbone//backbone.js"></script>
     <script type="text/javascript" src="components/backbone.browserStorage/backbone.browserStorage.js"></script>

sass/variables.scss

@@ -37,3 +37,4 @@
   $mobile-chat-width: 100%;
   $mobile-chat-height: 400px;
 
+  $font-path: "../fonticons/fonts/";

src/deps-full.js

@@ -6,6 +6,7 @@ define("converse-dependencies", [
     "strophe",
     "strophe.vcard",
     "strophe.disco",
+    "strophe.ping",
     "backbone.browserStorage",
     "backbone.overview",
     "jquery.browser",

src/deps-no-otr.js

@@ -5,6 +5,7 @@ define("converse-dependencies", [
     "strophe",
     "strophe.vcard",
     "strophe.disco",
+    "strophe.ping",
     "backbone.browserStorage",
     "backbone.overview",
     "jquery.browser",