Making a new 0.9.5 release.

.gitignore

@@ -49,6 +49,5 @@ builds/converse-no-otr.min.js
 builds/converse.js
 builds/converse.nojquery.js
 builds/converse.nojquery.min.js
-builds/converse.website-no-otr.min.js
 
 css/converse.css.map

Gruntfile.js

@@ -130,9 +130,7 @@ module.exports = function(grunt) {
              rjs + ' -o src/build-no-locales-no-otr.js && ' +
              rjs + ' -o src/build-no-locales-no-otr.js optimize=none out=builds/converse-no-locales-no-otr.js && ' +
              rjs + ' -o src/build-no-otr.js &&' +
-             rjs + ' -o src/build-no-otr.js optimize=none out=builds/converse-no-otr.js && ' +
-             rjs + ' -o src/build-website-no-otr.js &&' +
-             rjs + ' -o src/build-website.js', callback);
+             rjs + ' -o src/build-no-otr.js optimize=none out=builds/converse-no-otr.js', callback);
         // XXX: It might be possible to not have separate build config files. For example:
         // 'r.js -o src/build.js paths.converse-dependencies=src/deps-no-otr paths.locales=locale/nolocales out=builds/converse-no-locales-no-otr.min.js'
     });

Makefile

@@ -111,7 +111,7 @@ watch:: stamp-bundler
 	$(SASS) --watch -I ./components/bourbon/app/assets/stylesheets/ sass/converse.scss:css/converse.css
 
 jsmin:
-	./node_modules/requirejs/bin/r.js -o src/build.js && ./node_modules/requirejs/bin/r.js -o src/build-no-locales-no-otr.js && ./node_modules/requirejs/bin/r.js -o src/build-no-otr.js && ./node_modules/requirejs/bin/r.js -o src/build-website.js
+	$(GRUNT) jsmin
 
 cssmin: stamp-npm
 	$(GRUNT) cssmin

bower.json

 {
   "name": "converse.js",
   "description": "Web-based XMPP/Jabber chat client written in javascript",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "license": "MPL-2.0",
   "devDependencies": {
     "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x",
@@ -24,9 +24,7 @@
     "requirejs-tpl-jcbrand": "*",
     "momentjs": "~2.10.6",
     "jquery.browser": ">=0.0.7",
-    "jquery-easing-original": "https://raw.githubusercontent.com/jcbrand/jquery.easing/7de3458b1845a72c1f407debf6b223c8446396bf/jquery.easing.1.3.js",
     "bootstrap": "~3.2.0",
-    "bootstrapJS": "https://raw.githubusercontent.com/jcbrand/bootstrap/7d96a5f60d26c67b5348b270a775518b96a702c8/dist/js/bootstrap.js",
     "fontawesome": "~4.1.0",
     "typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js",
     "skeleton-sass": "~2.0.3",

builds/templates.js

@@ -6,6 +6,8 @@ var __t, __p = '', __e = _.escape;
 with (obj) {
 __p += '<div class="chat-message ' +
 ((__t = (extra_classes)) == null ? '' : __t) +
+'" data-isodate="' +
+((__t = (isodate)) == null ? '' : __t) +
 '">\n    <span class="chat-message-' +
 ((__t = (sender)) == null ? '' : __t) +
 '">' +
@@ -540,6 +542,8 @@ var __t, __p = '', __e = _.escape;
 with (obj) {
 __p += '<div class="chat-message ' +
 ((__t = (extra_classes)) == null ? '' : __t) +
+'" data-isodate="' +
+((__t = (isodate)) == null ? '' : __t) +
 '">\n    <span class="chat-message-' +
 ((__t = (sender)) == null ? '' : __t) +
 '">' +
@@ -558,7 +562,7 @@ this["templates"]["new_day"] = function(obj) {
 obj || (obj = {});
 var __t, __p = '', __e = _.escape;
 with (obj) {
-__p += '<time class="chat-date" datetime="' +
+__p += '<time class="chat-date" data-isodate="' +
 ((__t = (isodate)) == null ? '' : __t) +
 '">' +
 ((__t = (datestring)) == null ? '' : __t) +

docs/CHANGES.rst

 Changelog
 =========
 
-0.9.5 (Unreleased)
+0.9.5 (2015-08-24)
 ------------------
 
 * #306 XEP-0313: Message Archive Management [jcbrand]
 * #439 auto_login and keepalive not working [jcbrand]
 * #440 null added as resource to contact [jcbrand]
 * Add new event serviceDiscovered [jcbrand]
-* Add a new configuration setting `muc_history_max_stanzas`. [jcbrand]
+* Add a new configuration setting `muc_history_max_stanzas <https://conversejs.org/docs/html/configuration.html#muc_history_max_stanzas>`_. [jcbrand]
 
 0.9.4 (2015-07-04)
 ------------------

docs/source/conf.py

@@ -48,9 +48,9 @@ copyright = u'2014, JC Brand'
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.4'
+version = '0.9.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.9.4'
+release = '0.9.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

index.html

@@ -17,10 +17,10 @@
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
     <!-- Only for development: <script data-main="main" src="components/requirejs/require.js"></script> -->
     <![if gte IE 9]>
-        <script src="builds/converse.website.min.js"></script>
+        <script src="builds/converse.min.js"></script>
     <![endif]>
     <!--[if lt IE 9]>
-        <script src="builds/converse.website-no-otr.min.js"></script>
+        <script src="builds/converse-no-otr.min.js"></script>
     <![endif]-->
 </head>
 
@@ -239,6 +239,15 @@
             * website and converse.js itself is NOT dependent on it.
             */
             var $ = converse.env.jQuery;
+            $.extend( $.easing, {
+                easeInOutExpo: function (x, t, b, c, d) {
+                    if (t==0) return b;
+                    if (t==d) return b+c;
+                    if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
+                    return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
+                },
+            });
+
             $(window).scroll(function() {
                 if ($(".navbar").offset().top > 50) {
                     $(".navbar-fixed-top").addClass("top-nav-collapse");

locale/fr/LC_MESSAGES/converse.json

@@ -79,9 +79,9 @@
             null,
             "Groupes"
          ],
-         "Reconnecting": [
+         "Attempting to reconnect in 5 seconds": [
             null,
-            "Reconnexion"
+            ""
          ],
          "Error": [
             null,
@@ -225,7 +225,226 @@
          ],
          "Your messages are encrypted, but your contact has not been verified.": [
             null,
-            "Vos messges sont cryptés, mais votre contact n'a pas été vérifié\n\n#: converse.js:1556\nmsgid ",
+            "Vos messges sont cryptés, mais votre contact n'a pas été vérifié"
+         ],
+         "Your messages are encrypted and your contact verified.": [
+            null,
+            "Vos messages sont cryptés et votre contact est vérifié"
+         ],
+         "Your contact has closed their end of the private session, you should do the same": [
+            null,
+            "Votre contact a fermé la session privée de son côté, vous devriez le faire aussi"
+         ],
+         "Clear all messages": [
+            null,
+            "Supprimer tous les messages"
+         ],
+         "End encrypted conversation": [
+            null,
+            "Terminer la conversation cryptée"
+         ],
+         "Insert a smiley": [
+            null,
+            ""
+         ],
+         "Hide the list of participants": [
+            null,
+            "Cacher la liste des participants"
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            "Actualiser la conversation cryptée"
+         ],
+         "Start a call": [
+            null,
+            "Démarrer un appel"
+         ],
+         "Start encrypted conversation": [
+            null,
+            "Démarrer une conversation cryptée"
+         ],
+         "Verify with fingerprints": [
+            null,
+            "Vérifier par empreintes de sécurité"
+         ],
+         "Verify with SMP": [
+            null,
+            "Vérifier par Question/Réponse"
+         ],
+         "What's this?": [
+            null,
+            "Qu'est-ce qu'une conversation cryptée?"
+         ],
+         "Online": [
+            null,
+            "En ligne"
+         ],
+         "Busy": [
+            null,
+            "Occupé"
+         ],
+         "Away": [
+            null,
+            "Absent"
+         ],
+         "Offline": [
+            null,
+            "Déconnecté"
+         ],
+         "Log out": [
+            null,
+            "Se déconnecter"
+         ],
+         "Contact name": [
+            null,
+            "Nom du contact"
+         ],
+         "Search": [
+            null,
+            "Rechercher"
+         ],
+         "e.g. user@example.com": [
+            null,
+            ""
+         ],
+         "Add": [
+            null,
+            "Ajouter"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "Cliquez pour ajouter de nouveaux contacts"
+         ],
+         "Add a contact": [
+            null,
+            "Ajouter un contact"
+         ],
+         "No users found": [
+            null,
+            "Aucun utilisateur trouvé"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "Cliquer pour ajouter aux contacts"
+         ],
+         "Room name": [
+            null,
+            "Nom du salon"
+         ],
+         "Nickname": [
+            null,
+            "Alias"
+         ],
+         "Server": [
+            null,
+            "Serveur"
+         ],
+         "Join Room": [
+            null,
+            "Rejoindre"
+         ],
+         "Show rooms": [
+            null,
+            "Afficher les salons"
+         ],
+         "Rooms": [
+            null,
+            "Salons"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "Aucun salon dans %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Salons dans %1$s"
+         ],
+         "Click to open this room": [
+            null,
+            "Cliquer pour ouvrir ce salon"
+         ],
+         "Show more information on this room": [
+            null,
+            "Afficher davantage d'informations sur ce salon"
+         ],
+         "Description:": [
+            null,
+            "Description:"
+         ],
+         "Occupants:": [
+            null,
+            "Participants:"
+         ],
+         "Features:": [
+            null,
+            "Caractéristiques:"
+         ],
+         "Requires authentication": [
+            null,
+            "Nécessite une authentification"
+         ],
+         "Hidden": [
+            null,
+            "Masqué"
+         ],
+         "Requires an invitation": [
+            null,
+            "Nécessite une invitation"
+         ],
+         "Moderated": [
+            null,
+            "Modéré"
+         ],
+         "Non-anonymous": [
+            null,
+            "Non-anonyme"
+         ],
+         "Open room": [
+            null,
+            "Ouvrir un salon"
+         ],
+         "Permanent room": [
+            null,
+            "Salon permanent"
+         ],
+         "Public": [
+            null,
+            "Public"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Semi-anonyme"
+         ],
+         "Temporary room": [
+            null,
+            "Salon temporaire"
+         ],
+         "Unmoderated": [
+            null,
+            "Non modéré"
+         ],
+         "This user is a moderator": [
+            null,
+            "Cet utilisateur est modérateur"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "Cet utilisateur peut envoyer des messages dans ce salon"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "Cet utilisateur ne peut PAS envoyer de messages dans ce salon"
+         ],
+         "Invite...": [
+            null,
+            "Inviter..."
+         ],
+         "Occupants": [
+            null,
+            "Participants:"
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
             "Vous vous apprêtez à inviter %1$s dans le salon \"%2$s\". "
          ],
          "You may optionally include a message, explaining the reason for the invitation.": [
@@ -472,14 +691,30 @@
             null,
             "Cliquez pour discuter avec ce contact"
          ],
+         "Name": [
+            null,
+            ""
+         ],
          "Are you sure you want to remove this contact?": [
             null,
             "Êtes-vous sûr de vouloir supprimer ce contact?"
          ],
+         "Sorry, there was an error while trying to remove ": [
+            null,
+            ""
+         ],
          "Are you sure you want to decline this contact request?": [
             null,
             "Êtes-vous sûr de vouloir refuser la demande de ce contact?"
          ],
+         "Sorry, there was an error while trying to add ": [
+            null,
+            ""
+         ],
+         "This client does not allow presence subscriptions": [
+            null,
+            ""
+         ],
          "Type to filter": [
             null,
             "Filtrer"
@@ -580,6 +815,10 @@
             null,
             "Se connecter"
          ],
+         "user@server": [
+            null,
+            ""
+         ],
          "Sign in": [
             null,
             "S'inscrire"

main.js

@@ -17,9 +17,7 @@ require.config({
         "backbone":                 "components/backbone/backbone",
         "backbone.browserStorage":  "components/backbone.browserStorage/backbone.browserStorage",
         "backbone.overview":        "components/backbone.overview/backbone.overview",
-        "bootstrap":                "components/bootstrap/dist/js/bootstrap",           // XXX: Only required for https://conversejs.org website
-        "bootstrapJS":              "components/bootstrapJS/index",                     // XXX: Only required for https://conversejs.org website
-        "converse-dependencies":    "src/deps-website",
+        "converse-dependencies":    "src/deps-full",
         "converse-templates":       "src/templates",
         "eventemitter":             "components/otr/build/dep/eventemitter",
         "jquery":                   "components/jquery/dist/jquery",

package.json

 {
   "name": "converse.js",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Browser based XMPP instant messaging client",
   "main": "main.js",
   "directories": {

src/build-website-no-otr.js

-({
-    baseUrl: "../",
-    name: "components/almond/almond.js",
-    out: "../builds/converse.website-no-otr.min.js",
-    include: ['main'],
-    mainConfigFile: '../main.js',
-    paths: {
-        "converse-dependencies":    "src/deps-website-no-otr"
-    }
-})

src/build-website.js

-({
-    baseUrl: "../",
-    name: "components/almond/almond.js",
-    out: "../builds/converse.website.min.js",
-    include: ['main'],
-    mainConfigFile: '../main.js',
-    paths: {
-        "converse-dependencies":    "src/deps-website"
-    }
-})

src/deps-website-no-otr.js

-define("converse-dependencies", [
-    "jquery",
-    "utils",
-    "moment_with_locales",
-    "strophe",
-    "strophe.disco",
-    "strophe.ping",
-    "strophe.rsm",
-    "strophe.vcard",
-    "bootstrapJS", // XXX: Can be removed, only for https://conversejs.org
-    "backbone.browserStorage",
-    "backbone.overview",
-    "jquery.browser",
-    "jquery.easing", // XXX: Can be removed, only for https://conversejs.org
-    "typeahead"
-], function($, utils, moment, Strophe) {
-    return _.extend({
-        'underscore': _,
-        'jQuery': $,
-        'otr': otr,
-        'moment': moment,
-        'utils': utils
-    }, Strophe);
-});

src/deps-website.js

-define("converse-dependencies", [
-    "jquery",
-    "underscore",
-    "utils",
-    "otr",
-    "moment_with_locales",
-    "strophe",
-    "strophe.disco",
-    "strophe.ping",
-    "strophe.rsm",
-    "strophe.vcard",
-    "bootstrapJS", // XXX: Only for https://conversejs.org
-    "backbone.browserStorage",
-    "backbone.overview",
-    "jquery.browser",
-    "jquery.easing", // XXX: Only for https://conversejs.org
-    "typeahead"
-], function($, _, utils, otr, moment, Strophe) {
-    return _.extend({
-        'underscore': _,
-        'jQuery': $,
-        'otr': otr,
-        'moment': moment,
-        'utils': utils
-    }, Strophe);
-});