Merge branch 'master' into converse-omemo

.eslintrc.json

@@ -34,7 +34,7 @@
         "array-bracket-spacing": "off",
         "array-callback-return": "error",
         "arrow-body-style": "off",
-        "arrow-parens": "error",
+        "arrow-parens": "off",
         "arrow-spacing": "error",
         "block-scoped-var": "off",
         "block-spacing": "off",

CHANGES.md

@@ -7,6 +7,7 @@
 - #161 XEP-0363: HTTP File Upload
 - #194 Include entity capabilities in outgoing presence stanzas
 - #337 API call to update a VCard
+- #421 XEP-0308: Last Message Correction
 - #968 Use nickname from VCard when joining a room
 - #1091 There's now only one CSS file for all view modes.
 - #1094 Show room members who aren't currently online

README.md

@@ -5,7 +5,7 @@
 [![Bountysource bounties](https://img.shields.io/bountysource/team/converse.js/activity.svg?maxAge=2592000)](https://www.bountysource.com/teams/converse.js/issues?tracker_ids=194169)
 [![Translation status](https://hosted.weblate.org/widgets/conversejs/-/svg-badge.svg)](https://hosted.weblate.org/engage/conversejs/?utm_source=widget)
 
-[Converse.js](https://conversejs.org) is a web based [XMPP/Jabber](http://xmpp.org) instant messaging client.
+[Converse.js](https://conversejs.org) is a web based [XMPP/Jabber](https://xmpp.org) instant messaging client.
 
 It enables you to add chat functionality to your website, independent of
 any specific backend. You will however need an XMPP server to connect
@@ -23,13 +23,13 @@ avialable at [https://conversejs.org/demo/embedded.html](https://conversejs.org/
 
 ### Converse.js: As seen on the conversejs.org website
 
-![Screenshot of Converse.js](https://opkode.com/img/converse-screenshot.png)
+![Screenshot of Converse](https://opkode.com/img/converse-screenshot.png)
 
 ### inVerse: a fullscreen version of converse.js
 
-Converse.js is also available in a fullscreen version, called [inVerse](https://inverse.chat)
+Converse.js is also available in a fullscreen version, hosted at [inverse.chat](https://inverse.chat)
 
-![Screenshot of inVerse](https://opkode.com/img/inverse-screenshot.png)
+![Screenshot of Converse in fullscreen mode](https://opkode.com/img/inverse-screenshot.png)
 
 ## Documentation
 
@@ -43,45 +43,46 @@ which shows you how to use the CDN (content delivery network) to quickly get a d
 -   A [plugin architecture](https://conversejs.org/docs/html/plugin_development.html) based on [pluggable.js](https://conversejs.github.io/pluggable.js/)
 -   Single-user and group chats
 -   Contacts and groups
--   Multi-user chat rooms [XEP 45](http://xmpp.org/extensions/xep-0045.html)
--   Direct invitations to chat rooms [XEP 249](http://xmpp.org/extensions/xep-0249.html)
--   vCard support [XEP 54](http://xmpp.org/extensions/xep-0054.html)
--   Service discovery [XEP 30](http://xmpp.org/extensions/xep-0030.html)
--   In-band registration [XEP 77](http://xmpp.org/extensions/xep-0077.html)
--   Chat room bookmarks [XEP 48](http://xmpp.org/extensions/xep-0048.html)
--   Roster item exchange [XEP 144](http://xmpp.org/extensions/tmp/xep-0144-1.1.html)
+-   Multi-user chat rooms [XEP 45](https://xmpp.org/extensions/xep-0045.html)
+-   Direct invitations to chat rooms [XEP 249](https://xmpp.org/extensions/xep-0249.html)
+-   vCard support [XEP 54](https://xmpp.org/extensions/xep-0054.html)
+-   Service discovery [XEP 30](https://xmpp.org/extensions/xep-0030.html)
+-   In-band registration [XEP 77](https://xmpp.org/extensions/xep-0077.html)
+-   Chat room bookmarks [XEP 48](https://xmpp.org/extensions/xep-0048.html)
+-   Roster item exchange [XEP 144](https://xmpp.org/extensions/tmp/xep-0144-1.1.html)
 -   Chat statuses (online, busy, away, offline)
 -   Custom status messages
 -   Desktop notifications
--   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)
--   Third person "/me" messages [XEP 245](http://xmpp.org/extensions/xep-0245.html)
--   XMPP Ping [XEP 199](http://xmpp.org/extensions/xep-0199.html)
--   Server-side archiving of messages [XEP 313](http://xmpp.org/extensions/xep-0313.html)
--   Hidden Messages (aka Spoilers) [XEP 382](http://xmpp.org/extensions/xep-0382.html)
--   Client state indication [XEP 352](http://xmpp.org/extensions/xep-0352.html)
+-   Typing and state notifications [XEP 85](https://xmpp.org/extensions/xep-0085.html)
+-   Messages appear in all connnected chat clients [XEP 280](https://xmpp.org/extensions/xep-0280.html)
+-   Third person "/me" messages [XEP 245](https://xmpp.org/extensions/xep-0245.html)
+-   XMPP Ping [XEP 199](https://xmpp.org/extensions/xep-0199.html)
+-   Server-side archiving of messages [XEP 313](https://xmpp.org/extensions/xep-0313.html)
+-   Hidden Messages (aka Spoilers) [XEP 382](https://xmpp.org/extensions/xep-0382.html)
+-   Client state indication [XEP 352](https://xmpp.org/extensions/xep-0352.html)
+-   Last Message Correction [XEP 308](https://xmpp.org/extensions/xep-0308.html)
 -   Off-the-record encryption
 -   Translated into 16 languages
 
 ## Integration into other frameworks
 
--   **[Ruby on Rails](http://rubyonrails.org)**: [conversejs-rails](https://github.com/mikemarsian/conversejs-rails)
--   **[Django](http://www.djangoproject.com)**: [django-conversejs](https://pypi.python.org/pypi/django-conversejs) or [django-xmpp](https://github.com/fpytloun/django-xmpp)
--   **[Plone](http://plone.com)**: [collective.converse](http://github.com/collective/collective.converse)
--   **[Roundcube](http://roundcube.net)**: [roundcube-converse.js-xmpp-plugin](https://github.com/devurandom/roundcube-converse.js-xmpp-plugin)
--   **[Wordpress](http://wordpress.org)**: [ConverseJS](http://wordpress.org/plugins/conversejs)
+-   **[Ruby on Rails](https://rubyonrails.org)**: [conversejs-rails](https://github.com/mikemarsian/conversejs-rails)
+-   **[Django](https://www.djangoproject.com)**: [django-conversejs](https://pypi.python.org/pypi/django-conversejs) or [django-xmpp](https://github.com/fpytloun/django-xmpp)
+-   **[Plone](https://plone.com)**: [collective.converse](https://github.com/collective/collective.converse)
+-   **[Roundcube](https://roundcube.net)**: [roundcube-converse.js-xmpp-plugin](https://github.com/devurandom/roundcube-converse.js-xmpp-plugin)
+-   **[Wordpress](https://wordpress.org)**: [ConverseJS](https://wordpress.org/plugins/conversejs/)
 -   **[Patternslib](http://patternslib.com)**: [patterns.converse](https://github.com/jcbrand/patterns.converse)
--   **[Alfresco](http://www.alfresco.com)**: [alfresco-js-chat-share](https://github.com/keensoft/alfresco-js-chat-share)
--   **[Friendica](http://friendica.com)**: [converse](https://github.com/friendica/friendica-addons/tree/master/xmpp/converse)
--   **[Tiki Wiki CMS Groupware](http://tiki.org)**: [built-in optional feature](https://doc.tiki.org/XMPP)
+-   **[Alfresco](https://www.alfresco.com)**: [alfresco-js-chat-share](https://github.com/keensoft/alfresco-js-chat-share)
+-   **[Friendica](https://friendi.ca)**: [converse](https://github.com/friendica/friendica-addons/tree/master/xmpp/converse)
+-   **[Tiki Wiki CMS Groupware](https://tiki.org)**: [built-in optional feature](https://doc.tiki.org/XMPP)
 
 ## Screencasts
 
 *Note: These screencasts are already quite old! Converse.js has grown and evolved further since then.*
 
--   [In a static HTML page](http://opkode.com/media/blog/2013/04/02/converse.js-xmpp-instant-messaging-with-javascript).
+-   [In a static HTML page](https://opkode.com/media/blog/2013/04/02/converse.js-xmpp-instant-messaging-with-javascript).
     Here we chat to external XMPP accounts on Jabber.org and Gmail.
--   [Integrated into a Plone site](http://opkode.com/media/blog/instant-messaging-for-plone-with-javascript-and-xmpp)
+-   [Integrated into a Plone site](https://opkode.com/media/blog/instant-messaging-for-plone-with-javascript-and-xmpp)
     via collective.xmpp.chat.
 -   [Off-the-record encryption](https://opkode.com/media/blog/2013/11/11/conversejs-otr-support)
     in Converse 0.7.
@@ -123,4 +124,4 @@ The following people are making recurring donations:
 Additionally this project is supported by
 
 * [![KeyCDN](https://conversejs.org/logo/keycdn.png)](https://www.keycdn.com/)
-* [![Wikisuite](https://conversejs.org/logo/wikisuite.png)](http://wikisuite.org)
+* [![Wikisuite](https://conversejs.org/logo/wikisuite.png)](https://wikisuite.org)

demo/embedded.html

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