New release: 3.1.0

CHANGES.md

 # Changelog
 
-## 3.1.0 (Unreleased)
+## 3.1.0 ((2017-07-05))
 
 ### API changes
 - Deprecate the `updateSettings` method in favour of

Makefile

@@ -59,7 +59,7 @@ serve_bg: dev
 ########################################################################
 ## Translation machinery
 
-GETTEXT = xgettext --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot src/*.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=3.0.2 -c
+GETTEXT = xgettext --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot src/*.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=3.1.0 -c
 
 .PHONY: pot
 pot:
@@ -87,7 +87,7 @@ release:
 	sed -ri s/v[0-9]\+\.[0-9]\+\.[0-9]\+\.tar\.gz/v$(VERSION)\.tar\.gz/ index.html
 	sed -ri s/version\ =\ \'[0-9]\+\.[0-9]\+\.[0-9]\+\'/version\ =\ \'$(VERSION)\'/ docs/source/conf.py
 	sed -ri s/release\ =\ \'[0-9]\+\.[0-9]\+\.[0-9]\+\'/release\ =\ \'$(VERSION)\'/ docs/source/conf.py
-	sed -ri "s/(Unreleased)/(`date +%Y-%m-%d`)/" docs/CHANGES.md
+	sed -ri "s/(Unreleased)/(`date +%Y-%m-%d`)/" CHANGES.md
 	make pot
 	make po
 	make po2json

bower.json

 {
   "name": "converse.js",
   "description": "Web-based XMPP/Jabber chat client written in javascript",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "devDependencies": {},
   "dependencies": {},

css/converse.css

@@ -1350,7 +1350,7 @@
   #converse-embedded-chat form.pure-form.converse-form,
   #conversejs form.pure-form.converse-form {
     background: white;
-    padding: 0 1em; }
+    padding: 1em; }
     #converse-embedded-chat form.pure-form.converse-form legend,
     #conversejs form.pure-form.converse-form legend {
       color: #818479; }
@@ -1835,6 +1835,8 @@
 
 #conversejs #controlbox {
   margin-right: 1em; }
+  #conversejs #controlbox .pure-form.converse-form {
+    padding: 0; }
   @media screen and (max-width: 480px) {
     #conversejs #controlbox {
       margin: 0; } }
@@ -2532,7 +2534,8 @@
       #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chatroom-form-container,
       #conversejs .chatroom .box-flyout .chatroom-body .chatroom-form-container {
         background-color: white;
-        border-radius: 4px;
+        border-bottom-left-radius: 4px;
+        border-bottom-right-radius: 4px;
         border: 0;
         color: #818479;
         font-size: 14px;

css/inverse.css

@@ -1350,7 +1350,7 @@
   #converse-embedded-chat form.pure-form.converse-form,
   #conversejs form.pure-form.converse-form {
     background: white;
-    padding: 0 1em; }
+    padding: 1em; }
     #converse-embedded-chat form.pure-form.converse-form legend,
     #conversejs form.pure-form.converse-form legend {
       color: #818479; }
@@ -1919,6 +1919,8 @@ body {
 
 #conversejs #controlbox {
   margin-right: 1em; }
+  #conversejs #controlbox .pure-form.converse-form {
+    padding: 0; }
   @media screen and (max-width: 480px) {
     #conversejs #controlbox {
       margin: 0; } }
@@ -2657,7 +2659,8 @@ body {
       #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chatroom-form-container,
       #conversejs .chatroom .box-flyout .chatroom-body .chatroom-form-container {
         background-color: white;
-        border-radius: 7px;
+        border-bottom-left-radius: 7px;
+        border-bottom-right-radius: 7px;
         border: 0;
         color: #818479;
         font-size: 16px;

docs/source/conf.py

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

index.html

@@ -12,7 +12,7 @@
     <link type="text/css" rel="stylesheet" media="screen" href="node_modules/bootstrap/dist/css/bootstrap.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="node_modules/font-awesome/css/font-awesome.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="css/theme.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
     <script type="text/javascript" src="analytics.js"></script>
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
     <![if gte IE 9]>

locale/af/LC_MESSAGES/converse.json

@@ -39,25 +39,21 @@
             null,
             "Klik om die boekmerklys te skakel"
          ],
-         "Bookmarked Rooms": [
-            null,
-            "Kletskamerboekmerke"
-         ],
          "Are you sure you want to remove the bookmark \"%1$s\"?": [
             null,
             "Is u seker u wil die boekmerk \"%1$s\" verwyder?"
          ],
-         "Click to open this room": [
+         "Remove this bookmark": [
             null,
-            "Klik om hierdie kletskamer te open"
+            "Verwyder hierdie boekmerk"
          ],
          "Show more information on this room": [
             null,
             "Wys meer inligting aangaande hierdie kletskamer"
          ],
-         "Remove this bookmark": [
+         "Click to open this room": [
             null,
-            "Verwyder hierdie boekmerk"
+            "Klik om hierdie kletskamer te open"
          ],
          "You have unread messages": [
             null,
@@ -231,6 +227,14 @@
             null,
             "Meld af"
          ],
+         "Click to add new chat contacts": [
+            null,
+            "Klik om nuwe kletskontakte by te voeg"
+         ],
+         "Add a contact": [
+            null,
+            "Voeg 'n kontak by"
+         ],
          "Contact name": [
             null,
             "Kontaknaam"
@@ -247,14 +251,6 @@
             null,
             "Voeg by"
          ],
-         "Click to add new chat contacts": [
-            null,
-            "Klik om nuwe kletskontakte by te voeg"
-         ],
-         "Add a contact": [
-            null,
-            "Voeg 'n kontak by"
-         ],
          "No users found": [
             null,
             "Geen gebruikers gevind"
@@ -1059,6 +1055,10 @@
             null,
             "Enige"
          ],
+         "Unread": [
+            null,
+            ""
+         ],
          "Chatty": [
             null,
             "Geselserig"
@@ -1067,18 +1067,6 @@
             null,
             "Weg vir langer"
          ],
-         "Click to remove this contact": [
-            null,
-            "Klik om hierdie kontak te verwyder"
-         ],
-         "Click to accept this contact request": [
-            null,
-            "Klik om hierdie kontakversoek te aanvaar"
-         ],
-         "Click to decline this contact request": [
-            null,
-            "Klik om hierdie kontakversoek te weier"
-         ],
          "Click to chat with this contact": [
             null,
             "Klik om met hierdie kontak te klets"

locale/ca/LC_MESSAGES/converse.json

@@ -31,21 +31,21 @@
             null,
             "Cancel·la"
          ],
-         "Bookmarked Rooms": [
+         "Bookmarks": [
             null,
             ""
          ],
-         "Click to open this room": [
+         "Remove this bookmark": [
             null,
-            "Feu clic per obrir aquesta sala"
+            ""
          ],
          "Show more information on this room": [
             null,
             "Mostra més informació d'aquesta sala"
          ],
-         "Remove this bookmark": [
+         "Click to open this room": [
             null,
-            ""
+            "Feu clic per obrir aquesta sala"
          ],
          "Close this chat box": [
             null,
@@ -211,6 +211,14 @@
             null,
             "Tanca la sessió"
          ],
+         "Click to add new chat contacts": [
+            null,
+            "Feu clic per afegir contactes nous al xat"
+         ],
+         "Add a contact": [
+            null,
+            "Afegeix un contacte"
+         ],
          "Contact name": [
             null,
             "Nom del contacte"
@@ -223,14 +231,6 @@
             null,
             "Afegeix"
          ],
-         "Click to add new chat contacts": [
-            null,
-            "Feu clic per afegir contactes nous al xat"
-         ],
-         "Add a contact": [
-            null,
-            "Afegeix un contacte"
-         ],
          "No users found": [
             null,
             "No s'ha trobat cap usuari"
@@ -839,25 +839,17 @@
             null,
             ""
          ],
-         "Chatty": [
+         "Unread": [
             null,
             ""
          ],
-         "Extended Away": [
+         "Chatty": [
             null,
             ""
          ],
-         "Click to remove this contact": [
-            null,
-            "Feu clic per eliminar aquest contacte"
-         ],
-         "Click to accept this contact request": [
-            null,
-            "Feu clic per acceptar aquesta sol·licitud de contacte"
-         ],
-         "Click to decline this contact request": [
+         "Extended Away": [
             null,
-            "Feu clic per rebutjar aquesta sol·licitud de contacte"
+            ""
          ],
          "Click to chat with this contact": [
             null,

locale/es/LC_MESSAGES/converse.json

@@ -35,21 +35,21 @@
             null,
             ""
          ],
-         "Bookmarked Rooms": [
+         "Bookmarks": [
             null,
             ""
          ],
-         "Click to open this room": [
+         "Remove this bookmark": [
             null,
-            "Haga click para abrir esta sala"
+            ""
          ],
          "Show more information on this room": [
             null,
             "Mostrar más información en esta sala"
          ],
-         "Remove this bookmark": [
+         "Click to open this room": [
             null,
-            ""
+            "Haga click para abrir esta sala"
          ],
          "Personal message": [
             null,
@@ -175,6 +175,14 @@
             null,
             "Desconectado"
          ],
+         "Click to add new chat contacts": [
+            null,
+            "Haga click para agregar nuevos contactos al chat"
+         ],
+         "Add a contact": [
+            null,
+            "Agregar un contacto"
+         ],
          "Contact name": [
             null,
             "Nombre de contacto"
@@ -191,14 +199,6 @@
             null,
             "Agregar"
          ],
-         "Click to add new chat contacts": [
-            null,
-            "Haga click para agregar nuevos contactos al chat"
-         ],
-         "Add a contact": [
-            null,
-            "Agregar un contacto"
-         ],
          "No users found": [
             null,
             "Sin usuarios encontrados"
@@ -763,17 +763,17 @@
             null,
             ""
          ],
-         "Chatty": [
+         "Unread": [
             null,
             ""
          ],
-         "Extended Away": [
+         "Chatty": [
             null,
             ""
          ],
-         "Click to remove this contact": [
+         "Extended Away": [
             null,
-            "Haga click para eliminar este contacto"
+            ""
          ],
          "Click to chat with this contact": [
             null,

locale/fr/LC_MESSAGES/converse.json

@@ -39,25 +39,17 @@
             null,
             "Cliquer pour ouvrir la liste des salons"
          ],
-         "Bookmarked Rooms": [
-            null,
-            "Salons en marques-page"
-         ],
-         "Are you sure you want to remove the bookmark \"%1$s\"?": [
-            null,
-            "Voulez-vous vraiment supprimer ce marque-page ?"
-         ],
-         "Click to open this room": [
+         "Remove this bookmark": [
             null,
-            "Cliquer pour ouvrir ce salon"
+            "Supprimer ce marque-page"
          ],
          "Show more information on this room": [
             null,
             "Afficher davantage d’informations sur ce salon"
          ],
-         "Remove this bookmark": [
+         "Click to open this room": [
             null,
-            "Supprimer ce marque-page"
+            "Cliquer pour ouvrir ce salon"
          ],
          "You have unread messages": [
             null,
@@ -231,6 +223,14 @@
             null,
             "Se déconnecter"
          ],
+         "Click to add new chat contacts": [
+            null,
+            "Cliquez pour ajouter de nouveaux contacts"
+         ],
+         "Add a contact": [
+            null,
+            "Ajouter un contact"
+         ],
          "Contact name": [
             null,
             "Nom du contact"
@@ -247,14 +247,6 @@
             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é"
@@ -1015,25 +1007,17 @@
             null,
             "Aucun"
          ],
-         "Chatty": [
+         "Unread": [
             null,
             ""
          ],
-         "Extended Away": [
+         "Chatty": [
             null,
             ""
          ],
-         "Click to remove this contact": [
-            null,
-            "Cliquez pour supprimer ce contact"
-         ],
-         "Click to accept this contact request": [
-            null,
-            "Cliquez pour accepter la demande de ce contact"
-         ],
-         "Click to decline this contact request": [
+         "Extended Away": [
             null,
-            "Cliquez pour refuser la demande de ce contact"
+            ""
          ],
          "Click to chat with this contact": [
             null,

package.json

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

sass/_chatrooms.scss

@@ -183,7 +183,8 @@
                 }
                 .chatroom-form-container {
                     background-color: white;
-                    border-radius: $chatbox-border-radius;
+                    border-bottom-left-radius: $chatbox-border-radius;
+                    border-bottom-right-radius: $chatbox-border-radius;
                     border: 0;
                     color: $text-color;
                     font-size: $font-size;

sass/_controlbox.scss

 #conversejs {
     #controlbox {
+        .pure-form.converse-form {
+            padding: 0;
+        }
         margin-right: 2*$chat-gutter;
         @media screen and (max-width: $mobile-portrait-length) {
             margin: 0;

sass/_core.scss

@@ -183,7 +183,7 @@
     form {
         &.pure-form.converse-form {
             background: white;
-            padding: 0 1em;
+            padding: 1em;
             legend {
                 color: $text-color;
             }

src/start.frag

@@ -2,7 +2,7 @@
  *
  *  An XMPP chat client that runs in the browser.
  *
- *  Version: 3.0.2
+ *  Version: 3.1.0
  */
 
 /* jshint ignore:start */