make version (instead of make release)

Remove the GIF parsing code from this repo and instead add a dependency on gifuct-js.

.babelrc

@@ -1,9 +0,0 @@
-{
-  "presets": [
-		["env", {
-			"targets": {
-				"browsers": ["last 2 versions", "safari >= 10", "IE 11"]
-			}
-		}]
-  ]
-}

.eslintrc.json

@@ -1,37 +1,35 @@
 {
+    "parser": "@typescript-eslint/parser",
     "parserOptions": {
-        "ecmaVersion": 6
+        "ecmaVersion": 2020,
+        "sourceType": "module",
+        "allowImportExportEverywhere": true
     },
     "env": {
         "browser": true,
-        "jasmine": true
+        "jasmine": true,
+        "es6": true
     },
-    "plugins": ["lodash"],
-    "extends": ["eslint:recommended", "plugin:lodash/canonical"],
+    "plugins": ["@typescript-eslint"],
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/eslint-recommended",
+        "plugin:@typescript-eslint/recommended"
+    ],
     "globals": {
-        "window": true,
-        "sinon": true,
+        "Uint8Array": true,
+        "Promise": true,
         "define": true,
-        "require": true
+        "require": true,
+        "sinon": true,
+        "window": true
     },
     "rules": {
-        "lodash/prefer-lodash-method": [2, {
-            "ignoreMethods": [
-                "find", "endsWith", "startsWith", "filter", "reduce",
-                "map", "replace", "toLower", "split", "trim", "forEach", "toUpperCase"
-            ]
-        }],
-        "lodash/prefer-startswith": "off",
-        "lodash/prefer-constant": "off",
-        "lodash/prefer-noop": "off",
-        "lodash/prefer-lodash-typecheck": "off",
-        "lodash/preferred-alias": "off",
-        "lodash/prefer-get": "off",
         "accessor-pairs": "error",
         "array-bracket-spacing": "off",
         "array-callback-return": "error",
-        "arrow-body-style": "error",
-        "arrow-parens": "error",
+        "arrow-body-style": "off",
+        "arrow-parens": "off",
         "arrow-spacing": "error",
         "block-scoped-var": "off",
         "block-spacing": "off",
@@ -57,7 +55,7 @@
             "property"
         ],
         "dot-notation": [
-            "error",
+            "off",
             {
                 "allowKeywords": true
             }
@@ -66,6 +64,7 @@
         "eqeqeq": "off",
         "func-call-spacing": "off",
         "no-spaced-func": "off",
+        "no-redeclare": "off",
         "func-name-matching": "error",
         "func-names": "off",
         "func-style": "off",
@@ -91,7 +90,7 @@
         "max-depth": "error",
         "max-len": "off",
         "max-lines": "off",
-        "max-nested-callbacks": "error",
+        "max-nested-callbacks": "off",
         "max-params": "off",
         "max-statements": "off",
         "max-statements-per-line": "off",
@@ -102,16 +101,16 @@
         "newline-per-chained-call": "off",
         "no-alert": "off",
         "no-array-constructor": "error",
-        "no-await-in-loop": "error",
+        "no-await-in-loop": "off",
         "no-bitwise": "off",
         "no-caller": "error",
         "no-console": "off",
-        "no-catch-shadow": "error",
+        "no-catch-shadow": "off",
         "no-cond-assign": [
-            "error",
+            "off",
             "except-parens"
         ],
-        "no-confusing-arrow": "error",
+        "no-confusing-arrow": "off",
         "no-continue": "off",
         "no-div-regex": "error",
         "no-duplicate-imports": "error",
@@ -149,7 +148,7 @@
         "no-negated-condition": "off",
         "no-negated-in-lhs": "error",
         "no-nested-ternary": "off",
-        "no-new": "error",
+        "no-new": "off",
         "no-new-func": "error",
         "no-new-object": "error",
         "no-new-require": "error",
@@ -158,7 +157,7 @@
         "no-param-reassign": "off",
         "no-path-concat": "error",
         "no-plusplus": "off",
-        "no-process-env": "error",
+        "no-process-env": "off",
         "no-process-exit": "error",
         "no-proto": "error",
         "no-prototype-builtins": "error",
@@ -185,12 +184,13 @@
         "no-underscore-dangle": "off",
         "no-unmodified-loop-condition": "error",
         "no-unneeded-ternary": "off",
-        "no-unused-vars": "off",
+        "no-unused-vars": "error",
         "no-unused-expressions": "off",
         "no-use-before-define": "off",
         "no-useless-call": "error",
+        "no-useless-catch": "off",
         "no-useless-computed-key": "error",
-        "no-useless-concat": "error",
+        "no-useless-concat": "off",
         "no-useless-constructor": "error",
         "no-useless-escape": "off",
         "no-useless-rename": "error",
@@ -203,7 +203,7 @@
         "object-curly-newline": "off",
         "object-curly-spacing": "off",
         "object-property-newline": [
-            "error",
+            "off",
             {
                 "allowMultiplePropertiesPerLine": true
             }
@@ -212,10 +212,7 @@
         "one-var": "off",
         "one-var-declaration-per-line": "off",
         "operator-assignment": "off",
-        "operator-linebreak": [
-            "error",
-            "after"
-        ],
+        "operator-linebreak": "off",
         "padded-blocks": "off",
         "prefer-arrow-callback": "off",
         "prefer-const": "error",
@@ -227,7 +224,7 @@
             }
         ],
         "prefer-numeric-literals": "error",
-        "prefer-promise-reject-errors": "error",
+        "prefer-promise-reject-errors": "off",
         "prefer-reflect": "off",
         "prefer-rest-params": "off",
         "prefer-spread": "off",
@@ -238,12 +235,13 @@
             "error",
             "always"
         ],
+        "require-atomic-updates": "off",
         "require-await": "error",
         "require-jsdoc": "off",
         "rest-spread-spacing": "error",
         "semi": "off",
         "semi-spacing": "off",
-        "sort-imports": "error",
+        "sort-imports": "off",
         "sort-keys": "off",
         "sort-vars": "off",
         "space-before-blocks": "off",
@@ -254,7 +252,7 @@
         "spaced-comment": "off",
         "strict": "off",
         "symbol-description": "error",
-        "template-curly-spacing": "error",
+        "template-curly-spacing": "off",
         "unicode-bom": [
             "error",
             "never"

.github/CONTRIBUTING.md

@@ -0,0 +1,28 @@
+# Contribution Guidelines
+
+Thanks for contributing to [Converse.js](https://conversejs.org)
+
+## Support questions
+
+The Github issue tracker is used for bug reports and feature requests, not for general tech support.
+
+For support, you can join our [XMPP webchat](https://inverse.chat/#converse/room?jid=discuss@conference.conversejs.org).
+Instead of the webchat, you can also open the room in your XMPP client, [click here](xmpp://discuss@conference.conversejs.org?join).
+
+You can also ask questions on [StackOverflow](https://stackoverflow.com/questions/tagged/converse.js)
+
+## Contributing Code
+
+Please follow the usual Github workflow. Create a fork of this repository, make your changes and then submit a pull request.
+
+### Before submitting a pull request
+
+Please read the [style guide](https://conversejs.org/docs/html/style_guide.html) and make sure that your code follows it.
+
+### Add tests for your bugfix or feature
+
+Add a test for any bug fixed or feature added.
+
+Tests can be found in various `./tests` folders in the Converse source code.
+
+To run the tests, you can run `make check` on Linux and Mac, or `./node_modules/bin/karma start karma.conf` on Windows.

.github/CONTRIBUTING.rst

@@ -1,37 +0,0 @@
-=======================
-Contribution Guidelines
-=======================
-
-Thanks for contributing to `Converse.js <http://conversejs.org>`_.
-
-Support questions
-=================
-Please ask support and setup questions on the mailing list: conversejs@librelist.com
-
-The issue tracker is only for bugs (i.e. issues) and feature requests.
-
-Contributing Code
-=================
-Please follow the usual github workflow. Create your own local fork of this repository,
-make your changes and then submit a pull request.
-
-Before submitting a pull request
---------------------------------
-
-Please read the `style guide <https://conversejs.org/docs/html/style_guide.html>`_ and make sure that your code follows it.
-
-Add tests for your bugfix or feature
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Add a test for any bug fixed or feature added. We use Jasmine
-for testing. 
-
-Take a look at `tests.html <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
-and the `spec files <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
-to see how tests are implemented.
-
-Check that the tests pass
-~~~~~~~~~~~~~~~~~~~~~~~~~
-Check that all tests complete sucessfully.
-
-Run ``make check`` in your terminal or open `tests.html <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
-in your browser.

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+patreon: jcbrand
+liberapay: jcbrand

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment (please complete the following information):**
+ - Desktop or Mobile?
+ - Browser [e.g. Chrome, Firefox]
+ - Converse.js version [e.g. 4.2.0]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@ Thanks for making a pull request to converse.js!
 
 Before submitting your request, please make sure the following conditions are met:
 
-- [ ] Add a changelog entry for your change in `docs/CHANGES.md`
+- [ ] Add a changelog entry for your change in `CHANGES.md`
 - [ ] When adding a configuration variable, please make sure to
       document it in `docs/source/configuration.rst`
 - [ ] Please add a test for your change. Tests can be run in the commandline

.github/codeql-config.yml

@@ -0,0 +1,2 @@
+paths-ignore:
+  - '**/tests/*.js'

.github/dependabot.yml

@@ -0,0 +1,61 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: mini-css-extract-plugin
+    versions:
+    - 1.3.5
+    - 1.3.6
+    - 1.3.7
+    - 1.3.8
+    - 1.3.9
+    - 1.4.0
+    - 1.4.1
+    - 1.5.0
+  - dependency-name: css-loader
+    versions:
+    - 5.0.1
+    - 5.0.2
+    - 5.1.0
+    - 5.1.1
+    - 5.1.2
+    - 5.1.3
+    - 5.2.0
+    - 5.2.1
+  - dependency-name: y18n
+    versions:
+    - 4.0.2
+  - dependency-name: sinon
+    versions:
+    - 10.0.0
+    - 9.2.4
+  - dependency-name: bootstrap
+    versions:
+    - 4.6.0
+  - dependency-name: "@babel/plugin-proposal-nullish-coalescing-operator"
+    versions:
+    - 7.12.1
+    - 7.12.13
+    - 7.13.0
+    - 7.13.8
+  - dependency-name: webpack-cli
+    versions:
+    - 4.4.0
+    - 4.5.0
+  - dependency-name: webpack-merge
+    versions:
+    - 5.7.3
+  - dependency-name: xmldom
+    versions:
+    - 0.5.0
+  - dependency-name: urijs
+    versions:
+    - 1.19.4
+    - 1.19.6
+  - dependency-name: sass-loader
+    versions:
+    - 10.1.1

.github/workflows/codeql.yml

@@ -0,0 +1,43 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: "11 18 * * 6"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ javascript ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          config-file: ./.github/codeql-config.yml
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+        if: ${{ matrix.language == 'javascript' }}
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{ matrix.language }}"

.github/workflows/karma-tests.yml

@@ -0,0 +1,34 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: CI Tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+     DISPLAY: :99.0
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+    - name: Run Karma tests
+      uses: GabrielBB/xvfb-action@v1
+      with:
+          run: make check ARGS=--single-run

.gitignore

@@ -1,9 +1,16 @@
+# Distribution directory
+dist
+
+# conversejs/media repo checkout
+media
+
+# Editor fluff
 *~
 .sw?
 *.mo
 *.kpf
 .*.sw?
-.*.cfg
+
 .hg/
 .bzr/
 .svn/
@@ -11,34 +18,38 @@
 .pydevproject
 .idea
 .su?
-builds/*
+.sass-cache
+pip-selfcheck.json
+
+3rdparty/libsignal-protocol-javascript/
+*.map
+
+locale.zip
+sounds.zip
 
 analytics.js
-inverse-analytics.js
 
-# python/buildout
+# virtualenv/python/buildout
+.*.cfg
 eggs
 .Python
 build
+share
 parts
 *.pyc
 *.egg-info
+lib
+lib64
+include
+bin
+develop-eggs
+pyvenv.cfg
 
-dev-jc.html
-inverse-dev.html
-inverse-dev-jc.html
 converse-logs/*.html
 
-# Ruby/Sass/Bundler
-.bundle
-.sass-cache
-ruby
-bourbon
-
 Backbone.Overview
 tags
-stamp-npm
-stamp-bundler
+transpile
 
 # Sphinx
 docs/html
@@ -47,12 +58,6 @@ docs/doctrees
 # Node.js
 node_modules
 
-# Virtualenv/Buildout
-lib
-include
-bin
-develop-eggs
-
 # OSX
 .DS_Store
 

.nvmrc

@@ -0,0 +1 @@
+v18.15.0

.prettierrc

@@ -0,0 +1,7 @@
+{
+  "printWidth": 120,
+  "quoteProps": "preserve",
+  "singleQuote": true,
+  "spaceBeforeFunctionParen": true,
+  "tabWidth": 4
+}

.travis.yml

@@ -1,13 +0,0 @@
-dist: trusty
-language: node_js
-cache:
-    directories:
-        - node_modules
-addons:
-    chrome: stable
-node_js:
- - 6
-install: make stamp-npm
-before_script: make serve_bg
-script: make check
-sudo: false

3rdparty/moment_locales.js

@@ -1,32 +0,0 @@
-/*
- * This file specifies the supported locales for moment.js.
- *
- * Translations take up a lot of space and you are therefore advised to remove
- * from here any languages that you don't need.
- *
- * See also src/locales.js
- */
-(function (root, factory) {
-    define("moment_with_locales", [
-        'moment',   // Everything below can be removed except for moment itself.
-        'moment/locale/af',
-        'moment/locale/de',
-        'moment/locale/es',
-        'moment/locale/fr',
-        'moment/locale/he',
-        'moment/locale/hu',
-        'moment/locale/id',
-        'moment/locale/it',
-        'moment/locale/ja',
-        'moment/locale/nb',
-        'moment/locale/nl',
-        'moment/locale/pl',
-        'moment/locale/pt-br',
-        'moment/locale/ru',
-        'moment/locale/uk',
-        // 'moment/locale/zh' (No longer in locales, now only with
-        // country codes, e.g. zh-cn.js zh-hk.js zh-tw.js).
-        ], function (moment) {
-            return moment;
-        });
-})(this);

COPYRIGHT

@@ -2,11 +2,11 @@
  *
  *  An XMPP chat client that runs in the browser.
  *
- *  Version: 3.2.0-rc
+ *  Version: 10.1.6
  *
- *  Copyright: JC Brand 2012-2017
+ *  Copyright: JC Brand 2013-2018
  *  Except for 3rd party dependencies.
  *  Please refer to the unminified version of this file for details.
  *
- *  You can download it at: https://github.com/jcbrand/converse.js/releases
+ *  You can download it at: https://github.com/conversejs/converse.js/releases
  */

Gemfile

@@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gem 'sass', '~> 3.3'

Gemfile.lock

@@ -1,13 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    sass (3.4.14)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  sass (~> 3.3)
-
-BUNDLED WITH
-   1.10.3

Gruntfile.js

@@ -1,18 +0,0 @@
-module.exports = function(grunt) {
-    grunt.initConfig({
-        json: {
-            main: {
-                options: {
-                    namespace: 'locales',
-                    includePath: true,
-                    processName: function(filename) {
-                        return filename.toLowerCase().match(/^locale\/(.*)\/lc_messages/)[1];
-                    }
-                },
-                src: ['locale/**/LC_MESSAGES/*.json'],
-                dest: 'dist/locales.js'
-            }
-        }
-    });
-    grunt.loadNpmTasks('grunt-json');
-};

Makefile

@@ -1,266 +1,269 @@
 # You can set these variables from the command line.
-UGLIFYJS		?= node_modules/.bin/uglifyjs
-BABEL			?= node_modules/.bin/babel
-BOURBON_TEMPLATES = ./node_modules/bourbon/app/assets/stylesheets/ 
+BOOTSTRAP		= ./node_modules/
 BUILDDIR		= ./docs
-BUNDLE		  	?= ./.bundle/bin/bundle
-CHROMIUM		?= ./node_modules/.bin/run-headless-chromium
-CLEANCSS		?= ./node_modules/clean-css-cli/bin/cleancss --skip-rebase
-ESLINT		  	?= ./node_modules/.bin/eslint
-GRUNT		   	?= ./node_modules/.bin/grunt
+KARMA			?= ./node_modules/.bin/karma
+CLEANCSS		?= ./node_modules/clean-css-cli/bin/cleancss
 HTTPSERVE	 	?= ./node_modules/.bin/http-server
+HTTPSERVE_PORT	?= 8000
+INKSCAPE		?= inkscape
+INSTALL			?= install
+JSDOC			?=	./node_modules/.bin/jsdoc
+OXIPNG			?= oxipng
 PAPER		 	=
-PO2JSON		 	?= ./node_modules/.bin/po2json
 RJS				?= ./node_modules/.bin/r.js
-SASS			?= ./.bundle/bin/sass
-SPHINXBUILD	 	?= ./bin/sphinx-build
+NPX				?= ./node_modules/.bin/npx
+SASS			?= ./node_modules/.bin/sass
 SED				?= sed
+SPHINXBUILD	 	?= ./bin/sphinx-build
 SPHINXOPTS		=
+XGETTEXT		= xgettext
+
 
 # Internal variables.
 ALLSPHINXOPTS	= -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./docs/source
+VERSION_FORMAT	= [0-9]+\.[0-9]+\.[0-9]+
 
 .PHONY: all
-all: dev dist
+all: node_modules dist
 
 .PHONY: help
 help:
 	@echo "Please use \`make <target>' where <target> is one of the following:"
 	@echo ""
-	@echo " all           A synonym for 'make dev'."
-	@echo " build         Create minified builds of converse.js and all its dependencies."
-	@echo " changes       Make an overview of all changed/added/deprecated items added to the documentation."
-	@echo " clean         Remove downloaded the stamp-* guard files as well as all NPM and Ruby packages."
-	@echo " css           Generate CSS from the Sass files."
-	@echo " dev           Set up the development environment. To force a fresh start, run 'make clean' first."
-	@echo " epub          Export the documentation to epub."
-	@echo " html          Make standalone HTML files of the documentation."
-	@echo " doc           Same as "doc". Make standalone HTML files of the documentation."
-	@echo " linkcheck     Check all documentation external links for integrity."
+	@echo " all         	Set up dev environment and create all builds"
+	@echo " dist       		Create minified builds of converse.js and all its dependencies."
+	@echo " clean       	Remove all NPM packages."
+	@echo " check       	Run all tests."
+	@echo " dev         	Set up the development environment and build unminified resources. To force a fresh start, run 'make clean' first."
+	@echo " devserver   	Set up the development environment and start the webpack dev server."
+	@echo " doc         	Make standalone HTML files of the documentation."
 	@echo " po          	Generate gettext PO files for each i18n language."
-	@echo " po2json       Generate JSON files from the language PO files."
 	@echo " pot         	Generate a gettext POT file to be used for translations."
 	@echo " release     	Prepare a new release of converse.js. E.g. make release VERSION=0.9.5"
 	@echo " serve       	Serve this directory via a webserver on port 8000."
-	@echo " stamp-npm     Install NPM dependencies and create the guard file stamp-npm which will prevent those dependencies from being installed again."
-	@echo " stamp-bundler Install Bundler (Ruby) dependencies and create the guard file stamp-bundler which will prevent those dependencies from being installed again."
-	@echo " watch         Tells Sass to watch the .scss files for changes and then automatically update the CSS files."
+	@echo " serve_bg    	Same as \"serve\", but do it in the background"
+	@echo " node_modules	Install NPM dependencies"
+	@echo " watch       	Watch for changes on JS and scss files and automatically update the generated files."
+	@echo " logo        	Generate PNG logos of multiple sizes."
 
 
 ########################################################################
 ## Miscellaneous
 
 .PHONY: serve
-serve: dev 
-	$(HTTPSERVE) -p 8000 -c-1
+serve: node_modules dist
+	$(HTTPSERVE) -p $(HTTPSERVE_PORT) -c-1
 
 .PHONY: serve_bg
-serve_bg: dev
-	$(HTTPSERVE) -p 8000 -c-1 -s &
+serve_bg: node_modules
+	$(HTTPSERVE) -p $(HTTPSERVE_PORT) -c-1 -s &
+
+certs:
+	mkdir certs
+	cd certs && openssl req -newkey rsa:4096 -x509 -sha256 -days 365 -nodes -out chat.example.org.crt -keyout chat.example.org.key
 
 ########################################################################
 ## 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.2.0-rc -c
+GETTEXT = $(XGETTEXT) --from-code=UTF-8 --language=JavaScript --keyword=__ --keyword=___ --keyword=i18n_ --force-po --output=src/i18n/converse.pot --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=10.1.6 dist/converse-no-dependencies.js -c
+
+src/i18n/converse.pot: dist/converse-no-dependencies.js
+	$(GETTEXT) 2>&1 > /dev/null; exit $$?;
+	rm dist/converse-no-dependencies.js
+	rm dist/tmp.css
 
 .PHONY: pot
-pot:
-	$(GETTEXT) --language="javascript" 2>&1 > /dev/null; test $$? -eq 0 && exit 0 || $(GETTEXT) --language="python" && exit $$?;
+pot: src/i18n/converse.pot
 
 .PHONY: po
 po:
-	find ./locale -maxdepth 1 -mindepth 1 -type d -exec msgmerge {}/LC_MESSAGES/converse.po ./locale/converse.pot -U \;
-
-.PHONY: po2json
-po2json:
-	find ./locale -maxdepth 1 -mindepth 1 -type d -exec $(PO2JSON) -p -f jed -d converse {}/LC_MESSAGES/converse.po {}/LC_MESSAGES/converse.json \;
+	find ./src/i18n -maxdepth 1 -mindepth 1 -type d -exec msgmerge {}/LC_MESSAGES/converse.po ./src/i18n/converse.pot -U \;
 
 ########################################################################
 ## Release management
 
-.PHONY: release
-release:
-	$(SED) -ri s/Version:\ [0-9]\+\.[0-9]\+\.[0-9]\+/Version:\ $(VERSION)/ COPYRIGHT
-	$(SED) -ri s/Version:\ [0-9]\+\.[0-9]\+\.[0-9]\+/Version:\ $(VERSION)/ src/start.frag
-	$(SED) -ri s/Project-Id-Version:\ Converse\.js\ [0-9]\+\.[0-9]\+\.[0-9]\+/Project-Id-Version:\ Converse.js\ $(VERSION)/ locale/converse.pot
-	$(SED) -ri s/\"version\":\ \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\":\ \"$(VERSION)\"/ bower.json
-	$(SED) -ri s/\"version\":\ \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\":\ \"$(VERSION)\"/ package.json
-	$(SED) -ri s/--package-version=[0-9]\+\.[0-9]\+\.[0-9]\+/--package-version=$(VERSION)/ Makefile
-	$(SED) -ri s/v[0-9]\+\.[0-9]\+\.[0-9]\+\.zip/v$(VERSION)\.zip/ index.html
-	$(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`/" CHANGES.md
+.PHONY: version
+version:
+	$(SED) -i '/^export const VERSION_NAME =/s/=.*/= "v$(VERSION)";/' src/headless/shared/constants.js
+	$(SED) -i '/Version:/s/:.*/: $(VERSION)/' COPYRIGHT
+	$(SED) -i '/Project-Id-Version:/s/:.*/: Converse.js $(VERSION)\n"/' src/i18n/converse.pot
+	$(SED) -i '/"version":/s/:.*/: "$(VERSION)",/' manifest.json
+	$(SED) -i '/"version":/s/:.*/: "$(VERSION)",/' package.json
+	$(SED) -i '/"version":/s/:.*/: "$(VERSION)",/' src/headless/package.json
+	$(SED) -ri 's/--package-version=$(VERSION_FORMAT)/--package-version=$(VERSION)/' Makefile
+	$(SED) -i -e "/version =/s/=.*/= '$(VERSION)'/" -e "/release =/s/=.*/= '$(VERSION)'/" docs/source/conf.py
+	$(SED) -i "s/[Uu]nreleased/`date +%Y-%m-%d`/" CHANGES.md
+	$(SED) -ri 's,cdn.conversejs.org/$(VERSION_FORMAT),cdn.conversejs.org/$(VERSION),' docs/source/quickstart.rst
+	$(SED) -ri 's,cdn.conversejs.org/$(VERSION_FORMAT),cdn.conversejs.org/$(VERSION),' *.html
+	$(SED) -ri 's,cdn.conversejs.org/$(VERSION_FORMAT),cdn.conversejs.org/$(VERSION),' demo/*.html
 	make pot
 	make po
-	make po2json
-	make build
+	make dist
+
+release-checkout:
+	git clone git@github.com:conversejs/converse.js.git --depth 1 --branch $(BRANCH) release-$(BRANCH)
+	cd release-$(BRANCH) && make dist
+
+.PHONY: publish
+publish:
+	make release-checkout
+	cd release-$(BRANCH) && npm pack && npm publish
+	cd release-$(BRANCH)/src/headless && npm pack && npm publish
+	find ./release-$(BRANCH)/ -name "converse.js-*.tgz" -exec mv {} . \;
+	find ./release-$(BRANCH)/src/headless -name "converse-headless-*.tgz" -exec mv {} . \;
+	rm -rf release-$(BRANCH)
+
+.PHONY: postrelease
+postrelease:
+	$(SED) -i '/^export const VERSION_NAME =/s/=.*/= "v$(VERSION)dev";/' src/headless/shared/constants.js
+
+.PHONY: deploy
+deploy:
+	git clone --branch v$(VERSION) git@github.com:conversejs/converse.js.git --depth 1 $(VERSION)
+	cd $(VERSION) && make node && ASSET_PATH=https://cdn.conversejs.org/$(VERSION)/dist/ make dist && make doc
+	cd .. && git pull && make node && ASSET_PATH=https://cdn.conversejs.org/dist/ make dist && make doc
 
 ########################################################################
 ## Install dependencies
 
-stamp-npm: package.json
-	npm install && touch stamp-npm
+${NVM_DIR}/nvm.sh:
+	wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
+	source ~/.bashrc
 
-stamp-bundler: Gemfile
-	mkdir -p .bundle
-	gem install --user bundler --bindir .bundle/bin
-	$(BUNDLE) install --path .bundle --binstubs .bundle/bin
-	touch stamp-bundler
+.PHONY: nvm
+nvm: ${NVM_DIR}/nvm.sh
+
+.PHONY: node
+node: .nvmrc
+	. $(HOME)/.nvm/nvm.sh && nvm install
+
+node_modules: package.json src/headless/package.json
+	npm install
 
 .PHONY: clean
 clean:
-	-rm -f stamp-npm stamp-bundler package-lock.json
-	-rm -rf node_modules .bundle
+	npm run clean
+	rm -rf lib bin include parts
 
 .PHONY: dev
-dev: stamp-bundler stamp-npm
+dev: node_modules
+	npm run dev
+
+.PHONY: devserver
+devserver: node_modules
+	npm run serve
 
 ########################################################################
 ## Builds
 
-.PHONY: css
-css: sass/*.scss css/converse.css css/converse.min.css css/mobile.min.css css/theme.min.css css/converse-muc-embedded.min.css css/inverse.css css/inverse.min.css
+dist/converse-no-dependencies.js: src webpack/webpack.common.js webpack/webpack.nodeps.js @converse/headless node_modules
+	npm run nodeps
 
-css/inverse.css:: stamp-bundler sass sass/*
-	$(SASS) -I $(BOURBON_TEMPLATES) sass/inverse/inverse.scss css/inverse.css
+dist/converse.js:: node_modules
+	npm run build
 
-css/inverse.min.css:: css/inverse.css
-	$(CLEANCSS) css/inverse.css > css/inverse.min.css
+dist/converse.css:: node_modules
+	npm run build
 
-css/converse-muc-embedded.css:: stamp-bundler sass/*
-	$(SASS) -I $(BOURBON_TEMPLATES) sass/_muc_embedded.scss css/converse-muc-embedded.css
+dist/website.css:: node_modules src/shared/styles/website.scss
+	$(SASS) --load-path=$(BOOTSTRAP) src/shared/styles/website.scss $@
 
-css/converse-muc-embedded.min.css:: stamp-bundler sass css/converse-muc-embedded.css
-	$(CLEANCSS) css/converse-muc-embedded.css > css/converse-muc-embedded.min.css
-
-css/converse.css:: stamp-bundler sass/*
-	$(SASS) -I $(BOURBON_TEMPLATES) sass/converse/converse.scss css/converse.css
-
-css/converse.min.css:: css/converse.css
-	$(CLEANCSS) css/converse.css > css/converse.min.css
-
-css/theme.min.css:: stamp-npm css/theme.css
-	$(CLEANCSS) css/theme.css > css/theme.min.css
-
-css/mobile.min.css:: stamp-npm sass/*
-	$(CLEANCSS) css/mobile.css > css/mobile.min.css
+dist/website.min.css:: node_modules dist/website.css
+	$(CLEANCSS) dist/website.css > $@
 
 .PHONY: watch
-watch: stamp-bundler
-	$(SASS) --watch -I ./node_modules/bourbon/app/assets/stylesheets/ sass/converse/converse.scss:css/converse.css sass/_muc_embedded.scss:css/converse-muc-embedded.css sass/inverse/inverse.scss:css/inverse.css
+watch: node_modules
+	npm run watch
 
-.PHONY: watchjs
-watchjs: stamp-npm
-	$(BABEL) --source-maps --watch=./src --out-dir=./builds
+.PHONY: logo
+logo: logo/conversejs-transparent16.png \
+		logo/conversejs-transparent19.png \
+		logo/conversejs-transparent48.png \
+		logo/conversejs-transparent128.png \
+		logo/conversejs-transparent512.png \
+		logo/conversejs-filled16.png \
+		logo/conversejs-filled19.png \
+		logo/conversejs-filled48.png \
+		logo/conversejs-filled128.png \
+		logo/conversejs-filled512.png \
 
-.PHONY: transpile
-transpile: stamp-npm
-	$(BABEL) --source-maps --out-dir=./builds ./src
+logo/conversejs-transparent%.png:: logo/conversejs-transparent.svg
+	$(INKSCAPE) -e $@ -w $* $<
+	$(OXIPNG) $@
 
-BUILDS = dist/converse.js \
-		 dist/converse.min.js \
-		 dist/converse-esnext.js \
-		 dist/converse-esnext.min.js \
-		 dist/inverse.js \
-		 dist/inverse.min.js \
-		 dist/converse-mobile.js \
-		 dist/converse-mobile.min.js \
-		 dist/converse-muc-embedded.js \
-		 dist/converse-muc-embedded.min.js \
-		 dist/converse-no-jquery.js \
- 		 dist/converse-no-jquery.min.js \
-		 dist/converse-no-dependencies.min.js \
-		 dist/converse-no-dependencies.js
+logo/conversejs-filled%.png:: logo/conversejs-filled.svg
+	$(INKSCAPE) -e $@ -w $* $<
+	$(OXIPNG) $@
 
-dist/converse.js: transpile src locale node_modules *.js
-	$(RJS) -o src/build.js include=converse out=dist/converse.js optimize=none 
-dist/converse.min.js: src locale node_modules *.js
-	$(UGLIFYJS) --verbose dist/converse.js -o dist/converse.min.js
-	cat COPYRIGHT > tmpfile && cat dist/converse.min.js >> tmpfile && mv tmpfile dist/converse.min.js
-dist/converse-esnext.js: src locale node_modules *.js transpile
-	$(RJS) -o src/build-esnext.js include=converse out=dist/converse-esnext.js optimize=none 
-dist/converse-esnext.min.js: src locale node_modules *.js transpile
-	$(UGLIFYJS) --verbose dist/converse-esnext.js -o dist/converse-esnext.min.js
-	cat COPYRIGHT > tmpfile && cat dist/converse-esnext.min.js >> tmpfile && mv tmpfile dist/converse-esnext.min.js
-dist/inverse.js: transpile src locale node_modules *.js
-	$(RJS) -o src/build-inverse.js include=inverse out=dist/inverse.js optimize=none 
-dist/inverse.min.js: src locale node_modules *.js
-	$(UGLIFYJS) --verbose dist/inverse.js -o dist/inverse.min.js
-	cat COPYRIGHT > tmpfile && cat dist/inverse.min.js >> tmpfile && mv tmpfile dist/inverse.min.js
-dist/converse-no-jquery.js: transpile src locale node_modules *.js
-	$(RJS) -o src/build.js include=converse wrap.endFile=end-no-jquery.frag exclude=jquery exclude=jquery.noconflict out=dist/converse-no-jquery.js optimize=none 
-dist/converse-no-jquery.min.js: src locale node_modules *.js transpile
-	$(UGLIFYJS) --verbose dist/converse-no-jquery.js -o dist/converse-no-jquery.min.js
-	cat COPYRIGHT > tmpfile && cat dist/converse-no-jquery.min.js >> tmpfile && mv tmpfile dist/converse-no-jquery.min.js
-dist/converse-no-dependencies.js: transpile src locale node_modules *.js
-	$(RJS) -o src/build-no-dependencies.js optimize=none out=dist/converse-no-dependencies.js
-dist/converse-no-dependencies.min.js: src locale node_modules *.js
-	$(UGLIFYJS) --verbose dist/converse-no-dependencies.js -o dist/converse-no-dependencies.min.js
-	cat COPYRIGHT > tmpfile && cat dist/converse-no-dependencies.min.js >> tmpfile && mv tmpfile dist/converse-no-dependencies.min.js
-dist/converse-mobile.js: transpile src locale node_modules *.js
-	$(RJS) -o src/build.js paths.converse=src/converse-mobile include=converse out=dist/converse-mobile.js optimize=none 
-dist/converse-mobile.min.js: src locale node_modules *.js
-	$(UGLIFYJS) --verbose dist/converse-mobile.js -o dist/converse-mobile.min.js
-	cat COPYRIGHT > tmpfile && cat dist/converse-mobile.min.js >> tmpfile && mv tmpfile dist/converse-mobile.min.js
-dist/converse-muc-embedded.js: transpile src locale node_modules *.js
-	$(RJS) -o src/build.js paths.converse=src/converse-embedded include=converse out=dist/converse-muc-embedded.js optimize=none 
-dist/converse-muc-embedded.min.js: src locale node_modules *.js
-	$(UGLIFYJS) --verbose dist/converse-muc-embedded.js -o dist/converse-muc-embedded.min.js
-	cat COPYRIGHT > tmpfile && cat dist/converse-muc-embedded.min.js >> tmpfile && mv tmpfile dist/converse-muc-embedded.min.js
+@converse/headless: src/headless
 
-.PHONY: jsmin
-jsmin: $(BUILDS)
+src/headless/dist/converse-headless.js: src webpack/webpack.common.js node_modules @converse/headless
+	npm run headless-dev
 
-.PHONY: dist
-dist:: build
+src/headless/dist/converse-headless.min.js: src webpack/webpack.common.js node_modules @converse/headless
+	npm run headless
 
-.PHONY: build
-build:: dev css transpile
-	$(GRUNT) json
-	make jsmin
+dist:: node_modules src/* | dist/website.css dist/website.min.css
+	npm run headless
+	# Ideally this should just be `npm run build`.
+	# The additional steps are necessary to properly generate JSON chunk files
+	# from the .po files. The nodeps config uses preset-env with IE11.
+	# Somehow this is necessary.
+	npm run nodeps
+	$(eval TMPD := $(shell mktemp -d))
+	mv dist/locales $(TMPD) && \
+	npm run build && \
+	mv $(TMPD)/locales/*-po.js dist/locales/ && \
+	rm -rf $(TMPD)
+
+.PHONY: install
+install:: dist
+
+.PHONY: cdn
+cdn:: node_modules
+	npm run cdn
+
+.PHONY: types
+types:: node_modules
+	npm run types
 
 ########################################################################
 ## Tests
 
 .PHONY: eslint
-eslint: stamp-npm
-	$(ESLINT) src/
-	$(ESLINT) spec/
+eslint: node_modules
+	npm run lint
 
 .PHONY: check
-check: eslint
-	LOG_CR_VERBOSITY=INFO $(CHROMIUM) http://localhost:8000/tests.html
+check: eslint | dist/converse.js dist/converse.css
+	npm run test -- $(ARGS)
 
+.PHONY: test
+test:
+	npm run test -- $(ARGS)
 
 ########################################################################
 ## Documentation
 
+./bin/activate:
+	python3 -m venv .
+
+.PHONY: docsdev
+docsdev: ./bin/activate requirements.txt
+	./bin/pip install --upgrade pip==21.3.1
+	./bin/pip install -r requirements.txt
+
 .PHONY: html
-html:
+html: doc
+
+.PHONY: doc
+doc: node_modules docsdev apidoc
 	rm -rf $(BUILDDIR)/html
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	make apidoc
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
-.PHONY: html
-doc: html
-
-.PHONY: epub
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-.PHONY: changes
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-.PHONY: linkcheck
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
+PHONY: apidoc
+apidoc:
+	find ./src -type d -name node_modules -prune -false -o -name "*.js" | xargs $(JSDOC) --private --readme docs/source/jsdoc_intro.md -c docs/source/conf.json -d docs/html/api

Makefile.win

@@ -1,71 +0,0 @@
-# You can set these variables from the command line.
-GRUNT   		?= node_modules\.bin\grunt.cmd
-BOWER           ?= node_modules\.bin\bower.cmd
-PHANTOMJS       ?= node_modules\.bin\phantomjs.cmd
-RJS				?= ./node_modules/.bin/r.js.cmd
-SASS 			?= sass 
-RMRF 			?= rmdir /q /s 
-RMF 			?= del /q 
-HTTPSERVE		?= ./node_modules/.bin/http-server.cmd
-
-.PHONY: all help clean css minjs build
-
-all: dev
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of the following"
-	@echo "  dev        to set up the development environment"
-	@echo "  build      create minified builds containing converse.js and all its dependencies"
-	@echo "  serve      to serve this directory via a webserver on port 8000"
-
-########################################################################
-## Miscellaneous
-
-serve:
-	$(HTTPSERVE) -p 8000
-
-########################################################################
-## Install dependencies
-
-stamp-npm: package.json
-	npm install
-	$(GRUNT) touch:npm
-
-stamp-bower: stamp-npm bower.json
-	$(BOWER) install
-	$(GRUNT) touch:bower
-
-clean::
-	@if EXIST stamp-npm $(RMF) stamp-npm
-	@if EXIST stamp-bower $(RMF) stamp-bower
-	@if EXIST node_modules\. $(RMRF) node_modules
-	@if EXIST components\. $(RMRF) components
-
-dev: clean
-	npm install
-	$(BOWER) update
-	bundler install --path=.
-
-########################################################################
-## Builds
-
-css::
-	$(SASS) sass/converse.scss > css/converse.css
-
-.PHONY: build
-build:: stamp-npm
-	$(GRUNT) jst
-	$(GRUNT) cssmin
-	$(RJS) -o src/build.js
-	$(RJS) -o src/build.js optimize=none out=dist/converse.js
-	$(RJS) -o src/build-no-jquery.js
-	$(RJS) -o src/build-no-jquery.js optimize=none out=dist/converse.nojquery.js
-	$(RJS) -o src/build-no-dependencies.js
-	$(RJS) -o src/build-no-dependencies.js optimize=none out=dist/converse-no-dependencies.js
-
-########################################################################
-## Tests
-
-check:: stamp-npm
-	$(PHANTOMJS) node_modules/phantom-jasmine/lib/run_jasmine_test.coffee tests.html
-

README.chapril.md

@@ -0,0 +1,17 @@
+# Construire une version Chapril de ConverseJS
+
+```
+cd .../conversejs
+# La première fois, installer nvm (attention, ça va modifier le .bashrc, entre autres choses)
+make nvm
+
+export V=7.0.4
+git rebase v${V?}
+# [... Résoudre les conflits]
+git checkout -b v${V?}-chapril
+nvm install
+make dist
+# [... Tester les livrables présents dans dist/, et si tout est ok :]
+make version VERSION=${V?}-chapril
+rsync -av dist/ chapril-xmpp:/var/www/xmpp.chapril.org/public_html/dist-custom-chapril-${V?}/
+```

README.md

@@ -1,33 +1,32 @@
-# converse.js
+<h2 align="center">
+  <a href="https://conversejs.org" target="_blank" rel="noopener">
+    <img alt="Converse.js" src="https://github.com/conversejs/converse.js/blob/master/logo/readme.png" width="480">
+  </a>
+</h2>
 
-[![Travis](https://api.travis-ci.org/jcbrand/converse.js.png?branch=master)](https://travis-ci.org/jcbrand/converse.js)
+
+[![XMPP Chat](https://conference.conversejs.org/muc_badge/discuss@conference.conversejs.org)](https://inverse.chat/#converse/room?jid=discuss@conference.conversejs.org)
+[![CI Tests](https://github.com/conversejs/converse.js/actions/workflows/karma-tests.yml/badge.svg)](https://github.com/conversejs/converse.js/actions/workflows/karma-tests.yml)
 [![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](https://conversejs.org) is a web based [XMPP/Jabber](https://xmpp.org) chat 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
-to, either your own, or a public one.
+You can either use it as a webchat app, or you can integrate it into your own website.
+
+It's 100% client-side JavaScript, HTML and CSS and the only backend required
+is a modern XMPP server.
+
+Please support this project via [Patreon](https://www.patreon.com/jcbrand) or [Liberapay](https://liberapay.com/jcbrand)
 
 ## Demo
 
-Converse.js is hosted and can be used at [https://conversejs.org](https://conversejs.org).
+Converse is hosted and can be used at [https://conversejs.org](https://conversejs.org).
 
 A demo showing anonymous login is available at [https://conversejs.org/demo/anonymous.html](https://conversejs.org/demo/anonymous.html)
 and a demo which shows how you can embed a single chat room into a page is
 avialable at [https://conversejs.org/demo/embedded.html](https://conversejs.org/demo/embedded.html).
 
-### Converse.js: As seen on the conversejs.org website
-
-![Screenshot of Converse.js](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)
-
-![Screenshot of inVerse](https://opkode.com/img/inverse-screenshot.png)
-
 ## Documentation
 
 The developer/integrator documentation can be found at [https://conversejs.org/docs/html](https://conversejs.org/docs/html).
@@ -35,65 +34,155 @@ The developer/integrator documentation can be found at [https://conversejs.org/d
 You'll probably want to begin with the [quickstart guide](https://conversejs.org/docs/html/quickstart.html),
 which shows you how to use the CDN (content delivery network) to quickly get a demo up and running.
 
-## Features
+## Converse modes
 
--   Single-user chat
--   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)
--   Chat statuses (online, busy, away, offline)
+### Overlay
+
+In overlay mode, Converse appears overlayed chats on top of the website.
+
+![Screenshot of Converse in overlay mode](https://conversejs.org/screenshots/Converse-overlayed.png)
+
+### Fullpage
+
+In fullpage mode, Converse behaves like a single-page app that covers the whole browser viewport.
+
+![Screenshot of Converse 9.0.0 in fullpage mode](https://conversejs.org/screenshots/Converse-fullscreen.png)
+
+### Dark mode
+
+![Screenshot of Converse 9.1.0 with a dark theme](https://conversejs.org/screenshots/Converse-Dracula-Theme.png)
+
+### Embedded
+
+In embedded mode, Converse can be embedded into an element in the DOM.
+
+![Screenshot of Converse in embedded mode](https://conversejs.org/screenshots/Converse-embedded.png)
+
+## Features
+-   Available as overlayed chat boxes or as a fullscreen application. See [inverse.chat](https://inverse.chat) for the fullscreen version.
 -   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)
--   Client state indication [XEP 352](http://xmpp.org/extensions/xep-0352.html)
--   Off-the-record encryption
--   Translated into 16 languages
+-   A [plugin architecture](https://conversejs.org/docs/html/plugin_development.html) based on [pluggable.js](https://conversejs.github.io/pluggable.js/)
+-   Chat statuses (online, busy, away, offline)
+-   Anonymous logins, see the [anonymous login demo](https://conversejs.org/demo/anonymous.html)
+-   URL Previews (requires server support, for example [mod_ogp](https://modules.prosody.im/mod_ogp.html)
+-   Translated into over 30 languages
 
-## Integration into other frameworks
+### Supported XMPP Extensions
 
--   **[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.xmpp.chat](http://github.com/collective/collective.xmpp.chat)
--   **[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)
+- [RFC-7395](https://tools.ietf.org/html/rfc7395) XMPP Subprotocol support for WebSocket
+- [XEP-0004](https://xmpp.org/extensions/xep-0004.html) Data Forms
+- [XEP-0030](https://xmpp.org/extensions/xep-0030.html) Service discovery
+- [XEP-0045](https://xmpp.org/extensions/xep-0045.html) Multi-user chat rooms
+- [XEP-0048](https://xmpp.org/extensions/xep-0048.html) Bookmarks
+- [XEP-0050](https://xmpp.org/extensions/xep-0050.html) Ad-Hoc Commands
+- [XEP-0054](https://xmpp.org/extensions/xep-0054.html) VCard-temp
+- [XEP-0059](https://xmpp.org/extensions/xep-0059.html) Result Set Management
+- [XEP-0060](https://xmpp.org/extensions/xep-0060.html) Publish-Subscribe (limited support)
+- [XEP-0066](https://xmpp.org/extensions/xep-0066.html) Out of Band Data
+- [XEP-0077](https://xmpp.org/extensions/xep-0077.html) In-band registration
+- [XEP-0085](https://xmpp.org/extensions/xep-0085.html) Chat State Notifications
+- [XEP-0115](https://xmpp.org/extensions/xep-0115.html) Entity Capabilities
+- [XEP-0124](https://xmpp.org/extensions/xep-0124.html) Bidirectional-streams Over Synchronous HTTP (BOSH)
+- [XEP-0144](https://xmpp.org/extensions/xep-0144.html) Roster item exchange
+- [XEP-0156](https://xmpp.org/extensions/xep-0156.html) Discovering Alternative XMPP Connection Methods
+- [XEP-0163](https://xmpp.org/extensions/xep-0163.html) Personal Eventing Protocol (limited support)
+- [XEP-0184](https://xmpp.org/extensions/xep-0184.html) Message Receipt
+- [XEP-0198](https://xmpp.org/extensions/xep-0198.html) Stream Management
+- [XEP-0199](https://xmpp.org/extensions/xep-0199.html) XMPP Ping
+- [XEP-0203](https://xmpp.org/extensions/xep-0203.html) Delayed Delivery
+- [XEP-0206](https://xmpp.org/extensions/xep-0206.html) XMPP Over BOSH
+- [XEP-0245](https://xmpp.org/extensions/xep-0245.html) The /me Command
+- [XEP-0249](https://xmpp.org/extensions/xep-0249.html) Direct MUC Invitations
+- [XEP-0280](https://xmpp.org/extensions/xep-0280.html) Message Carbons
+- [XEP-0297](https://xmpp.org/extensions/xep-0297.html) Stanza Forwarding (limited support)
+- [XEP-0308](https://xmpp.org/extensions/xep-0308.html) Last Message Correction
+- [XEP-0313](https://xmpp.org/extensions/xep-0313.html) Message Archive Management
+- [XEP-0316](https://xmpp.org/extensions/xep-0316.html) MUC Eventing protocol (limited support)
+- [XEP-0317](https://xmpp.org/extensions/xep-0317.html) Hats (limited support)
+- [XEP-0333](https://xmpp.org/extensions/xep-0333.html) Chat Markers (limited support)
+- [XEP-0352](https://xmpp.org/extensions/xep-0352.html) Client State Indication
+- [XEP-0357](https://xmpp.org/extensions/xep-0357.html) Push Notifications
+- [XEP-0359](https://xmpp.org/extensions/xep-0359.html) Unique and Stable Stanza IDs
+- [XEP-0363](https://xmpp.org/extensions/xep-0363.html) HTTP File Upload
+- [XEP-0372](https://xmpp.org/extensions/xep-0372.html) References
+- [XEP-0382](https://xmpp.org/extensions/xep-0382.html) Spoiler messages
+- [XEP-0384](https://xmpp.org/extensions/xep-0384.html) OMEMO Encryption
+- [XEP-0393](https://xmpp.org/extensions/xep-0393.html) Message styling
+- [XEP-0422](https://xmpp.org/extensions/xep-0422.html) Message Fastening (limited support)
+- [XEP-0424](https://xmpp.org/extensions/xep-0424.html) Message Retractions
+- [XEP-0425](https://xmpp.org/extensions/xep-0425.html) Message Moderation
+- [XEP-0437](https://xmpp.org/extensions/xep-0437.html) Room Activity Indicators
+- [XEP-0453](https://xmpp.org/extensions/xep-0453.html) DOAP Usage in XMPP
+- [XEP-0454](https://xmpp.org/extensions/xep-0454.html) OMEMO Media sharing
+
+## Integration into other servers and frameworks
+
+### XMPP servers
+
+-   **[Openfire](https://www.igniterealtime.org/projects/openfire/index.jsp)**: [inverse.jar](https://www.igniterealtime.org/projects/openfire/plugins.jsp)
+-   **[Prosody](https://prosody.im/)**: [mod_conversejs](https://modules.prosody.im/mod_conversejs.html)
+-   **[Ejabberd](https://ejabberd.im/)**: [mod-conversejs](https://docs.ejabberd.im/admin/configuration/modules/#mod-conversejs)
+
+### Other
+
+-   **[Alfresco](https://www.alfresco.com)**: [alfresco-js-chat-share](https://github.com/keensoft/alfresco-js-chat-share)
+-   **[Django](https://www.djangoproject.com)**: [django-conversejs](https://pypi.python.org/pypi/django-conversejs) or [django-xmpp](https://github.com/fpytloun/django-xmpp)
+-   **[Elgg](https://elgg.org)**: [plugin](https://elgg.org/plugins/2997196)
+-   **[Friendica](https://friendi.ca)**: [converse](https://github.com/friendica/friendica-addons/tree/master/xmpp/converse)
 -   **[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)
+-   **[Plone](https://plone.com)**: [collective.converse](https://github.com/collective/collective.converse)
+-   **[Pàdé](https://www.igniterealtime.org/projects/pade/index.jsp)**: [Pàdé](https://www.igniterealtime.org/projects/pade/index.jsp)
+-   **[Roundcube](https://roundcube.net)**: [roundcube-converse.js-xmpp-plugin](https://github.com/devurandom/roundcube-converse.js-xmpp-plugin)
+-   **[Ruby on Rails](https://rubyonrails.org)**: [conversejs-rails](https://github.com/mikemarsian/conversejs-rails)
+-   **[Tiki Wiki CMS Groupware](https://tiki.org)**: [built-in optional feature](https://doc.tiki.org/XMPP)
+-   **[Wordpress](https://wordpress.org)**: [ConverseJS](https://wordpress.org/plugins/conversejs/)
 
-## 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).
-    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)
-    via collective.xmpp.chat.
--   [Off-the-record encryption](https://opkode.com/media/blog/2013/11/11/conversejs-otr-support)
-    in Converse 0.7.
 
 ## Tests
 
 We use behavior-driven tests written with [jasmine.js](https://jasmine.github.io/).
 
-Open [tests.html](https://github.com/jcbrand/converse.js/blob/master/tests.html) in your browser, and the tests will run automatically.
+Run `make check` to execute all the tests.
 
 ## Licence
 
 `Converse.js` is released under the [Mozilla Public License (MPL)](https://www.mozilla.org/MPL/2.0/index.txt).
 
+## Attribution
+
+Emoji images are courtesy of [Twemoji](https://emojitwo.github.io/).
+
 ## Support
 
-For support queries and discussions, please join the mailing list: <conversejs@librelist.com>
+Issues can be logged on the [Github issue tracker](https://github.com/conversejs/converse.js/issues).
 
-Also take a look at the [mailing list archives](http://librelist.com/browser/conversejs).
+## Donations
 
-Issues can be logged on the [Github issue tracker](https://github.com/jcbrand/converse.js/issues).
+A heartfelt thanks for everyone who has supported this project over the years.
+Many people have contributed testing, bugfixes, features and corrections.
+
+We accept donations via [Patreon](https://www.patreon.com/jcbrand) and [Liberapay](https://liberapay.com/jcbrand).
+
+## Sponsors
+
+<p>
+  <a href="https://bairesdev.com/sponsoring-open-source-projects/?utm_source=conversejs" target="_blank" rel="noopener">
+    <img alt="BairesDev" src="https://raw.githubusercontent.com/conversejs/media/main/logos/bairesdev-primary.png" width="200">
+  </a>
+</p>
+<p>
+  <a href="https://blokt.com?utm_source=conversejs" target="_blank" rel="noopener">
+    <img alt="Blokt Crypto & Privacy" src="https://raw.githubusercontent.com/conversejs/converse.js/541613d1fea8aef364af00180f60e959162e5e4b/logo/blokt.png" width="200">
+  </a>
+</p>
+<p>
+  <a href="https://primesound.org/?utm_source=conversejs" target="_blank" rel="noopener">
+    <img alt="Prime Sound" src="https://raw.githubusercontent.com/conversejs/media/main/logos/primesound.png" width="200">
+  </a>
+</p>
+<p>
+  <a href="https://www.keycdn.com?utm_source=conversejs" target="_blank" rel="noopener">
+    <img alt="KeyCDN" src="https://raw.githubusercontent.com/conversejs/converse.js/541613d1fea8aef364af00180f60e959162e5e4b/logo/keycdn.png" width="200">
+  </a>
+</p>

RELEASE.md

@@ -1,18 +1,18 @@
 # Release checklist
 
-1. Run `make check` to check that all tests pass.
-2. Decide on a version number, e.g. 2.0.5
-3. Run `make release VERSION=2.0.5`
+1. Merge weblate translations: https://hosted.weblate.org/projects/conversejs/translations/#repository
+2. Run `make check` to check that all tests pass.
+3. Run `make version VERSION=10.1.6`
 4. Do a `git diff` to check if things look sane.
 5. Do a quick manual test with the `dist` files (via `index.html`)
-6. `git commit -am "New release 2.0.5"`
-7. `git tag -s v2.0.5
-8. Run `git push && git push --tags`
-9. Update http://conversejs.org
-10. Create `2.0.5` directory for the CDN.
-    * Create a new version for the CDN by copying
-    * Check out the correct tag
-    * Update `index.html` to point to that version of the CDN
-    * Run `make dist`
-    * Do the same for the root dir
-11. Run `npm publish`
+6. `git commit -am "Release 10.1.6"`
+7. `git tag -s v10.1.6 -m "Release 10.1.6"`
+8. `git push && git push origin v10.1.6`
+9. `make publish BRANCH=v10.1.6`
+10. Update release page on Github
+    * Upload tar files
+11. Update https://conversejs.org
+    * `cd /home/conversejs/converse.js`
+    * `make deploy VERSION=10.1.6`
+12. Update the repository on weblate
+13. Decide on next release number and run `make postrelease VERSION=10.1.7`

babel.config.json

@@ -0,0 +1,10 @@
+{
+    "presets": [
+        ["@babel/preset-env", {
+            "targets": {
+                "browsers": [">1%", "not ie 11", "not op_mini all", "not dead"]
+            }
+        }]
+    ],
+    "plugins": []
+}

bootstrap.py

@@ -1,260 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Bootstrap a buildout-based project
-
-Simply run this script in a directory containing a buildout.cfg.
-The script accepts buildout command-line options, so you can
-use the -c option to specify an alternate configuration file.
-"""
-
-import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
-from optparse import OptionParser
-
-if sys.platform == 'win32':
-    def quote(c):
-        if ' ' in c:
-            return '"%s"' % c # work around spawn lamosity on windows
-        else:
-            return c
-else:
-    quote = str
-
-# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
-stdout, stderr = subprocess.Popen(
-    [sys.executable, '-Sc',
-     'try:\n'
-     '    import ConfigParser\n'
-     'except ImportError:\n'
-     '    print 1\n'
-     'else:\n'
-     '    print 0\n'],
-    stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-has_broken_dash_S = bool(int(stdout.strip()))
-
-# In order to be more robust in the face of system Pythons, we want to
-# run without site-packages loaded.  This is somewhat tricky, in
-# particular because Python 2.6's distutils imports site, so starting
-# with the -S flag is not sufficient.  However, we'll start with that:
-if not has_broken_dash_S and 'site' in sys.modules:
-    # We will restart with python -S.
-    args = sys.argv[:]
-    args[0:0] = [sys.executable, '-S']
-    args = map(quote, args)
-    os.execv(sys.executable, args)
-# Now we are running with -S.  We'll get the clean sys.path, import site
-# because distutils will do it later, and then reset the path and clean
-# out any namespace packages from site-packages that might have been
-# loaded by .pth files.
-clean_path = sys.path[:]
-import site
-sys.path[:] = clean_path
-for k, v in sys.modules.items():
-    if k in ('setuptools', 'pkg_resources') or (
-        hasattr(v, '__path__') and
-        len(v.__path__)==1 and
-        not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
-        # This is a namespace package.  Remove it.
-        sys.modules.pop(k)
-
-is_jython = sys.platform.startswith('java')
-
-setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
-distribute_source = 'http://python-distribute.org/distribute_setup.py'
-
-# parsing arguments
-def normalize_to_url(option, opt_str, value, parser):
-    if value:
-        if '://' not in value: # It doesn't smell like a URL.
-            value = 'file://%s' % (
-                urllib.pathname2url(
-                    os.path.abspath(os.path.expanduser(value))),)
-        if opt_str == '--download-base' and not value.endswith('/'):
-            # Download base needs a trailing slash to make the world happy.
-            value += '/'
-    else:
-        value = None
-    name = opt_str[2:].replace('-', '_')
-    setattr(parser.values, name, value)
-
-usage = '''\
-[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
-
-Bootstraps a buildout-based project.
-
-Simply run this script in a directory containing a buildout.cfg, using the
-Python that you want bin/buildout to use.
-
-Note that by using --setup-source and --download-base to point to
-local resources, you can keep this script from going over the network.
-'''
-
-parser = OptionParser(usage=usage)
-parser.add_option("-v", "--version", dest="version",
-                          help="use a specific zc.buildout version")
-parser.add_option("-d", "--distribute",
-                   action="store_true", dest="use_distribute", default=False,
-                   help="Use Distribute rather than Setuptools.")
-parser.add_option("--setup-source", action="callback", dest="setup_source",
-                  callback=normalize_to_url, nargs=1, type="string",
-                  help=("Specify a URL or file location for the setup file. "
-                        "If you use Setuptools, this will default to " +
-                        setuptools_source + "; if you use Distribute, this "
-                        "will default to " + distribute_source +"."))
-parser.add_option("--download-base", action="callback", dest="download_base",
-                  callback=normalize_to_url, nargs=1, type="string",
-                  help=("Specify a URL or directory for downloading "
-                        "zc.buildout and either Setuptools or Distribute. "
-                        "Defaults to PyPI."))
-parser.add_option("--eggs",
-                  help=("Specify a directory for storing eggs.  Defaults to "
-                        "a temporary directory that is deleted when the "
-                        "bootstrap script completes."))
-parser.add_option("-t", "--accept-buildout-test-releases",
-                  dest='accept_buildout_test_releases',
-                  action="store_true", default=False,
-                  help=("Normally, if you do not specify a --version, the "
-                        "bootstrap script and buildout gets the newest "
-                        "*final* versions of zc.buildout and its recipes and "
-                        "extensions for you.  If you use this flag, "
-                        "bootstrap and buildout will get the newest releases "
-                        "even if they are alphas or betas."))
-parser.add_option("-c", None, action="store", dest="config_file",
-                   help=("Specify the path to the buildout configuration "
-                         "file to be used."))
-
-options, args = parser.parse_args()
-
-# if -c was provided, we push it back into args for buildout's main function
-if options.config_file is not None:
-    args += ['-c', options.config_file]
-
-if options.eggs:
-    eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
-else:
-    eggs_dir = tempfile.mkdtemp()
-
-if options.setup_source is None:
-    if options.use_distribute:
-        options.setup_source = distribute_source
-    else:
-        options.setup_source = setuptools_source
-
-if options.accept_buildout_test_releases:
-    args.append('buildout:accept-buildout-test-releases=true')
-args.append('bootstrap')
-
-try:
-    import pkg_resources
-    import setuptools # A flag.  Sometimes pkg_resources is installed alone.
-    if not hasattr(pkg_resources, '_distribute'):
-        raise ImportError
-except ImportError:
-    ez_code = urllib2.urlopen(
-        options.setup_source).read().replace('\r\n', '\n')
-    ez = {}
-    exec ez_code in ez
-    setup_args = dict(to_dir=eggs_dir, download_delay=0)
-    if options.download_base:
-        setup_args['download_base'] = options.download_base
-    if options.use_distribute:
-        setup_args['no_fake'] = True
-    ez['use_setuptools'](**setup_args)
-    if 'pkg_resources' in sys.modules:
-        reload(sys.modules['pkg_resources'])
-    import pkg_resources
-    # This does not (always?) update the default working set.  We will
-    # do it.
-    for path in sys.path:
-        if path not in pkg_resources.working_set.entries:
-            pkg_resources.working_set.add_entry(path)
-
-cmd = [quote(sys.executable),
-       '-c',
-       quote('from setuptools.command.easy_install import main; main()'),
-       '-mqNxd',
-       quote(eggs_dir)]
-
-if not has_broken_dash_S:
-    cmd.insert(1, '-S')
-
-find_links = options.download_base
-if not find_links:
-    find_links = os.environ.get('bootstrap-testing-find-links')
-if find_links:
-    cmd.extend(['-f', quote(find_links)])
-
-if options.use_distribute:
-    setup_requirement = 'distribute'
-else:
-    setup_requirement = 'setuptools'
-ws = pkg_resources.working_set
-setup_requirement_path = ws.find(
-    pkg_resources.Requirement.parse(setup_requirement)).location
-env = dict(
-    os.environ,
-    PYTHONPATH=setup_requirement_path)
-
-requirement = 'zc.buildout'
-version = options.version
-if version is None and not options.accept_buildout_test_releases:
-    # Figure out the most recent final version of zc.buildout.
-    import setuptools.package_index
-    _final_parts = '*final-', '*final'
-    def _final_version(parsed_version):
-        for part in parsed_version:
-            if (part[:1] == '*') and (part not in _final_parts):
-                return False
-        return True
-    index = setuptools.package_index.PackageIndex(
-        search_path=[setup_requirement_path])
-    if find_links:
-        index.add_find_links((find_links,))
-    req = pkg_resources.Requirement.parse(requirement)
-    if index.obtain(req) is not None:
-        best = []
-        bestv = None
-        for dist in index[req.project_name]:
-            distv = dist.parsed_version
-            if _final_version(distv):
-                if bestv is None or distv > bestv:
-                    best = [dist]
-                    bestv = distv
-                elif distv == bestv:
-                    best.append(dist)
-        if best:
-            best.sort()
-            version = best[-1].version
-if version:
-    requirement = '=='.join((requirement, version))
-cmd.append(requirement)
-
-if is_jython:
-    import subprocess
-    exitcode = subprocess.Popen(cmd, env=env).wait()
-else: # Windows prefers this, apparently; otherwise we would prefer subprocess
-    exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
-if exitcode != 0:
-    sys.stdout.flush()
-    sys.stderr.flush()
-    print ("An error occurred when trying to install zc.buildout. "
-           "Look above this message for any errors that "
-           "were output by easy_install.")
-    sys.exit(exitcode)
-
-ws.add_entry(eggs_dir)
-ws.require(requirement)
-import zc.buildout.buildout
-zc.buildout.buildout.main(args)
-if not options.eggs: # clean up temporary egg directory
-    shutil.rmtree(eggs_dir)

buildout.cfg

@@ -1,22 +0,0 @@
-[buildout]
-parts =
-    sphinx
-
-versions = versions
-
-[sphinx]
-recipe = zc.recipe.egg
-eggs =
-    Sphinx
-    sphinx-bootstrap-theme
-
-[versions]
-docutils = 0.13.1
-Jinja2 = 2.9.5
-MarkupSafe = 0.23
-Pygments = 2.2.0
-six = 1.10.0
-setuptools = 28.6.1
-Sphinx = 1.5.2
-z3c.recipe.egg = 2.0.3
-zc.buildout = 2.5.3

builds/README.rst

@@ -1,3 +0,0 @@
-This directory exists as a location for intermediate files generated by the
-Babel compiler, before they're bundled into distribution bundles in the
-`./dist/` directory.

composer.json

@@ -4,7 +4,7 @@
     "type": "library",
     "license": "MPL-2.0",
     "minimum-stability": "stable",
-    "homepage": "http://conversejs.org/",
+    "homepage": "https://conversejs.org/",
     "keywords": ["xmpp", "messaging", "chat", "presence"],
     "require": {}
 }

converse-logs/README.md

@@ -1,23 +0,0 @@
-# How to use saved Chrome/Chromium logs to replay events
-
-**NOTE**: This feature is very experimental and in many cases doesn't work
-without data massaging and ugly hacks.
-
-It's possible to save the log output from Chrome/Chromium (I haven't tried this
-yet with any other browser) and then to replay that log output in the browser.
-
-This can be a very helpful technique to track down bugs.
-
-To do this, follow the following steps:
-
-1. Save the log file (right click and then click "Save as" in the browser's console).
-2. Rename the log file, making sure it ends in `.html`
-3. Move the log file to the `converse-logs` directory in the converse.js repo.
-4. Add `<log>` to the top of the log file and `</log>` to the bottom of the log file.
-5. In `converse-logs/converse-logs.js`, add a new entry for the log file (don't
-   include the `.html` part of the file name.
-6. Make sure that `spec/transcripts` is "required"-ed in `tests/main.js`
-6. Open `tests.html` in your browser.
-
-Your logs will run first, and then all the other tests will run afterwards.
-

converse-logs/converse-logs.js

@@ -1,5 +0,0 @@
-define("transcripts", [
-    "tpl!converse-logs/double_logins",
-], function () {
-    return arguments;
-});

conversejs.doap

@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rdf:RDF xmlns:doap="http://usefulinc.com/ns/doap#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:xmpp="https://linkmauve.fr/ns/xmpp-doap#" xmlns:schema="https://schema.org/" xml:lang="en">
+  <Project xmlns="http://usefulinc.com/ns/doap#">
+    <name>Converse.js</name>
+    <shortdesc>Browser based XMPP chat client</shortdesc>
+    <homepage rdf:resource="https://conversejs.org/"/>
+    <bug-database rdf:resource="https://github.com/conversejs/converse.js/issues"/>
+    <developer-forum rdf:resource="xmpp:discuss@conference.conversejs.org?join"/>
+    <support-forum rdf:resource="xmpp:discuss@conference.conversejs.org?join"/>
+    <category rdf:resource="https://linkmauve.fr/ns/xmpp-doap#category-client"/>
+    <programming-language>JavaScript</programming-language>
+    <os>Browser</os>
+    <os>Linux</os>
+    <os>macOS</os>
+    <os>Windows</os>
+    <schema:logo rdf:resource="https://raw.githubusercontent.com/conversejs/converse.js/master/logo/conversejs-filled.svg"/>
+    <repository>
+      <GitRepository>
+        <browse rdf:resource="https://github.com/conversejs/converse.js"/>
+        <location rdf:resource="https://github.com/conversejs/converse.js.git"/>
+      </GitRepository>
+    </repository>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc6120"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc6121"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc6122"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc7395"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc7590"/>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0004.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0030.html"/>
+        <xmpp:since>0.8.2</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0045.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0048.html"/>
+        <xmpp:since>2.0.1</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0050.html"/>
+        <xmpp:since>7.0.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0054.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0059.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0060.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0066.html"/>
+        <xmpp:since>4.0.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0077.html"/>
+        <xmpp:since>0.8.5</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0085.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0115.html"/>
+        <xmpp:status>partial</xmpp:status>
+        <xmpp:note>advertises caps but no caching</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0122.html"/>
+        <xmpp:status>partial</xmpp:status>
+        <xmpp:note>basic string field sub-type usage</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0124.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0144.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0156.html"/>
+        <xmpp:since>6.0.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0163.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0184.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0198.html"/>
+        <xmpp:since>5.0.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0199.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0203.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0206.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0245.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0249.html"/>
+        <xmpp:since>0.8.2</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0280.html"/>
+        <xmpp:since>0.8.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0297.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0308.html"/>
+        <xmpp:since>4.0.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0313.html"/>
+        <xmpp:since>0.9.5</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0317.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0319.html"/>
+        <xmpp:since>4.0.5</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0333.html"/>
+        <xmpp:since>4.1.1</xmpp:since>
+        <xmpp:status>partial</xmpp:status>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0352.html"/>
+        <xmpp:since>0.9.4</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0357.html"/>
+        <xmpp:since>4.0.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0359.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0363.html"/>
+        <xmpp:since>4.0.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0371.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0372.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0382.html"/>
+        <xmpp:since>3.3.3</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0384.html"/>
+        <xmpp:since>4.0.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0393.html"/>
+        <xmpp:since>8.0.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0410.html"/>
+        <xmpp:since>5.0.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0421.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0422.html"/>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0424.html"/>
+        <xmpp:since>6.0.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0425.html"/>
+        <xmpp:since>6.0.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0437.html"/>
+        <xmpp:since>8.0.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0454.html"/>
+        <xmpp:since>8.0.0</xmpp:since>
+      </xmpp:SupportedXep>
+    </implements>
+  </Project>
+</rdf:RDF>

css/converse-muc-embedded.css

@@ -1,66 +0,0 @@
-/*
-    Color scheme helpers:
-    https://coolors.co/app/264653-2a9d8f-e9c46a-f4a261-e76f51
-    http://paletton.com/#uid=70a0u0kkNs+b4JOgryLpxqpsbkI
- */
-#converse-embedded-chat {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  bottom: auto;
-  right: auto;
-  position: relative;
-  width: 100%; }
-  #converse-embedded-chat *, #converse-embedded-chat *:before, #converse-embedded-chat *:after {
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box; }
-  #converse-embedded-chat form.pure-form.converse-centered-form {
-    position: absolute;
-    top: 30%;
-    transform: translateY(-50%); }
-  #converse-embedded-chat .chatroom {
-    width: auto; }
-  #converse-embedded-chat .flyout {
-    bottom: auto;
-    display: block;
-    position: relative; }
-  #converse-embedded-chat .chatbox {
-    float: none; }
-    #converse-embedded-chat .chatbox .box-flyout {
-      box-shadow: none; }
-    #converse-embedded-chat .chatbox .chat-title {
-      padding: 0.3em;
-      font-size: 120%; }
-  #converse-embedded-chat .chatbox-btn {
-    display: none; }
-  #converse-embedded-chat .chatroom .box-flyout {
-    min-width: auto;
-    width: 100%;
-    height: 55vh; }
-    #converse-embedded-chat .chatroom .box-flyout .chat-body {
-      height: -webkit-calc(100% - 55px);
-      height: calc(100% - 55px); }
-    #converse-embedded-chat .chatroom .box-flyout .occupants-heading {
-      font-size: 120%; }
-    #converse-embedded-chat .chatroom .box-flyout .chat-content {
-      height: calc(100% - 97px); }
-      #converse-embedded-chat .chatroom .box-flyout .chat-content .chat-message {
-        margin: 0.5em;
-        font-size: 120%; }
-    #converse-embedded-chat .chatroom .box-flyout .sendXMPPMessage .chat-textarea {
-      padding: 0.5em;
-      font-size: 110%; }
-    #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chatroom-form-container {
-      font-size: 180%;
-      float: left;
-      height: 100%;
-      position: relative; }
-      #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chatroom-form-container input {
-        font-size: 60%; }
-    #converse-embedded-chat .chatroom .box-flyout .occupants .occupant-list {
-      padding-left: 0.3em; }
-      #converse-embedded-chat .chatroom .box-flyout .occupants .occupant-list li.occupant {
-        font-size: 120%; }
-
-/*# sourceMappingURL=converse-muc-embedded.css.map */

css/images/arrow.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24px" height="12px" viewBox="0 0 24 12" zoomAndPan="disable">
-	<line x1="0" y1="0" x2="12" y2="12" style="stroke:#ccc;stroke-width:1.5" />
-	<line x1="24" y1="0" x2="12" y2="12" style="stroke:#ccc;stroke-width:1.5" />
-</svg>

css/images/dark-arrow.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24px" height="12px" viewBox="0 0 24 12" zoomAndPan="disable">
-	<line x1="0" y1="0" x2="12" y2="12" style="stroke:rgba(255,255,255,0.65);stroke-width:1" />
-	<line x1="24" y1="0" x2="12" y2="12" style="stroke:rgba(255,255,255,0.65);stroke-width:1" />
-</svg>

css/jasmine.css

@@ -1,82 +0,0 @@
-body { background-color: #eeeeee; padding: 0; margin: 5px; overflow-y: scroll; }
-
-#HTMLReporter { font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: goldenrod; }
-#HTMLReporter a { text-decoration: none; }
-#HTMLReporter a:hover { text-decoration: underline; }
-#HTMLReporter p, #HTMLReporter h1, #HTMLReporter h2, #HTMLReporter h3, #HTMLReporter h4, #HTMLReporter h5, #HTMLReporter h6 { margin: 0; line-height: 14px; }
-#HTMLReporter .banner, #HTMLReporter .symbolSummary, #HTMLReporter .summary, #HTMLReporter .resultMessage, #HTMLReporter .specDetail .description, #HTMLReporter .alert .bar, #HTMLReporter .stackTrace { padding-left: 9px; padding-right: 9px; }
-#HTMLReporter #jasmine_content { position: fixed; right: 100%; }
-#HTMLReporter .version { color: #aaaaaa; }
-#HTMLReporter .banner { margin-top: 14px; }
-#HTMLReporter .duration { color: #aaaaaa; float: right; }
-#HTMLReporter .symbolSummary { overflow: hidden; *zoom: 1; margin: 14px 0; }
-#HTMLReporter .symbolSummary li { display: block; float: left; height: 7px; width: 14px; margin-bottom: 7px; font-size: 16px; }
-#HTMLReporter .symbolSummary li.passed { font-size: 14px; }
-#HTMLReporter .symbolSummary li.passed:before { color: lightgreen; content: "\02022"; }
-#HTMLReporter .symbolSummary li.failed { line-height: 9px; }
-#HTMLReporter .symbolSummary li.failed:before { color: #b03911; content: "x"; font-weight: bold; margin-left: -1px; }
-#HTMLReporter .symbolSummary li.skipped { font-size: 14px; }
-#HTMLReporter .symbolSummary li.skipped:before { color: #bababa; content: "\02022"; }
-#HTMLReporter .symbolSummary li.pending { line-height: 11px; }
-#HTMLReporter .symbolSummary li.pending:before { color: #aaaaaa; content: "-"; }
-#HTMLReporter .exceptions { color: #fff; float: right; margin-top: 5px; margin-right: 5px; }
-#HTMLReporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; }
-#HTMLReporter .runningAlert { background-color: #666666; }
-#HTMLReporter .skippedAlert { background-color: #aaaaaa; }
-#HTMLReporter .skippedAlert:first-child { background-color: #333333; }
-#HTMLReporter .skippedAlert:hover { text-decoration: none; color: white; text-decoration: underline; }
-#HTMLReporter .passingAlert { background-color: #a6b779; }
-#HTMLReporter .passingAlert:first-child { background-color: lightgreen; }
-#HTMLReporter .failingAlert { background-color: #cf867e; }
-#HTMLReporter .failingAlert:first-child { background-color: #b03911; }
-#HTMLReporter .results { margin-top: 14px; }
-#HTMLReporter #details { display: none; }
-#HTMLReporter .resultsMenu, #HTMLReporter .resultsMenu a { background-color: #fff; color: goldenrod; }
-#HTMLReporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; }
-#HTMLReporter.showDetails .summaryMenuItem:hover { text-decoration: underline; }
-#HTMLReporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; }
-#HTMLReporter.showDetails .summary { display: none; }
-#HTMLReporter.showDetails #details { display: block; }
-#HTMLReporter .summaryMenuItem { font-weight: bold; text-decoration: underline; }
-#HTMLReporter .summary { margin-top: 14px; }
-#HTMLReporter .summary .suite .suite, #HTMLReporter .summary .specSummary { margin-left: 14px; }
-#HTMLReporter .summary .specSummary.passed a { color: lightgreen; }
-#HTMLReporter .summary .specSummary.failed a { color: #b03911; }
-#HTMLReporter .description + .suite { margin-top: 0; }
-#HTMLReporter .suite { margin-top: 14px; }
-#HTMLReporter .suite a { color: goldenrod; }
-#HTMLReporter #details .specDetail { margin-bottom: 28px; }
-#HTMLReporter #details .specDetail .description { display: block; color: white; background-color: #b03911; }
-#HTMLReporter .resultMessage { padding-top: 14px; color: goldenrod; }
-#HTMLReporter .resultMessage span.result { display: block; }
-#HTMLReporter .stackTrace { margin: 5px 0 0 0; max-height: 224px; overflow: auto; line-height: 18px; color: #666666; border: 1px solid #ddd; background: white; white-space: pre; }
-
-#TrivialReporter { padding: 8px 13px; position: absolute; top: 0; bottom: 0; left: 0; right: 0; overflow-y: scroll; background-color: white; font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; /*.resultMessage {*/ /*white-space: pre;*/ /*}*/ }
-#TrivialReporter a:visited, #TrivialReporter a { color: #303; }
-#TrivialReporter a:hover, #TrivialReporter a:active { color: blue; }
-#TrivialReporter .run_spec { float: right; padding-right: 5px; font-size: .8em; text-decoration: none; }
-#TrivialReporter .banner { color: #303; background-color: #fef; padding: 5px; }
-#TrivialReporter .logo { float: left; font-size: 1.1em; padding-left: 5px; }
-#TrivialReporter .logo .version { font-size: .6em; padding-left: 1em; }
-#TrivialReporter .runner.running { background-color: yellow; }
-#TrivialReporter .options { text-align: right; font-size: .8em; }
-#TrivialReporter .suite { border: 1px outset gray; margin: 5px 0; padding-left: 1em; }
-#TrivialReporter .suite .suite { margin: 5px; }
-#TrivialReporter .suite.passed { background-color: #dfd; }
-#TrivialReporter .suite.failed { background-color: #fdd; }
-#TrivialReporter .spec { margin: 5px; padding-left: 1em; clear: both; }
-#TrivialReporter .spec.failed, #TrivialReporter .spec.passed, #TrivialReporter .spec.skipped { padding-bottom: 5px; border: 1px solid gray; }
-#TrivialReporter .spec.failed { background-color: #fbb; border-color: red; }
-#TrivialReporter .spec.passed { background-color: #bfb; border-color: green; }
-#TrivialReporter .spec.skipped { background-color: #bbb; }
-#TrivialReporter .messages { border-left: 1px dashed gray; padding-left: 1em; padding-right: 1em; }
-#TrivialReporter .passed { background-color: #cfc; display: none; }
-#TrivialReporter .failed { background-color: #fbb; }
-#TrivialReporter .skipped { color: #777; background-color: #eee; display: none; }
-#TrivialReporter .resultMessage span.result { display: block; line-height: 2em; color: black; }
-#TrivialReporter .resultMessage .mismatch { color: black; }
-#TrivialReporter .stackTrace { white-space: pre; font-size: .8em; margin-left: 10px; max-height: 5em; overflow: auto; border: 1px inset red; padding: 1em; background: #eef; }
-#TrivialReporter .finished-at { padding-left: 1em; font-size: .6em; }
-#TrivialReporter.show-passed .passed, #TrivialReporter.show-skipped .skipped { display: block; }
-#TrivialReporter #jasmine_content { position: fixed; right: 100%; }
-#TrivialReporter .runner { border: 1px solid gray; display: block; margin: 5px 0; padding: 2px 0 2px 10px; }

css/mobile.css

@@ -1,11 +0,0 @@
-#conversejs {
-    left: 0px;
-    right: 0px;
-}
-.converse-chatroom {
-    font-size: 14px;
-}
-.intro {
-  padding: 0;
-  height: 100vh;
-}

css/theme.css

@@ -1,348 +0,0 @@
-body {
-  width: 100%;
-  height: 100%;
-  font-family: "Lora", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  color: #ffffff;
-  background-color: #211018;
-}
-html {
-  width: 100%;
-  height: 100%;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 0 0 35px;
-  font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-weight: 700;
-  letter-spacing: 1px;
-}
-h1 {
-  text-transform: uppercase;
-}
-p {
-  margin: 0 0 25px;
-  font-size: 18px;
-  line-height: 1.5;
-}
-@media (min-width: 767px) {
-  p {
-    margin: 0 0 35px;
-    font-size: 20px;
-    line-height: 1.6;
-  }
-}
-a {
-  color: #82B397;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
-}
-a:hover,
-a:focus {
-  text-decoration: none;
-  color: #00aaff;
-}
-.light {
-  font-weight: 400;
-}
-.navbar {
-  margin-bottom: 0;
-  border-bottom: 1px solid rgba(255, 255, 255, 0.3);
-  text-transform: uppercase;
-  font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  background-color: #211018;
-}
-.navbar-brand {
-  font-weight: 700;
-}
-.navbar-brand:focus {
-  outline: none;
-}
-.navbar-custom a {
-  color: #ffffff;
-}
-.navbar-custom .nav li a {
-  -webkit-transition: background 0.3s ease-in-out;
-  -moz-transition: background 0.3s ease-in-out;
-  transition: background 0.3s ease-in-out;
-}
-.navbar-custom .nav li a:hover,
-.navbar-custom .nav li a:focus,
-.navbar-custom .nav li.active {
-  outline: none;
-  background-color: rgba(255, 255, 255, 0.2);
-}
-.navbar-toggle {
-  padding: 4px 6px;
-  font-size: 16px;
-  color: #ffffff;
-}
-.navbar-toggle:focus,
-.navbar-toggle:active {
-  outline: none;
-}
-@media (min-width: 767px) {
-  .navbar {
-    padding: 20px 0;
-    border-bottom: none;
-    letter-spacing: 1px;
-    background: transparent;
-    -webkit-transition: background 0.5s ease-in-out, padding 0.5s ease-in-out;
-    -moz-transition: background 0.5s ease-in-out, padding 0.5s ease-in-out;
-    transition: background 0.5s ease-in-out, padding 0.5s ease-in-out;
-  }
-  .top-nav-collapse {
-    padding: 0;
-    background-color: #211018;
-  }
-  .navbar-custom.top-nav-collapse {
-    border-bottom: 1px solid rgba(255, 255, 255, 0.3);
-  }
-}
-@media (max-width: 480px) {
-    .navbar {
-        display: none;
-    }
-}
-
-.features-section,
-.outro,
-.intro {
-  width: 100%;
-  padding: 100px 0;
-  text-align: center;
-  color: #fff;
-}
-.intro {
-  background: url(images/header.jpg) no-repeat bottom center scroll;
-  background-color: #211018;
-  -webkit-background-size: cover;
-  -moz-background-size: cover;
-  background-size: cover;
-  -o-background-size: cover;
-}
-.features-section {
-  background: url('images/bgtr.svg') top right no-repeat, url('images/bgbl.svg') bottom left no-repeat, url('images/bgbl.svg') bottom left no-repeat, url('images/overlay.png'), linear-gradient(45deg, #85505f, #384955, #655361);
-}
-.features-section a {
-  color: #82B397;
-}
-.outro {
-  background: url('images/bgtr.svg') top right no-repeat, url('images/bgbl.svg') bottom left no-repeat, url('images/overlay.png'), linear-gradient(45deg, #384955, #655361, #85505f);
-}
-.brand-heading {
-  font-size: 2em;
-  text-align: center;
-  margin-top: 3em;
-}
-.brand-heading-embedded {
-    margin-top: 1.5em;
-}
-.intro-text {
-  font-size: 18px;
-}
-@media (min-width: 767px) {
-  .intro {
-    height: 100%;
-    padding: 0;
-  }
-  .brand-heading {
-    font-size: 80px;
-  }
-  .intro-text {
-    font-size: 25px;
-  }
-}
-.btn-circle {
-  width: 70px;
-  height: 70px;
-  margin-top: 15px;
-  padding: 7px 16px;
-  border: 2px solid #ffffff;
-  border-radius: 35px;
-  font-size: 40px;
-  color: #ffffff;
-  background: transparent;
-  -webkit-transition: background 0.3s ease-in-out;
-  -moz-transition: background 0.3s ease-in-out;
-  transition: background 0.3s ease-in-out;
-}
-.btn-circle:hover,
-.btn-circle:focus {
-  outline: none;
-  color: #ffffff;
-  background: rgba(255, 255, 255, 0.1);
-}
-.page-scroll .btn-circle i.animated {
-  -webkit-transition-property: -webkit-transform;
-  -webkit-transition-duration: 1s;
-  -moz-transition-property: -moz-transform;
-  -moz-transition-duration: 1s;
-}
-.page-scroll .btn-circle:hover i.animated {
-  -webkit-animation-name: pulse;
-  -moz-animation-name: pulse;
-  -webkit-animation-duration: 1.5s;
-  -moz-animation-duration: 1.5s;
-  -webkit-animation-iteration-count: infinite;
-  -moz-animation-iteration-count: infinite;
-  -webkit-animation-timing-function: linear;
-  -moz-animation-timing-function: linear;
-}
-/*
-@-webkit-keyframes pulse {
-  0 {
-    -webkit-transform: scale(1);
-    transform: scale(1);
-  }
-  50% {
-    -webkit-transform: scale(1.2);
-    transform: scale(1.2);
-  }
-  100% {
-    -webkit-transform: scale(1);
-    transform: scale(1);
-  }
-}
-@-moz-keyframes pulse {
-  0 {
-    -moz-transform: scale(1);
-    transform: scale(1);
-  }
-  50% {
-    -moz-transform: scale(1.2);
-    transform: scale(1.2);
-  }
-  100% {
-    -moz-transform: scale(1);
-    transform: scale(1);
-  }
-}
-*/
-.content-section {
-  padding-top: 100px;
-}
-.donate-section {
-  width: 100%;
-  padding: 50px 0;
-  color: #ffffff;
-  background-color: #211018;
-}
-.donate-section p.bitcoin-header {
-  margin: 0 0 5px;
-}
-@media (min-width: 767px) {
-  .content-section {
-    padding-top: 150px;
-    padding-bottom: 50px;
-  }
-  .donate-section {
-    padding: 100px 0;
-  }
-}
-.btn {
-  text-transform: uppercase;
-  font-family: FontAwesome;
-  font-weight: 400;
-  -webkit-transition: all 0.3s ease-in-out;
-  -moz-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
-}
-.btn-default {
-  border: 1px solid #82B397;
-  color: #82B397;
-  background-color: transparent;
-}
-.btn-default:hover,
-.btn-default:focus {
-  border: 1px solid #82B397;
-  outline: none;
-  color: #211018;
-  background-color: #82B397;
-}
-.btn-huge {
-  padding: 25px;
-  font-size: 26px;
-}
-.banner-social-buttons {
-    padding-top: 7em;
-}
-::-moz-selection {
-  text-shadow: none;
-  background: #fcfcfc;
-  background: rgba(255, 255, 255, 0.2);
-}
-::selection {
-  text-shadow: none;
-  background: #fcfcfc;
-  background: rgba(255, 255, 255, 0.2);
-}
-img::selection {
-  background: transparent;
-}
-img::-moz-selection {
-  background: transparent;
-}
-body {
-  webkit-tap-highlight-color: rgba(255, 255, 255, 0.2);
-}
-ul.contact,
-ul.integration,
-ul.screencasts,
-ul.features {
-  text-align: left;
-  font-size: 19px;
-}
-.feature-icon {
-  display: inline-block;
-  position: relative;
-  padding-bottom: 5em;
-  margin-bottom: 2.75em;
-  cursor: default;
-  color: #fff;
-}
-.feature-icon .fa {
-  display: inline-block;
-  width: 2em;
-  height: 2em;
-  font-size: 4em;
-  border-radius: 100%;
-  box-shadow: inset 0 0 0 1px white;
-  color: white;
-  line-height: 2.1em;
-}
-.feature-icon:before {
-  content: '';
-  background: white;
-  position: absolute;
-  bottom: 0;
-  left: 50%;
-  margin-left: -0.325em;
-  width: 0.65em;
-  height: 0.65em;
-  display: block;
-  border-radius: 100%;
-}
-.feature-icon:after {
-  content: '';
-  position: absolute;
-  left: 50%;
-  bottom: 0.65em;
-  width: 1px;
-  height: 4.35em;
-  background: white;
-  margin-left: -0.5px;
-}
-.row {
-    margin-left: 0;
-    margin-right: 0;
-}
-.sponsors {
-    clear: both;
-    font-size: 1.1em;
-    padding: 2em 0 7em 0;
-}

demo/anonymous.html

@@ -1,55 +1,103 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Converse.js</title>
+    <title>Converse - Anonymous login demo</title>
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="description" content="Converse.js: A free chat client for your website" />
+    <meta name="description" content="Converse XMPP/Jabber Chat"/>
     <meta name="author" content="JC Brand" />
-    <meta name="keywords" content="xmpp chat webchat converse.js" />
-    <link rel="shortcut icon" type="image/ico" href="../css/images/favicon.ico"/>
-    <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="https://cdn.conversejs.org/css/theme.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/converse.min.css" />
-    <script type="text/javascript" src="../analytics.js"></script>
+    <meta name="keywords" content="xmpp chat webchat converse.js Converse" />
+
+    <!-- These files are NOT needed when using converse.js in your own project. -->
+    <link rel="shortcut icon" type="image/ico" href="/dist/favicon.ico"/>
+    <link type="text/css" rel="stylesheet" media="screen" href="/dist/website.min.css" />
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
-    <![if gte IE 9]>
-        <script src="https://cdn.conversejs.org/dist/converse.min.js"></script>
-    <![endif]>
+    <script type="text/javascript" src="analytics.js"></script>
+    <!-- *********************************************************************** -->
+
+    <link rel="manifest" href="/manifest.json">
+    <link type="text/css" rel="stylesheet" media="screen" href="/dist/converse.min.css" />
+    <script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
+    <script src="/dist/converse.min.js"></script>
 </head>
 
-<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
-    <nav class="navbar navbar-custom navbar-fixed-top" role="navigation">
-        <div class="container">
-            <div class="navbar-header page-scroll">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
-                    <i class="fa fa-bars"></i>
-                </button>
-            </div>
-            <div class="collapse navbar-collapse navbar-right navbar-main-collapse">
-                <ul class="nav navbar-nav"><li> <a href="/docs/html/index.html">Documentation</a> </li>
-                </ul>
-            </div>
+<body id="page-top" data-spy="scroll" class="converse-website">
+<section class="section-wrapper">
+    <nav class="navbar sticky-top navbar-expand-lg" role="navigation">
+        <div class="collapse navbar-collapse" id="navbarTogglerDemo01">
+            <span class="page-scroll">
+                <a class="navbar-brand" href="/"><span class="converse-brand-heading">Home</span></a>
+                <a class="navbar-brand" href="/demo"><span class="converse-brand-heading">Demos</span></a>
+            </span>
         </div>
     </nav>
 
-    <section class="intro">
-        <div class="intro-body">
-            <div class="container">
+    <section id="intro" class="intro" class="container">
         <div class="row">
-                    <div class="col-md-8 col-md-offset-2">
-                        <h1 class="brand-heading"><i class="icon-conversejs"></i>Converse.js</h1>
+            <div class="col-md-12 col-md-offset-2">
+                <h1 class="brand-heading fade-in">
+                    <svg class="converse-svg-logo"
+                        xmlns:svg="http://www.w3.org/2000/svg"
+                        xmlns="http://www.w3.org/2000/svg"
+                        xmlns:xlink="http://www.w3.org/1999/xlink"
+                        viewBox="0 0 364 364">
+                    <title>Converse</title>
+                    <g class="cls-1" id="g904">
+                        <g data-name="Layer 2">
+                            <g data-name="Layer 7">
+                                <path
+                                    class="cls-3"
+                                    d="M221.46,103.71c0,18.83-29.36,18.83-29.12,0C192.1,84.88,221.46,84.88,221.46,103.71Z" />
+                                <path
+                                    class="cls-4"
+                                    d="M179.9,4.15A175.48,175.48,0,1,0,355.38,179.63,175.48,175.48,0,0,0,179.9,4.15Zm-40.79,264.5c-.23-17.82,27.58-17.82,27.58,0S138.88,286.48,139.11,268.65ZM218.6,168.24A79.65,79.65,0,0,1,205.15,174a12.76,12.76,0,0,0-6.29,4.65L167.54,222a1.36,1.36,0,0,1-2.46-.8v-35.8a2.58,2.58,0,0,0-3.06-2.53c-15.43,3-30.23,7.7-42.73,19.94-38.8,38-29.42,105.69,16.09,133.16a162.25,162.25,0,0,1-91.47-67.27C-3.86,182.26,34.5,47.25,138.37,25.66c46.89-9.75,118.25,5.16,123.73,62.83C265.15,120.64,246.56,152.89,218.6,168.24Z" />
+                            </g>
+                        </g>
+                    </g>
+                </svg>
+                <span class="brand-heading__text">
+                    <span>converse<span class="subdued">.js</span></span>
+                    <p class="byline">messaging freedom</p>
+                </span>
+                </h1>
+
                 <p class="intro-text">Anonymous login demo</p>
             </div>
         </div>
-            </div>
-        </div>
+    </section>
 </section>
 </body>
 
 <script>
+    /*
+    @licstart
+    This is free and unencumbered software released into the public domain.
+
+    Anyone is free to copy, modify, publish, use, compile, sell, or
+    distribute this software, either in source code form or as a compiled
+    binary, for any purpose, commercial or non-commercial, and by any
+    means.
+
+    In jurisdictions that recognize copyright laws, the author or authors
+    of this software dedicate any and all copyright interest in the
+    software to the public domain. We make this dedication for the benefit
+    of the public at large and to the detriment of our heirs and
+    successors. We intend this dedication to be an overt act of
+    relinquishment in perpetuity of all present and future rights to this
+    software under copyright law.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+    OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+    OTHER DEALINGS IN THE SOFTWARE.
+
+    For more information, please refer to <http://unlicense.org/>
+    @licend
+	*/
         converse.initialize({
             allow_logout: false, // No point in logging out when we have auto_login as true.
             allow_muc_invitations: false, // Doesn't make sense to allow because only

demo/config.js

@@ -1,2 +0,0 @@
-config.baseUrl = '..';
-require.config(config);

demo/embedded.html

@@ -1,97 +1,103 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Converse.js</title>
+    <title>Converse - Anonymous login demo</title>
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="description" content="Converse.js: A free chat client for your website" />
+    <meta name="description" content="Converse XMPP/Jabber Chat"/>
     <meta name="author" content="JC Brand" />
-    <meta name="keywords" content="xmpp chat webchat converse.js" />
-    <link rel="shortcut icon" type="image/ico" href="../css/images/favicon.ico"/>
-    <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="https://cdn.conversejs.org/css/theme.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/converse.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/converse-muc-embedded.min.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]>
-	<script src="../dist/converse-muc-embedded.min.js"></script>
-    <![endif]>
+    <meta name="keywords" content="xmpp chat webchat converse.js Converse" />
+
+    <!-- These files are NOT needed when using converse.js in your own project. -->
+    <link rel="shortcut icon" type="image/ico" href="../dist/favicon.ico"/>
+    <link type="text/css" rel="stylesheet" media="screen" href="../dist/website.min.css" />
+    <noscript><p><img src="https://stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
+    <script type="text/javascript" src="/analytics.js"></script>
+    <!-- *********************************************************************** -->
+
+    <link rel="manifest" href="../manifest.json">
+    <link type="text/css" rel="stylesheet" media="screen" href="../dist/converse.min.css" />
+    <script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
+    <script src="../dist/converse.min.js"></script>
+
+    <style>
+        .converse-container {
+            height: 50vh;
+        }
+    </style>
 </head>
 
-<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
-    <nav class="navbar navbar-custom navbar-fixed-top" role="navigation">
-        <div class="container">
-            <div class="navbar-header page-scroll">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
-                    <i class="fa fa-bars"></i>
-                </button>
-            </div>
-            <div class="collapse navbar-collapse navbar-right navbar-main-collapse">
-                <ul class="nav navbar-nav"><li> <a href="/docs/html/index.html">Documentation</a> </li>
-                </ul>
-            </div>
+
+<body id="page-top" data-spy="scroll" class="converse-website">
+<section class="section-wrapper">
+    <nav class="navbar sticky-top navbar-expand-lg" role="navigation">
+        <div class="collapse navbar-collapse" id="navbarTogglerDemo01">
+            <span class="page-scroll">
+                <a class="navbar-brand" href="/"><span class="converse-brand-heading">Home</span></a>
+		<a class="navbar-brand" href="/demo"><span class="converse-brand-heading">Demos</span></a>
+            </span>
         </div>
     </nav>
-
     <section class="intro">
         <div class="intro-body">
             <div class="container">
                 <div class="row">
-                    <div class="col-md-8 col-md-offset-2">
-                        <h1 class="brand-heading brand-heading-embedded"><a style="color: white;" href="/"><i class="icon-conversejs"></i>Converse.js</a></h1>
-                        <p class="intro-text">Embedded MUC chat demo</p>
+                    <div class="col-md-12">
+			<h1 class="brand-heading fade-in" style="margin: 1.5em 0 0 0">
+			    <svg class="converse-svg-logo"
+				xmlns:svg="http://www.w3.org/2000/svg"
+				xmlns="http://www.w3.org/2000/svg"
+				xmlns:xlink="http://www.w3.org/1999/xlink"
+				viewBox="0 0 364 364">
 
-                        <div id="converse-embedded-chat"></div>
+				<title>Home</title>
+				<g class="cls-1" id="g904">
+				    <g data-name="Layer 2">
+					<g data-name="Layer 7">
+					    <path
+						class="cls-3"
+						d="M221.46,103.71c0,18.83-29.36,18.83-29.12,0C192.1,84.88,221.46,84.88,221.46,103.71Z" />
+					    <path
+						class="cls-4"
+						d="M179.9,4.15A175.48,175.48,0,1,0,355.38,179.63,175.48,175.48,0,0,0,179.9,4.15Zm-40.79,264.5c-.23-17.82,27.58-17.82,27.58,0S138.88,286.48,139.11,268.65ZM218.6,168.24A79.65,79.65,0,0,1,205.15,174a12.76,12.76,0,0,0-6.29,4.65L167.54,222a1.36,1.36,0,0,1-2.46-.8v-35.8a2.58,2.58,0,0,0-3.06-2.53c-15.43,3-30.23,7.7-42.73,19.94-38.8,38-29.42,105.69,16.09,133.16a162.25,162.25,0,0,1-91.47-67.27C-3.86,182.26,34.5,47.25,138.37,25.66c46.89-9.75,118.25,5.16,123.73,62.83C265.15,120.64,246.56,152.89,218.6,168.24Z" />
+					</g>
+				    </g>
+				</g>
+			    </svg>
+			    <span class="brand-heading__text">
+				<span>converse<span class="subdued">.js</span></span>
+				<p class="byline">messaging freedom</p>
+			    </span>
+			</h1>
+                        <p class="intro-text">Embedded MUC chat demo</p>
+                        <div class="converse-container">
+                            <converse-root></converse-root>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
     </section>
+</section>
 </body>
 
 <script>
     converse.initialize({
-        allow_logout: false, // No point in logging out when we have auto_login as true.
-        allow_muc_invitations: false, // Doesn't make sense to allow because only
-                                        // roster contacts can be invited
-        allow_contact_requests: false, // Contacts from other servers cannot,
-                                        // be added and anonymous users don't
-                                        // know one another's JIDs, so disabling.
-        auto_reconnect: true,
         authentication: 'anonymous',
         auto_login: true,
         auto_join_rooms: [
             'anonymous@conference.nomnom.im',
         ],
-        // Whitelist non-core plugins that we need
-        whitelisted_plugins: ['converse-muc-embedded'],
-        // Blacklist plugins which aren't included in the build file, 
-        // so that other code cannot register their own plugins under
-        // those names.
-        blacklisted_plugins: [
-            "converse-bookmarks",
-            "converse-controlbox",
-            "converse-dragresize",
-            "converse-headline",
-            "converse-minimize",
-            "converse-otr",
-            "converse-register",
-            "converse-vcard",
-        ],
-        notify_all_room_messages: [
-            'anonymous@conference.nomnom.im',
-        ],
         bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
         jid: 'nomnom.im', // XMPP server which allows anonymous login (doesn't
                           // allow chatting with other XMPP servers).
-        keepalive: true,
-        hide_muc_server: true, // Federation is disabled, so no use in
-                                // showing the MUC server.
-        play_sounds: true,
-        strict_plugin_dependencies: false
+        notify_all_room_messages: [
+            'anonymous@conference.nomnom.im',
+        ],
+        singleton: true,
+        locales_url: "../locale/{{{locale}}}/LC_MESSAGES/converse.json",
+        view_mode: 'embedded',
     });
 </script>
 </html>

demo/index.html

@@ -1,130 +1,113 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Converse.js</title>
+    <title>Converse Demos</title>
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="description" content="Converse.js: A free chat client for your website" />
+    <meta name="description" content="Converse XMPP/Jabber Chat"/>
     <meta name="author" content="JC Brand" />
-    <meta name="keywords" content="xmpp chat webchat converse.js" />
-    <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
-    <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" />
-    <script type="text/javascript" src="analytics.js"></script>
+    <meta name="keywords" content="xmpp chat webchat converse.js Converse" />
+
+    <!-- These files are NOT needed when using converse.js in your own project. -->
+    <link rel="shortcut icon" type="image/ico" href="/dist/favicon.ico"/>
+    <link type="text/css" rel="stylesheet" media="screen" href="/dist/website.min.css" />
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
-    <![if gte IE 9]>
+    <script type="text/javascript" src="analytics.js"></script>
+    <!-- *********************************************************************** -->
+
+    <link rel="manifest" href="/manifest.json">
+    <link type="text/css" rel="stylesheet" media="screen" href="/dist/converse.min.css" />
+    <script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
     <script src="/dist/converse.min.js"></script>
-    <![endif]>
 </head>
 
-<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
-
-    <nav class="navbar navbar-custom navbar-fixed-top" role="navigation">
-        <div class="container">
-            <div class="navbar-header page-scroll">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
-                    <i class="fa fa-bars"></i>
-                </button>
-                <a class="navbar-brand" href="/#page-top">
-                    <i class="fa fa-play-circle"></i>  <span class="light">Home</span>
-                </a>
+<body id="page-top" data-spy="scroll" class="converse-website">
+<section class="section-wrapper">
+    <nav class="navbar sticky-top navbar-expand-lg" role="navigation">
+        <div class="collapse navbar-collapse" id="navbarTogglerDemo01">
+            <span class="page-scroll">
+                <a class="navbar-brand" href="/"><span class="converse-brand-heading">Home</span></a>
+            </span>
         </div>
-
-            <!-- Collect the nav links, forms, and other content for toggling -->
-            <div class="collapse navbar-collapse navbar-right navbar-main-collapse">
-                <ul class="nav navbar-nav">
-                    <!-- Hidden li included to remove active class from about link when scrolled up past about section -->
-                    <li class="hidden">
-                        <a href="#page-top"></a>
-                    </li>
-                    <li class="page-scroll">
-                        <a href="#about">About</a>
-                    </li>
-                    <li class="page-scroll">
-                        <a href="#features">Features</a>
-                    </li>
-                    <li class="page-scroll">
-                        <a href="#contact">Contact</a>
-                    </li>
-                    <li>
-                        <a href="/docs/html/manual.html">User Manual</a>
-                    </li>
-                    <li>
-                        <a href="/docs/html/index.html">Documentation</a>
-                    </li>
-                    <li>
-                        <a href="https://github.com/jcbrand/converse.js/releases" class="button" target="_blank">Download</a>
-                    </li>
-                </ul>
-            </div>
-            <!-- /.navbar-collapse -->
-        </div>
-        <!-- /.container -->
     </nav>
 
-    <section class="intro" class="container">
+    <section id="intro" class="intro" class="container">
         <div class="row">
-            <h1 class="brand-heading"><i class="icon-conversejs"></i> Converse.js</h1>
-            <div class="col-md-8 col-md-offset-2">
+            <div class="col-md-12 col-md-offset-2">
+                <h1 class="brand-heading fade-in">
+                    <svg class="converse-svg-logo"
+                        xmlns:svg="http://www.w3.org/2000/svg"
+                        xmlns="http://www.w3.org/2000/svg"
+                        xmlns:xlink="http://www.w3.org/1999/xlink"
+                        viewBox="0 0 364 364">
+                    <title>Home</title>
+                    <g class="cls-1" id="g904">
+                        <g data-name="Layer 2">
+                            <g data-name="Layer 7">
+                                <path
+                                    class="cls-3"
+                                    d="M221.46,103.71c0,18.83-29.36,18.83-29.12,0C192.1,84.88,221.46,84.88,221.46,103.71Z" />
+                                <path
+                                    class="cls-4"
+                                    d="M179.9,4.15A175.48,175.48,0,1,0,355.38,179.63,175.48,175.48,0,0,0,179.9,4.15Zm-40.79,264.5c-.23-17.82,27.58-17.82,27.58,0S138.88,286.48,139.11,268.65ZM218.6,168.24A79.65,79.65,0,0,1,205.15,174a12.76,12.76,0,0,0-6.29,4.65L167.54,222a1.36,1.36,0,0,1-2.46-.8v-35.8a2.58,2.58,0,0,0-3.06-2.53c-15.43,3-30.23,7.7-42.73,19.94-38.8,38-29.42,105.69,16.09,133.16a162.25,162.25,0,0,1-91.47-67.27C-3.86,182.26,34.5,47.25,138.37,25.66c46.89-9.75,118.25,5.16,123.73,62.83C265.15,120.64,246.56,152.89,218.6,168.24Z" />
+                            </g>
+                        </g>
+                    </g>
+                </svg>
+                <span class="brand-heading__text">
+                    <span>converse<span class="subdued">.js</span></span>
+                    <p class="byline">messaging freedom</p>
+                </span>
+                </h1>
+
                 <p class="intro-text">Demos:</p>
                 <p class="intro-text">
                     <ul style="list-style: none; font-size: 22px;">
-                        <li><a href="https://inverse.chat" target="_blank" rel="noopener">As a fullscreen application</a></li>
+                        <li><a href="/fullscreen.html">As a fullscreen application</a></li>
                         <li><a href="/demo/anonymous.html">Anonymous login</a></li>
                         <li><a href="/demo/embedded.html">Single MUC chatroom embedded into the page</a></li>
-                        <li><a href="/demo/without_bundled_dependencies.html">Dependencies loaded externally as &lt;script&gt; tags</a></li>
                     </ul>
                 </p>
             </div>
         </div>
     </section>
+    </section>
+</section>
 </body>
 
 <script>
-    require(['converse'], function (converse) {
-        (function () {
-            /* XXX: This function initializes jquery.easing for the https://conversejs.org
-            * website. This code is only useful in the context of the converse.js
-            * 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;
-                },
-            });
+    /*
+    @licstart
+    This is free and unencumbered software released into the public domain.
 
-            $(window).scroll(function() {
-                if ($(".navbar").offset().top > 50) {
-                    $(".navbar-fixed-top").addClass("top-nav-collapse");
-                } else {
-                    $(".navbar-fixed-top").removeClass("top-nav-collapse");
-                }
-            });
-            //jQuery for page scrolling feature - requires jQuery Easing plugin
-            $('.page-scroll a').bind('click', function(event) {
-                var $anchor = $(this);
-                $('html, body').stop().animate({
-                    scrollTop: $($anchor.attr('href')).offset().top
-                }, 700, 'easeInOutExpo');
-                event.preventDefault();
-            });
-        })();
+    Anyone is free to copy, modify, publish, use, compile, sell, or
+    distribute this software, either in source code form or as a compiled
+    binary, for any purpose, commercial or non-commercial, and by any
+    means.
+
+    In jurisdictions that recognize copyright laws, the author or authors
+    of this software dedicate any and all copyright interest in the
+    software to the public domain. We make this dedication for the benefit
+    of the public at large and to the detriment of our heirs and
+    successors. We intend this dedication to be an overt act of
+    relinquishment in perpetuity of all present and future rights to this
+    software under copyright law.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+    OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+    OTHER DEALINGS IN THE SOFTWARE.
+
+    For more information, please refer to <https://unlicense.org/>
+    @licend
+    */
     converse.initialize({
         // Please use this connection manager only for testing purposes
-            bosh_service_url: 'https://conversejs.org/http-bind/',
-            keepalive: true,
-            message_carbons: true,
-            play_sounds: true,
-            roster_groups: true,
-            show_controlbox_by_default: true,
-        });
+        bosh_service_url: 'https://conversejs.org/http-bind/'
     });
 </script>
 </html>

demo/without_bundled_dependencies.html

@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Converse.js (Non-AMD Example)</title>
-    <meta charset='utf-8' />
-    <meta http-equiv="X-UA-Compatible" content="chrome=1" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="description" content="Converse.js: A free chat client for your website" />
-    <meta name="author" content="JC Brand" />
-    <link rel="shortcut icon" type="image/ico" href="../css/images/favicon.ico"/>
-    <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" />
-
-    <!-- BEGIN JQUERY -->
-    <script type="text/javascript" src="../node_modules/jquery/dist/jquery.js"></script>
-    <script type="text/javascript" src="../node_modules/jquery.browser/dist/jquery.browser.js"></script>
-    <!-- END JQUERY -->
-
-    <!-- BEGIN OTR: Off-the-record encryption stuff. Can be omitted if OTR is not used. -->
-    <script type="text/javascript" src="../node_modules/otr/build/dep/crypto.js"></script>
-    <script type="text/javascript" src="../node_modules/otr/build/dep/salsa20.js"></script>
-    <script type="text/javascript" src="../node_modules/otr/build/dep/bigint.js"></script>
-    <script type="text/javascript" src="../node_modules/otr/build/dep/eventemitter.js"></script>
-    <script type="text/javascript" src="../node_modules/otr/build/otr.js"></script>
-    <!-- END OTR -->
-
-    <!-- BEGIN STROPHE -->
-    <script type="text/javascript" src="../node_modules/strophe.js/strophe.js"></script>
-    <script type="text/javascript" src="../node_modules/strophejs-plugin-vcard/strophe.vcard.js"></script>
-    <script type="text/javascript" src="../node_modules/strophejs-plugin-disco/strophe.disco.js"></script>
-    <script type="text/javascript" src="../node_modules/strophejs-plugin-rsm/strophe.rsm.js"></script>
-    <script type="text/javascript" src="../node_modules/strophejs-plugin-ping/strophe.ping.js"></script>
-    <!-- END STROPHE -->
-
-    <!-- BEGIN BACKBONE -->
-    <script type="text/javascript" src="../node_modules/lodash/lodash.js"></script>
-    <script type="text/javascript" src="../node_modules/backbone//backbone.js"></script>
-    <script type="text/javascript" src="../node_modules/backbone.browserStorage/backbone.browserStorage.js"></script>
-    <script type="text/javascript" src="../node_modules/backbone.overview/backbone.overview.js"></script>
-    <!-- END BACKBONE -->
-
-    <!-- BEGIN I18N -->
-    <!-- These files can be removed if you don't want to include any
-        translations for converse.js.
-        If you want to modify which translations are included, you can modify
-        src/locales.js to remove those you don't need, and then run `make
-        build` to generates a new dist/locales.js file.
-    -->
-    <script type="text/javascript" src="../node_modules/jed/jed.js"></script>
-    <script type="text/javascript" src="../dist/locales.js"></script>
-    <!-- END I18N -->
-
-    <script type="text/javascript" src="../node_modules/awesomplete-avoid-xss/awesomplete.js"></script>
-    <script type="text/javascript" src="../node_modules/moment/min/moment-with-locales.js"></script>
-
-    <script type="text/javascript" src="../3rdparty/lodash.fp.js"></script>
-	<script src="../dist/converse-no-dependencies.js"></script>
-</head>
-<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
-    <section class="intro">
-        <div class="intro-body">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-8 col-md-offset-2">
-                        <h1 class="brand-heading"><i class="icon-conversejs"></i>Converse.js</h1>
-                        <p class="intro-text">An example page where external dependencies are loaded seperately and not within the converse.js bundle.</p>
-                        <p class="intro-text">Look at the page source for details.</p>
-                        <p class="intro-text">For this page to work, you'll need to
-                            <a href="https://conversejs.org/docs/html/developer_guidelines.html#installing-the-development-and-front-end-dependencies">
-                            install the 3rd party dependencies</a> of converse.js.
-                        </p>
-                        <div class="page-scroll">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-</body>
-
-<script>
-    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
-        prebind: false,
-        show_controlbox_by_default: true,
-        debug: true,
-        roster_groups: true,
-        keepalive: true
-    });
-</script>
-</html>

dev.html

@@ -1,77 +1,50 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Converse.js</title>
+    <title>Converse</title>
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="description" content="Converse.js: A free chat client for your website" />
+    <meta name="description" content="Converse XMPP/Jabber Chat" />
     <meta name="author" content="JC Brand" />
     <meta name="keywords" content="xmpp chat webchat converse.js" />
-    <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
-    <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.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
-    <script src="node_modules/requirejs/require.js"></script>
-    <script src="src/config.js"></script>
+    <link rel="manifest" href="./manifest.json">
+    <link rel="shortcut icon" type="image/ico" href="images/favicon.ico"/>
+    <link type="text/css" rel="stylesheet" media="screen" href="dist/website.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="dist/converse.css" />
+    <script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
+    <script src="dist/converse.js"></script>
 </head>
 
-<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
-    <nav class="navbar navbar-custom navbar-fixed-top" role="navigation">
-        <div class="container">
-            <div class="navbar-header page-scroll">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
-                    <i class="fa fa-bars"></i>
-                </button>
-            </div>
-            <div class="collapse navbar-collapse navbar-right navbar-main-collapse">
-                <ul class="nav navbar-nav"><li> <a href="/docs/html/index.html">Documentation</a> </li>
-                </ul>
-            </div>
-        </div>
-    </nav>
-
-    <section class="intro">
-        <div class="intro-body">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-8 col-md-offset-2">
-                        <h1 class="brand-heading"><i class="icon-conversejs"></i>Converse.js</h1>
-                        <p class="intro-text">Developer page.</p>
-                        <p class="intro-text">
-                            Converse.js will only work on this page if you have 
-                            <a href="https://conversejs.org/docs/html/development.html">set up the development environment</a>.
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-</body>
-
+<body class="reset" style="background-color: var(--global-background-color)">
+<div id="conversejs-bg"></div>
 <script>
-    require(['converse'], function (converse) {
-        converse.initialize({
-            auto_away: 300,
-            i18n: 'en',
-            // auto_join_rooms: [
-            //     'discuss@conference.conversejs.org',
-            //     'prosody@conference.prosody.im',
-            //     'jdev@conference.jabber.org'
-            // ],
-            notify_all_room_messages: [
-                'discuss@conference.conversejs.org'
-            ],
-            auto_reconnect: true,
-            bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
-            message_archiving: 'always',
-            show_controlbox_by_default: true,
-            strict_plugin_dependencies: false,
-            chatstate_notification_blacklist: ['mulles@movim.eu'],
-            xhr_user_search: false,
-            debug: true
+
+    converse.plugins.add('converse-debug', {
+        initialize () {
+            const { _converse } = this;
+            window._converse = _converse;
+        }
     });
+
+    converse.initialize({
+        i18n: 'af',
+        theme: 'dracula',
+        auto_away: 300,
+        enable_smacks: true,
+        loglevel: 'debug',
+        reuse_scram_keys: true,
+        prune_messages_above: 100,
+        message_archiving: 'always',
+        muc_respect_autojoin: true,
+        muc_show_logs_before_join: true,
+        notify_all_room_messages: ['discuss@conference.conversejs.org'],
+        view_mode: 'fullscreen',
+        // websocket_url: 'wss://conversejs.org/xmpp-websocket',
+        websocket_url: 'ws://chat.example.org:5380/xmpp-websocket',
+        whitelisted_plugins: ['converse-debug'],
+        // connection_options: { worker: '/dist/shared-connection-worker.js' }
     });
 </script>
+</body>
 </html>

docs/.gitattributes

@@ -1 +0,0 @@
-CHANGES.rst merge=union

docs/DEVELOPER.rst

@@ -1,59 +0,0 @@
-Subscription flow
-=================
-
-Happy flow
-----------
-
-Contact1 makes a presence subscription request to contact2.
-
-::
-    <presence type="subscribe" to="contact2@localhost"/>
-
-Contact1 receives a roster update
-
-::
-    <iq type="set" to="contact1@localhost">
-        <query xmlns="jabber:iq:roster">
-            <item jid="contact2@localhost" ask="subscribe" subscription="none"></item>
-        </query>
-    </iq>
-
-Contact2 receives the presence subscription, but no
-roster update. We create a roster item manually in
-handleIncomingSubscription and add the 'requesting'
-property to indicate that this is an incoming request.
-
-Contact2 clicks "Accept". This confirms the
-subscription and subscribes back.
-
-::
-    <presence type="subscribed" to="contact1@localhost"/>
-    <presence type="subscribe" to="contact1@localhost"/>
-
-IF Contact1 is still online and likewise subscribes back, Contact2 will receive a roster update
-
-::
-    <iq type="set" to="contact2@localhost">
-        <query xmlns="jabber:iq:roster">
-            <item jid="contact1@localhost" ask="subscribe" subscription="from"></item>
-        </query>
-    </iq>
-
-ELSE, Contact 2 will receive a roster update (but not an IQ stanza)
-
-::
-    ask = null
-    subscription = "from"
-
-
-Contact1's converse.js client will automatically
-approve.
-
-Contact2 receives a roster update (as does contact1).
-
-::
-    <iq type="set" to="contact2@localhost">
-        <query xmlns="jabber:iq:roster">
-            <item jid="contact1@localhost" subscription="both"></item>
-        </query>
-    </iq>

docs/source/_static/api.css

@@ -0,0 +1,48 @@
+.brand-heading {
+  display: flex;
+}
+
+.brand-heading__text {
+  font-size: 6rem;
+  margin-left: 1rem;
+  margin-top: -1rem;
+}
+
+.subdued {
+  color: darkgray;
+}
+
+.byline {
+  font-size: 30%;
+  margin-top: 0;
+}
+
+section h1 {
+  margin-left: 0;
+}
+
+h2 {
+  font-size: 40px;
+}
+
+h3 {
+  font-size: 30px;
+}
+
+h4 {
+  font-size: 25px;
+  margin-top: 40px;
+}
+
+p {
+  font-size: 1.2rem;
+}
+
+.details {
+  margin-bottom: 20px;
+}
+
+.prettyprint code {
+  padding: 8px 12px;
+  font-family: courier;
+}

docs/source/_static/style.css

@@ -28,6 +28,63 @@ h5 {
     margin-right: 0.5em;
 }
 
+.nav-header {
+    font-weight: bold;
+    font-size: 110%;
+}
+
+.sidebar-title {
+    padding-left: 15px;
+    color: #716b7a;
+}
+
+.sponsors-list {
+    overflow-y: auto !important;
+    overflow-x: hidden;
+}
+
+.bs-sidenav .sponsors-list li a:hover {
+    background-color: transparent;
+    border: none;
+}
+
+.sponsors-list li {
+    padding: 0.5em 0;
+}
+
+.sponsors-list li a {
+    background-color: transparent;
+    text-align: center;
+}
+
+.centered-text-container {
+    display: block;
+    width: 100%;
+    text-align: center;
+}
+
+.patreon-link-container {
+    margin: 0.5em 0 1em 0;
+    padding: 0;
+}
+
+.patreon-link-container a {
+    font-size: 85%;
+}
+
+#sidebar > .nav-list {
+    max-height: 35vh;
+    overflow-y: auto;
+}
+
+.bs-sidenav .nav .nav > li > a {
+    font-size: 100%;
+}
+.bs-sidenav .nav .nav .nav > li > a {
+    font-size: 90%;
+    color: gray;
+}
+
 /*
 Copyright (c) 2012 Terrence Ryan
 

docs/source/_templates/jsdoc_layout.tmpl

@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Converse.js API Documentation <?js= title ?></title>
+    <script src="scripts/prettify/prettify.js"></script>
+    <script src="scripts/prettify/lang-css.js"></script>
+    <script src="./analytics.js"></script>
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+    <link type="text/css" rel="stylesheet" href="/docs/source/_static/api.css">
+    <link rel="shortcut icon" href="/images/favicon.ico"/>
+</head>
+
+<body>
+
+<div id="main">
+    <h1 class="brand-heading fade-in">
+        <svg
+            style="height: 8rem"
+            xmlns:svg="http://www.w3.org/2000/svg"
+            xmlns="http://www.w3.org/2000/svg"
+            xmlns:xlink="http://www.w3.org/1999/xlink"
+            viewBox="0 0 364 364">
+        <title>Converse</title>
+        <g class="cls-1" id="g904">
+            <g data-name="Layer 2">
+                <g data-name="Layer 7">
+                    <path
+                        class="cls-3"
+                        d="M221.46,103.71c0,18.83-29.36,18.83-29.12,0C192.1,84.88,221.46,84.88,221.46,103.71Z" />
+                    <path
+                        class="cls-4"
+                        d="M179.9,4.15A175.48,175.48,0,1,0,355.38,179.63,175.48,175.48,0,0,0,179.9,4.15Zm-40.79,264.5c-.23-17.82,27.58-17.82,27.58,0S138.88,286.48,139.11,268.65ZM218.6,168.24A79.65,79.65,0,0,1,205.15,174a12.76,12.76,0,0,0-6.29,4.65L167.54,222a1.36,1.36,0,0,1-2.46-.8v-35.8a2.58,2.58,0,0,0-3.06-2.53c-15.43,3-30.23,7.7-42.73,19.94-38.8,38-29.42,105.69,16.09,133.16a162.25,162.25,0,0,1-91.47-67.27C-3.86,182.26,34.5,47.25,138.37,25.66c46.89-9.75,118.25,5.16,123.73,62.83C265.15,120.64,246.56,152.89,218.6,168.24Z" />
+                </g>
+            </g>
+        </g>
+    </svg>
+    <span class="brand-heading__text">
+        <span>converse<span class="subdued">.js</span></span>
+        <p class="byline">API Documentation</p>
+    </span>
+    </h1>
+
+    <h1 class="page-title"><?js= title ?></h1>
+    <?js= content ?>
+</div>
+
+<nav>
+    <h2><a href="/docs/html/index.html">Docs Entrypoint</a></h2>
+    <?js= this.nav ?>
+</nav>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc <?js= env.version.number ?></a><?js if(env.conf.templates && env.conf.templates.default && env.conf.templates.default.includeDate !== false) { ?> on <?js= (new Date()) ?><?js } ?>
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>

docs/source/_templates/layout.html

@@ -2,17 +2,12 @@
 {% extends "!layout.html" %}
 
 {# Custom CSS overrides #}
-{% set css_files = css_files + ['_static/style.css', "../../css/converse.min.css"] %}
-{% set script_files = script_files + ["../../dist/converse.min.js", "../../analytics.js"] %}
+{% set css_files = css_files + ['_static/style.css'] %}
+{% set script_files = script_files + ["../../analytics.js"] %}
 
 {# Add some extra stuff before and use existing with 'super()' call. #}
 {% block footer %}
     {{ super() }}
-    <script>
-        converse.initialize({
-            bosh_service_url: 'https://conversejs.org/http-bind/',
-        });
-    </script>
 {% endblock %}
 
 

docs/source/_templates/localtoc.html

@@ -0,0 +1,13 @@
+{#
+    basic/localtoc.html
+    ~~~~~~~~~~~~~~~~~~~
+
+    Sphinx sidebar template: local table of contents.
+
+    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+{%- if display_toc %}
+  <h3 class="sidebar-title"><a href="{{ pathto(master_doc) }}">{{ _('Table Of Contents') }}</a></h3>
+  {{ toc }}
+{%- endif %}

docs/source/_templates/sponsors.html

@@ -0,0 +1,22 @@
+<span class="centered-text-container">
+<h4 class="sidebar-title">Sponsored by</h4>
+</span>
+<ul class="sponsors-list">
+    <li><a href="https://bairesdev.com/sponsoring-open-source-projects/?utm_source=conversejs" target="_blank" rel="noopener">
+            <img style="width: 10em" src="/media/logos/bairesdev-primary.png" alt="BairesDev">
+        </a>
+    </li>
+    <li><a href="https://blokt.com/?utm_source=conversejs" target="_blank" rel="noopener">
+            <img style="width: 9em" src="/logo/blokt.png" alt="Blokt Crypto & Privacy">
+        </a>
+    </li>
+    <li><a href="https://primesound.org/?utm_source=conversejs" target="_blank" rel="noopener">
+            <img style="width: 9em" src="/media/logos/primesound.png" alt="Prime Sound">
+        </a>
+    </li>
+    <li><a href="https://www.keycdn.com/?utm_source=conversejs" target="_blank" rel="noopener">
+            <img style="height: 2.5em" src="/logo/keycdn.png" alt="KeyCDN">
+        </a>
+    </li>
+</ul>
+<span class="centered-text-container patreon-link-container"><a href="https://conversejs.org#sponsors">Become a sponsor</a></span>

docs/source/api/index.rst

@@ -0,0 +1,12 @@
+.. raw:: html
+
+    <div id="banner"><a href="https://github.com/jcbrand/converse.js/blob/master/docs/source/api/index.rst">Edit me on GitHub</a></div>
+
+============================================
+The API documentation (generated with JSDoc)
+============================================
+
+This document is a stub. It shouldn't show at all, instead it's a hack in order
+to link to the JSDoc output.
+
+See https://stackoverflow.com/questions/27979803/external-relative-link-in-sphinx-toctree-directive

docs/source/builds.rst

@@ -5,9 +5,9 @@
 
 .. _builds:
 
-===============
-Creating builds
-===============
+=================
+Generating builds
+=================
 
 .. contents:: Table of Contents
    :depth: 3
@@ -15,72 +15,52 @@ Creating builds
 
 
 .. warning:: There current documentation in this section does not adequately
-    explain how to create custom builds.
+    explain how to create custom bundles.
 
-.. note:: Please make sure to read the section :doc:`development` and that you have installed
+.. Note:: Please make sure to read the section :doc:`development` and that you have installed
     all development dependencies (long story short, you should be able to just run  ``make dev``)
 
-Creating builds and distribution files
-======================================
+.. _creating_builds:
 
-Converse.js uses `AMD (Asynchronous Modules Definition) <http://requirejs.org/docs/whyamd.html#amd>`_
-to define modules and their dependencies.
+Creating JavaScript and CSS bundles and distribution files
+==========================================================
 
-Dependencies can then be loaded on-the-fly with `require.js <http://requirejs.org>`_.
-This is very useful during development, but when it comes to
-deployement you'll usually want to create a single, minified distribution build.
+Converse uses `webpack <https://webpack.js.org/>`_ to create the final JavaScript and CSS distribution files.
 
-For this, the `r.js optimizer <http://requirejs.org/docs/optimization.html>`_
-is used together with `almond.js <https://github.com/requirejs/almond>`_, which
-is a smaller and minimal AMD API implementation that replaces require.js in builds.
+The generated distribution files are all placed in the ``./dist`` directory.
+The Converse repository does not include ``dist`` directory by default.
 
-To create the distribution builds, simply run::
+To generate the ``./dist`` directory and all CSS and JavaScript bundles, simply run ``make dist``.
 
-    make dist
+When you're developing, and constantly changing code, you can run ``make watch``
+to let the bundles be automatically generated as soon as you edit a file.
 
-This command does the following:
+.. note::
 
-* It creates different builds of Converse.js in the ``./dist/`` directory.
+   If you're on Windows or don't have GNU Make installed, you can run ``npm build``
+   to build all the distribution files.
 
-* It bundles all the translation files in ``./locale/`` into a single file ``locales.js``.
-  This file can then be included via the ``<script>`` tag. See for example the ``non_amd.html`` example page.
 
-* Also, the CSS files in the ``./css`` directory will be minified.
+Creating custom bundles
+=======================
 
-The Javascript build files are contained in the ``./dist`` directory:
-
-.. code-block:: bash
-
-    jc@conversejs:~/converse.js (master)$ ls dist/
-    converse-mobile.js               converse.min.js
-    converse-mobile.min.js           converse.nojquery.js
-    converse-no-dependencies.js      converse.nojquery.min.js
-    converse-no-dependencies.min.js  locales.js
-    converse.js
-
-.. _`minification`:
-
-Creating custom builds
-----------------------
-
-One reason you might want to create your own builds, is because you want to
-remove some of the core plugins of converse.js, or perhaps you want to include
+One reason you might want to create your own bundles, is because you want to
+remove some of the core plugins of Converse, or perhaps you want to include
 your own.
 
 To add or remove plugins from the build, you need to modify the
-``src/converse.js`` file.
+`src/converse.js <https://github.com/conversejs/converse.js/blob/master/src/converse.js>`_ file.
 
 You'll find a section marked ``/* START: Removable components`` and
 ``/* END: Removable components */``.
 
-In this section is listed all the converse.js plugins that will make up a
-build.
+In this section is listed the Converse plugins that will make up a bundle.
 
 You could for example decide to disable the ControlBox altogether by removing
 the ``converse-controlbox`` plugin.
 
 After doing so, you need to run ``make dist`` again in the root or your
-converse.js repository, in order to generate the new build.
+Converse repository, in order to generate the new build.
 
 Be aware that some plugins might have dependencies on other plugins, so if you
 remove a certain plugin but other included plugins still depend on it, then it
@@ -91,12 +71,37 @@ text editor and look at the list specified as the second parameter to the
 ``define`` call, near the top of the file. This list specifies the dependencies
 of that plugin.
 
-Minifying the CSS
------------------
+Besides the standard build, the Converse repository includes configuration
+for certain other non-standard builds, which we'll now mention below.
 
-To only minify the CSS files, nothing else, run the following command::
+Excluding all 3rd party dependencies
+------------------------------------
 
-    make cssmin
+The ``dist/converse-no-dependencies.js`` bundle contains only the core Converse
+code and none of the 3rd party dependencies. This might be useful if you need
+to load the dependencies separately.
 
-The CSS files  are minified via `cssmin <https://github.com/gruntjs/grunt-contrib-cssmin>`_.
+To generate this bundle, you can run:
 
+::
+
+    make dist/converse-no-dependencies.js
+    make dist/converse-no-dependencies.min.js
+
+Headless build
+--------------
+
+Converse also has a special build called the `headless build`.
+
+You can generate it by running ``make dist/converse-headless.js``
+
+The headless build is a bundle of all the non-UI parts of Converse, and its aim
+is to provide you with an XMPP library (and application) on which you can build
+your own UI.
+
+It's also installable as `@converse/headless <https://www.npmjs.com/package/@converse/headless>`_.
+
+The main distribution of Converse relies on the headless build.
+
+The file `src/headless/headless.js <https://github.com/jcbrand/converse.js/blob/master/src/headless/headless.js>`_
+is used to determine which plugins are included in the build.

docs/source/conf.json

@@ -0,0 +1,8 @@
+{
+    "plugins": ["plugins/markdown"],
+    "templates": {
+        "default": {
+            "layoutFile": "_templates/jsdoc_layout.tmpl"
+        }
+    }
+}

docs/source/conf.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Converse.js documentation build configuration file, created by
+# Converse documentation build configuration file, created by
 # sphinx-quickstart on Fri Apr 26 20:48:03 2013.
 #
 # This file is execfile()d with the current directory set to its containing dir.
@@ -40,17 +40,17 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Converse.js'
-copyright = u'2014, JC Brand'
+project = u'Converse'
+copyright = u'2018, JC Brand'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '3.2.0-rc'
+version = '10.1.6'
 # The full version, including alpha/beta/rc tags.
-release = '3.2.0-rc'
+release = '10.1.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -102,13 +102,13 @@ html_static_path = ['_static']
 
 # (Optional) Logo. Should be small enough to fit the navbar (ideally 24x24).
 # Path should be relative to the ``_static`` files directory.
-html_logo = "_static/conversejs_small.png"
+html_logo = "_static/logo.svg"
 
 # Theme options are theme-specific and customize the look and feel of a
 # theme further.
 html_theme_options = {
     # Navigation bar title. (Default: ``project`` value)
-    'navbar_title': "Converse.js",
+    'navbar_title': "Converse",
     # Tab name for entire site. (Default: "Site")
     'navbar_site_name': "Table of Contents",
     # A list of tuples containing pages or urls to link to.
@@ -177,7 +177,7 @@ html_favicon = "_static/favicon.ico"
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+html_sidebars = {'**': ['sponsors.html', 'localtoc.html', 'sourcelink.html', 'searchbox.html']}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
@@ -229,7 +229,7 @@ latex_elements = {
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'Conversejs.tex', u'Converse.js Documentation',
+  ('index', 'Conversejs.tex', u'Converse Documentation',
    u'JC Brand', 'manual'),
 ]
 
@@ -259,7 +259,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'conversejs', u'Converse.js Documentation',
+    ('index', 'conversejs', u'Converse Documentation',
      [u'JC Brand'], 1)
 ]
 
@@ -273,8 +273,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'Conversejs', u'Converse.js Documentation',
-   u'JC Brand', 'Conversejs', 'Open Source XMPP webchat',
+  ('index', 'Conversejs', u'Converse Documentation',
+   u'JC Brand', 'Converse', 'Open Source XMPP webchat',
    'Miscellaneous'),
 ]
 

docs/source/dependencies.rst

@@ -0,0 +1,139 @@
+.. raw:: html
+
+    <div id="banner"><a href="https://github.com/jcbrand/converse.js/blob/master/docs/source/dependencies.rst">Edit me on GitHub</a></div>
+
+.. _`development`:
+
+============================
+Setting up a dev environment
+============================
+
+Installing the 3rd party dependencies
+=====================================
+
+To develop and customize Converse, you'll first need to check out Converse's Git
+repository:
+
+::
+
+    git clone https://github.com/conversejs/converse.js.git
+    cd converse.js
+
+
+We use development tools which depend on Node.js and NPM (the Node package manager).
+
+It's recommended that you use `NVM <https://github.com/nvm-sh/nvm>`_ (the Node version manager)
+to make sure you have the right version of Node.
+
+Refer to the `NVM Github page <https://github.com/nvm-sh/nvm#install--update-script>`_ for instructions on how to install it.
+
+Once NVM is installed, you can run the following inside your checkout of the Converse Git repository:
+
+::
+
+    nvm install
+
+.. note::
+    You will always have to first run ``nvm install`` in a new terminal session before working on Converse.
+
+
+To set up the Converse development environment, you now run ``make dev``.
+
+::
+
+    make dev
+
+Alternatively, if you're using Windows, or don't have GNU Make installed, you can run the
+following:
+
+::
+
+  npm install
+  npm run lerna
+
+This will install the Node development tools and Converse's dependencies.
+
+The front-end dependencies are those JavaScript files on which
+Converse directly depends and which will be loaded in the browser as part of
+the bundle in ``dist/converse.js`` (or ``dist/converse.min.js``).
+
+To see the 3rd party dependencies (not just the front-end dependencies, but
+also ones necessary for development tasks like making builds), take a look at
+the list under the ``devDependencies`` in `package.json <https://github.com/jcbrand/converse.js/blob/master/package.json>`_.
+
+.. note::
+    After running ```make dev```, you should now have a new *node_modules* directory
+    which contains all the external dependencies of Converse.
+    If this directory does NOT exist, something must have gone wrong.
+    Double-check the output of ```make dev``` to see if there are any errors
+    listed. For support, you can ask in our chatroom: `dicuss@conference.conversejs.org <xmpp:discuss@conference.conversejs.org>`_.
+
+    If you don't have an XMPP client installed, follow this link to
+    `conversejs.org <https://conversejs.org/fullscreen#converse/room?jid=discuss@conference.conversejs.org>`_
+    where you can log in and be taken directly to the chatroom.
+
+
+.. _`dependency-libsignal`:
+
+Libsignal
+---------
+
+If you want OMEMO encryption, you need to load `libsignal <https://github.com/signalapp/libsignal-protocol-javascript>`_ separately in your page.
+
+For example::
+
+    <script src="3rdparty/libsignal-protocol-javascript/dist/libsignal-protocol.js"></script>
+
+The reason libsignal needs to be loaded separately is because it's released
+under the `GPLv3 <https://github.com/signalapp/libsignal-protocol-javascript/blob/master/LICENSE>`_
+which requires all other dependent JavaScript code to also be open sourced under the same
+license. You might not be willing to adhere to those terms, which is why you
+need to decide for yourself whether you're going to load libsignal or not.
+
+
+.. _`webserver`:
+
+Setting up a webserver
+======================
+
+When making changes to Converse, either development or theming changes,
+you'll want to preview them in your browser.
+
+For this, you'll need to serve the development files via a web server,
+so that you can see your local changes in the browser.
+
+Manually starting a web server
+------------------------------
+
+To both set up the development environment and also start up a web browser to
+serve the files for you, you can run::
+
+    make serve
+
+.. note::
+    To run the "make" commands, you'll need `GNUMake <https://www.gnu.org/software/make>`_
+    installed on your computer. If you use GNU/Linux or \*BSD, it should be installed or
+    available via your package manager. For Mac, you'll need to install XCode and in
+    Windows you can use `Chocolatey <https://chocolatey.org/>`_.
+
+After running ``make serve`` you can open http://localhost:8000 in your webbrowser to see the Converse website.
+
+When developing or changing the theme, you'll want to load all the
+unminified JS and CSS resources as separate files. To do this, open http://localhost:8000/dev.html instead.
+
+You might want to open `dev.html <https://github.com/conversejs/converse.js/blob/master/dev.html>`_ in your text editor or IDE as well, to see
+how ``converse.initialize`` is called and to potentially change any of the
+settings.
+
+Starting a web server with live reloading
+-----------------------------------------
+
+Alternatively, if you want to have live reloading whenever any of the source files change, you
+can run ``make devserver`` (which will use `webpack-dev-server <https://github.com/webpack/webpack-dev-server>`_).
+
+Instead of ``dev.html`` being used, `webpack.html <https://github.com/conversejs/converse.js/blob/master/webpack.html>`_
+is now being used as the HTML template, and you'll need to modify that file if
+you want to change the settings passed to ``converse.initialize``.
+
+If you're running ``make devserver``, you need to open http://localhost:8080.
+

docs/source/developer_guidelines.rst

@@ -1,147 +0,0 @@
-.. raw:: html
-
-    <div id="banner"><a href="https://github.com/jcbrand/converse.js/blob/master/docs/source/theming.rst">Edit me on GitHub</a></div>
-
-Developer guidelines
-====================
-
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
-If you want to work with the non-minified Javascript and CSS files you'll soon
-notice that there are references to a missing *node_modules* directory.
-Please follow the instructions below to create these directories and fetch Converse's
-3rd-party dependencies.
-
-.. note::
-    Windows environment: We recommend installing the required tools using `Chocolatey <https://chocolatey.org/>`_
-    You will need Node.js (nodejs.install), Git (git.install) and optionally to build using Makefile, GNU Make (make)
-    If you have trouble setting up a development environment on Windows,
-    please read `this post <http://librelist.com/browser//conversejs/2014/11/5/openfire-converse-and-visual-studio-questions/#b28387e7f8f126693b11598a8acbe810>`_
-    in the mailing list.:
-
-Installing the development and front-end dependencies
------------------------------------------------------
-
-We use development tools which depend on Node.js and npm (the Node package manager).
-
-If you don't have Node.js installed, you can download and install the latest
-version `here <https://nodejs.org/download>`_.
-
-Also make sure you have ``Git`` installed. `Details <http://git-scm.com/book/en/Getting-Started-Installing-Git>`_.
-
-.. note::
-    Windows users should use Chocolatey as recommended above.
-
-.. note::
-    Debian & Ubuntu users : apt-get install git npm nodejs-legacy
-
-Once you have *Node.js* and *git* installed, run the following command inside the Converse.js
-directory:
-
-::
-
-    make dev
-
-On Windows you need to specify Makefile.win to be used by running: ::
-
-    make -f Makefile.win dev
-
-Or alternatively, if you don't have GNU Make:
-
-::
-
-    npm install
-
-This will install the Node.js development tools and Converse.js's front-end dependencies.
-
-The front-end dependencies are those javascript files on which
-Converse.js directly depends and which will be loaded in the browser.
-
-To see the dependencies, take a look at whats under the *devDependencies* key in
-    `package.json <https://github.com/jcbrand/converse.js/blob/master/package.json>`_.
-
-.. note::
-    After running ```make dev```, you should now have a new *node_modules* directory
-    which contains all the external dependencies of Converse.js.
-    If these directory does NOT exist, something must have gone wrong.
-    Double-check the output of ```make dev``` to see if there are any errors
-    listed. For support, you can write to the mailing list: conversejs@librelist.com
-
-Loading converse.js and its dependencies
-----------------------------------------
-
-With AMD and require.js (recommended)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Converse.js uses `require.js <http://requirejs.org>`_ to asynchronously load dependencies.
-
-If you want to develop or customize converse.js, you'll want to load the
-non-minified javascript files.
-
-Add the following two lines to the *<head>* section of your webpage:
-
-.. code-block:: html
-
-    <link rel="stylesheet" type="text/css" media="screen" href="converse.css">
-    <script data-main="main" src="node_modules/requirejs/require.js"></script>
-
-require.js will then let the main.js file be parsed (because of the *data-main*
-attribute on the *script* tag), which will in turn cause converse.js to be
-parsed.
-
-Without AMD and require.js
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Converse.js can also be used without require.js. If you for some reason prefer
-to use it this way, please refer to
-`non_amd.html <https://github.com/jcbrand/converse.js/blob/master/non_amd.html>`_
-for an example of how and in what order all the Javascript files that converse.js
-depends on need to be loaded.
-
-Brief description of converse.js's dependencies
------------------------------------------------
-
-Converse.js relies on the following dependencies:
-
-* `JQuery <http://jquery.com/>`_ for DOM manipulation and `promises <http://api.jquery.com/promise/>`_.
-* `moment.js <http://momentjs.com/>`_ provides a better API for handling dates and times.
-* `Strophe.js <http://strophe.im/>`_ maintains the XMPP session, is used to
-  build XMPP stanzas, to send them, and to register handlers for received stanzas.
-* `lodash <https://lodash.com/>`_ provides very useful utility functions.
-* `Backbone <http://backbonejs.org/>`_ is used to model the data as Models and
-  Collections and to create Views that render the UI.
-* `backbone.overview <http://github.com/jcbrand/backbone.overview>`_ provides
-  Overviews, which are to Views as Backbone Collections are to Models.
-* `pluggable.js <https://github.com/jcbrand/pluggable.js>`_ is the plugin
-  architecture for Converse.js. It registers and initializes plugins and
-  allows existing attributes, functions and objects on converse.js to be
-  overridden inside plugins.
-
-When submitting a pull request
-------------------------------
-
-Please follow the usual github workflow. Create your own local fork of this repository,
-make your changes and then submit a pull request.
-
-Follow the programming style guide
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Please read the `style guide </docs/html/style_guide.html>`_ and make sure that your code follows it.
-
-Add tests for your bugfix or feature
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Add a test for any bug fixed or feature added. We use Jasmine
-for testing.
-
-Take a look at `tests.html <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
-and the `spec files <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
-to see how tests are implemented.
-
-Check that the tests pass
-~~~~~~~~~~~~~~~~~~~~~~~~~
-Check that all tests complete sucessfully.
-
-Run ``make check`` in your terminal or open `tests.html <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
-in your browser.

docs/source/development.rst

@@ -2,27 +2,31 @@
 
     <div id="banner"><a href="https://github.com/jcbrand/converse.js/blob/master/docs/source/development.rst">Edit me on GitHub</a></div>
 
-.. _development:
+.. _`development`:
 
 ===========
 Development
 ===========
 
-Welcome to the developer documentation of converse.js. Read the documentation
-linked to below, if you want to add new features or create your own customized
-version of converse.js.
+Welcome to the developer documentation of Converse.js.
+
+Here you will learn how to add new features and how you can create your own
+customized version of Converse.
+
+Converse is a community project and largely volunteer driven.
+
+We're grateful for your contributions, so please don't hesitate to
+make a `Github pull request <https://help.github.com/categories/collaborating-with-issues-and-pull-requests/>`_
+to fix a bug or to add new functionality.
 
-Converse.js itself composed of plugins, and exposes an API with which you can
-create and register your own plugins. This is the recommended way to customize
-or add new functionality to converse.js.
 
 .. toctree::
    :maxdepth: 2
 
-   developer_guidelines
-   style_guide
+   setup_dev_environment
    plugin_development
-   developer_api
-   events 
+   api/index
+   testing
    other_frameworks
    builds
+   style_guide

docs/source/documentation.rst

@@ -6,10 +6,6 @@
 Writing Documentation
 =====================
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
 .. note:: Contributions to the documentation are much appreciated.
 
 What is used to write the documentation?
@@ -34,29 +30,26 @@ under ``docs/source``.
 How to generate HTML from the source files?
 ===========================================
 
-Install Dependencies
---------------------
-
-In order to generate HTML from the source files, you need to have Sphinx and
-the `Sphinx Bootstrap Theme <http://ryan-roemer.github.io/sphinx-bootstrap-theme>`_
-installed.
-
-We use `zc.buildout <http://www.buildout.org/en/latest/>`_ to install Sphinx
-and the theme.
-
-To install Sphinx, do the following::
-
-    python bootstrap.py
-    ./bin/buildout
-
 Generate the HTML
 -----------------
 
-After installing the dependencies, you can generate the HTML by simply
-running::
+After installing the dependencies, you can generate the HTML by running::
 
     make html
 
 The HTMl files will be located in ``./docs/html``
 
+What ``make html`` does for you is it installs `zc.buildout <http://www.buildout.org/en/latest/>`_
+which is used to install Sphinx and all its dependencies.
+
+You'll need to have Python and `Virtualenv <https://virtualenv.pypa.io/en/latest/>`_ available on your computer.
+
 .. warning:: When contributing, please don't commit any generated html files.
+
+Serving the documentation
+-------------------------
+
+To view the generated docs, you can run ``make serve`` and then open
+http://localhost:8000/docs/html/index.html in your browser.
+
+

docs/source/events.rst

@@ -1,448 +0,0 @@
-.. raw:: html
-
-    <div id="banner"><a href="https://github.com/jcbrand/converse.js/blob/master/docs/source/theming.rst">Edit me on GitHub</a></div>
-
-.. _`events-API`:
-
-Events and promises
-===================
-
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
-Converse.js and its plugins emit various events which you can listen to via the
-:ref:`listen-grouping`.
-
-Some of these events are also available as `ES2015 Promises <http://es6-features.org/#PromiseUsage>`_,
-although not all of them could logically act as promises, since some events
-might be fired multpile times whereas promises are to be resolved (or
-rejected) only once.
-
-The core events, which are also promises are:
-
-* `cachedRoster`_
-* `chatBoxesFetched`_
-* `pluginsInitialized`_
-* `roster`_
-* `rosterContactsFetched`_
-* `rosterGroupsFetched`_
-* `rosterInitialized`_
-* `statusInitialized`_
-* `roomsPanelRendered`_ (only via the `converse-muc` plugin)
-
-For more info on how to use (or add promises), you can read the
-:ref:`promises-grouping` in the API documentation.
-
-Below we will now list all events and also specify whether they are available
-as promises.
-
-List of Events (and promises)
------------------------------
-
-Hooking into events that Converse.js emits is a great way to extend or
-customize its functionality.
-
-From version 3.0.0 and up, it's only possible to register event handlers inside
-a plugin, by using the closured ``_converse`` object. When writing a plugin,
-remember that it will also have to be whitelisted, before it will be loaded.
-Refer to the :ref:`whitelisted_plugins` setting.
-
-Here follows the different events that are emitted:
-
-afterMessagesFetched
-~~~~~~~~~~~~~~~~~~~~
-
-Emitted whenever a chat box has fetched its messages from ``sessionStorage`` and
-**NOT** from the server.
-
-This event is listened to by the ``converse-mam`` plugin to know when it can
-fetch archived messages from the server.
-
-The event handler is passed the ``Backbone.View`` instance of the relevant chat
-box.
-
-``_converse.on('afterMessagesFetched', function (chatboxview) { ... });``
-
-.. _`cachedRoster`:
-
-cachedRoster
-~~~~~~~~~~~~
-
-The contacts roster has been retrieved from the local cache (`sessionStorage`).
-
-``_converse.on('cachedRoster', function (items) { ... });``
-
-Also available as an `ES2015 Promise <http://es6-features.org/#PromiseUsage>`_:
-
-.. code-block:: javascript
-
-    _converse.api.waitUntil('cachedRoster').then(function () {
-        // Your code here...
-    });
-
-See also the `roster`_ event further down.
-
-callButtonClicked
-~~~~~~~~~~~~~~~~~
-
-When a call button (i.e. with class .toggle-call) on a chat box has been clicked.
-
-``_converse.on('callButtonClicked', function (connection, model) { ... });``
-
-.. _`chatBoxesFetched`:
-
-chatBoxesFetched
-~~~~~~~~~~~~~~~~
-
-Any open chat boxes (from this current session) has been retrieved from the local cache (`sessionStorage`).
-
-You should wait for this event or promise before attempting to do things
-related to open chat boxes.
-
-``_converse.on('chatBoxesFetched', function (items) { ... });``
-
-Also available as an `ES2015 Promise <http://es6-features.org/#PromiseUsage>`_:
-
-.. code-block:: javascript
-
-    _converse.api.waitUntil('chatBoxesFetched').then(function () {
-        // Your code here...
-    });
-
-chatBoxInitialized
-~~~~~~~~~~~~~~~~~~
-
-When a chat box has been initialized. Relevant to converse-chatview.js plugin.
-
-``_converse.on('chatBoxInitialized', function (chatbox) { ... });``
-
-chatBoxOpened
-~~~~~~~~~~~~~
-
-When a chat box has been opened. Relevant to converse-chatview.js plugin.
-
-``_converse.on('chatBoxOpened', function (chatbox) { ... });``
-
-chatRoomOpened
-~~~~~~~~~~~~~~
-
-When a chat room has been opened. Relevant to converse-chatview.js plugin.
-
-``_converse.on('chatRoomOpened', function (chatbox) { ... });``
-
-chatBoxClosed
-~~~~~~~~~~~~~
-
-When a chat box has been closed. Relevant to converse-chatview.js plugin.
-
-``_converse.on('chatBoxClosed', function (chatbox) { ... });``
-
-chatBoxFocused
-~~~~~~~~~~~~~~
-
-When the focus has been moved to a chat box. Relevant to converse-chatview.js plugin.
-
-``_converse.on('chatBoxFocused', function (chatbox) { ... });``
-
-chatBoxToggled
-~~~~~~~~~~~~~~
-
-When a chat box has been minimized or maximized. Relevant to converse-chatview.js plugin.
-
-``_converse.on('chatBoxToggled', function (chatbox) { ... });``
-
-connected
-~~~~~~~~~
-
-After connection has been established and converse.js has got all its ducks in a row.
-
-``_converse.on('connected', function () { ... });``
-
-contactRequest
-~~~~~~~~~~~~~~
-
-Someone has requested to subscribe to your presence (i.e. to be your contact).
-
-``_converse.on('contactRequest', function (user_data) { ... });``
-
-contactRemoved
-~~~~~~~~~~~~~~
-
-The user has removed a contact.
-
-``_converse.on('contactRemoved', function (data) { ... });``
-
-
-contactStatusChanged
-~~~~~~~~~~~~~~~~~~~~
-
-When a chat buddy's chat status has changed.
-
-``_converse.on('contactStatusChanged', function (buddy) { ... });``
-
-contactStatusMessageChanged
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When a chat buddy's custom status message has changed.
-
-``_converse.on('contactStatusMessageChanged', function (data) { ... });``
-
-discoInitialized
-~~~~~~~~~~~~~~~~
-
-Emitted once the ``converse-disco`` plugin has been initialized and the
-``_converse.disco_entities`` collection will be available and populated with at
-least the service discovery features of the user's own server.
-
-``_converse.on('discoInitialized', function () { ... });``
-
-disconnected
-~~~~~~~~~~~~
-
-After converse.js has disconnected from the XMPP server.
-
-``_converse.on('disconnected', function () { ... });``
-
-initialized
-~~~~~~~~~~~
-
-Once converse.js has been initialized.
-
-``_converse.on('initialized', function () { ... });``
-
-See also `pluginsInitialized`_.
-
-logout
-~~~~~~
-
-The user has logged out.
-
-``_converse.on('logout', function () { ... });``
-
-messageAdded
-~~~~~~~~~~~~
-
-Once a message has been added to a chat box. The passed in data object contains
-a `chatbox` attribute, referring to the chat box receiving the message, as well
-as a `message` attribute which refers to the Message model.
-
-.. code-block:: javascript
-
-    _converse.on('messageAdded', function (data) {
-        // The message is at `data.message`
-        // The original chat box is at `data.chatbox`.
-    });
-
-messageSend
-~~~~~~~~~~~
-
-When a message will be sent out.
-
-``_converse.on('messageSend', function (messageText) { ... });``
-
-noResumeableSession
-~~~~~~~~~~~~~~~~~~~
-
-When keepalive=true but there aren't any stored prebind tokens.
-
-``_converse.on('noResumeableSession', function () { ... });``
-
-.. _`pluginsInitialized`:
-
-pluginsInitialized
-~~~~~~~~~~~~~~~~~~
-
-Emitted once all plugins have been initialized. This is a useful event if you want to
-register event handlers but would like your own handlers to be overridable by
-plugins. In that case, you need to first wait until all plugins have been
-initialized, so that their overrides are active. One example where this is used
-is in `converse-notifications.js <https://github.com/jcbrand/converse.js/blob/master/src/converse-notification.js>`.
-
-``_converse.on('pluginsInitialized', function () { ... });``
-
-Also available as an `ES2015 Promise <http://es6-features.org/#PromiseUsage>`_:
-
-.. code-block:: javascript
-
-    _converse.api.waitUntil('pluginsInitialized').then(function () {
-        // Your code here...
-    });
-
-reconnecting
-~~~~~~~~~~~~
-
-Fired once converse.js has determined that it will attempt to reconnect (and
-each subsequent time, if it attempts repeatedly).
-
-reconnected
-~~~~~~~~~~~
-
-After the connection has dropped and converse.js has reconnected.
-Any Strophe stanza handlers (as registered via `converse.listen.stanza`) will
-have to be registered anew.
-
-``_converse.on('reconnected', function () { ... });``
-
-roomInviteSent
-~~~~~~~~~~~~~~
-
-After the user has sent out a direct invitation, to a roster contact, asking them to join a room.
-
-``_converse.on('roomInvite', function (data) { ... });``
-
-roomInviteReceived
-~~~~~~~~~~~~~~~~~~
-
-After the user has sent out a direct invitation, to a roster contact, asking them to join a room.
-
-``_converse.on('roomInvite', function (data) { ... });``
-
-.. _`roomsPanelRendered`:
-
-roomsPanelRendered
-~~~~~~~~~~~~~~~~~~
-
-Emitted once the "Rooms" panel in the control box has been rendered.
-Used by `converse-bookmarks` and `converse-roomslist` to know when they can
-render themselves in that panel.
-
-``_converse.on('roomsPanelRendered', function (data) { ... });``
-
-Also available as an `ES2015 Promise <http://es6-features.org/#PromiseUsage>`_:
-
-.. code-block:: javascript
-
-    _converse.api.waitUntil('roomsPanelRendered').then(function () {
-        // Your code here...
-    });
-
-.. _`roster`:
-
-roster
-~~~~~~
-
-When the roster has been received from the XMPP server.
-
-``_converse.on('roster', function (items) { ... });``
-
-Also available as an `ES2015 Promise <http://es6-features.org/#PromiseUsage>`_:
-
-.. code-block:: javascript
-
-    _converse.api.waitUntil('roster').then(function () {
-        // Your code here...
-    });
-
-See also the `cachedRoster` event further up, which gets called instead of
-`roster` if its already in `sessionStorage`.
-
-.. _`rosterContactsFetched`:
-
-rosterContactsFetched
-~~~~~~~~~~~~~~~~~~~~~
-
-Triggered once roster contacts have been fetched. Used by the
-`converse-rosterview.js` plugin to know when it can start to show the roster.
-
-Also available as an `ES2015 Promise <http://es6-features.org/#PromiseUsage>`_:
-
-.. code-block:: javascript
-
-    _converse.api.waitUntil('rosterContactsFetched').then(function () {
-        // Your code here...
-    });
-
-.. _`rosterGroupsFetched`:
-
-rosterGroupsFetched
-~~~~~~~~~~~~~~~~~~~
-
-Triggered once roster groups have been fetched. Used by the
-`converse-rosterview.js` plugin to know when it can start alphabetically
-position roster groups.
-
-Also available as an `ES2015 Promise <http://es6-features.org/#PromiseUsage>`_:
-
-.. code-block:: javascript
-
-    _converse.api.waitUntil('rosterGroupsFetched').then(function () {
-        // Your code here...
-    });
-
-.. _`rosterInitialized`:
-
-rosterInitialized
-~~~~~~~~~~~~~~~~~
-
-The Backbone collections `RosterContacts` and `RosterGroups` have been created,
-but not yet populated with data.
-
-This event is useful when you want to create views for these collections.
-
-Also available as an `ES2015 Promise <http://es6-features.org/#PromiseUsage>`_:
-
-.. code-block:: javascript
-
-    _converse.api.waitUntil('rosterInitialized').then(function () {
-        // Your code here...
-    });
-
-rosterPush
-~~~~~~~~~~
-
-When the roster receives a push event from server. (i.e. New entry in your buddy list)
-
-``_converse.on('rosterPush', function (items) { ... });``
-
-rosterReadyAfterReconnection
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Similar to `rosterInitialized`, but instead pertaining to reconnection. This
-event indicates that the Backbone collections representing the roster and its
-groups are now again available after converse.js has reconnected.
-
-.. _`statusInitialized`:
-
-statusInitialized
-~~~~~~~~~~~~~~~~~
-
-When the user's own chat status has been initialized.
-
-``_converse.on('statusInitialized', function (status) { ... });``
-
-Also available as an `ES2015 Promise <http://es6-features.org/#PromiseUsage>`_:
-
-.. code-block:: javascript
-
-    _converse.api.waitUntil('statusInitialized').then(function () {
-        // Your code here...
-    });
-
-statusChanged
-~~~~~~~~~~~~~
-
-When own chat status has changed.
-
-``_converse.on('statusChanged', function (status) { ... });``
-
-statusMessageChanged
-~~~~~~~~~~~~~~~~~~~~
-
-When own custom status message has changed.
-
-``_converse.on('statusMessageChanged', function (message) { ... });``
-
-serviceDiscovered
-~~~~~~~~~~~~~~~~~
-
-When converse.js has learned of a service provided by the XMPP server. See XEP-0030.
-
-``_converse.on('serviceDiscovered', function (service) { ... });``
-
-windowStateChanged
-~~~~~~~~~~~~~~~~~~
-
-When window state has changed. Used to determine when a user left the page and when came back.
-
-``_converse.on('windowStateChanged', function (data) { ... });``

docs/source/features.rst

@@ -2,47 +2,134 @@
 
     <div id="banner"><a href="https://github.com/jcbrand/converse.js/blob/master/docs/source/features.rst">Edit me on GitHub</a></div>
 
+.. _`features`:
+
 ========
 Features
 ========
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
+File sharing (`XEP-0363 HTTP File Upload <https://xmpp.org/extensions/xep-0363.html>`_)
+=======================================================================================
 
-Off-the-record encryption
-=========================
+Converse supports file sharing by first uploading the file to a file server and
+then sending the file's URL to the recipient.
 
-Converse.js supports `Off-the-record (OTR) <https://otr.cypherpunks.ca/>`_
-encrypted messaging.
+The file server that is used is configured by the XMPP server admin, and is not
+something that Converse has any control over.
 
-The OTR protocol not only **encrypts your messages**, it provides ways to
-**verify the identity** of the person you are talking to,
-**plausible deniability** and **perfect forward secrecy** by generating
-new encryption keys for each conversation.
+Often when people report file sharing not working, it's because the file server
+is not configured to allow file uploads from other domains.
 
-In its current state, Javascript cryptography is fraught with dangers and
-challenges that make it impossible to reach the same standard of security that
-is available with native "desktop" software.
+The file server needs to be configured for `Cross-Origin resource sharing <https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS>`_
+(known by the acronym CORS). Specifically, it needs to add a
+``Access-Control-Allow-Origin`` header which includes the domain hosting
+Converse.
 
-This is due to its runtime malleability, the way it is "installed" (e.g.
-served) and the browser's lack of cryptographic primitives needed to implement
-secure crypto.
+.. _`feature-omemo`:
 
-For harsh but fairly valid criticism of Javascript cryptography, read:
-`Javascript Cryptography Considered Harmful <http://www.matasano.com/articles/javascript-cryptography/>`_.
+End to end message encryption (`XEP-0384 OMEMO <https://xmpp.org/extensions/xep-0384.html>`_)
+=============================================================================================
 
-To get an idea on how this applies to OTR support in Converse.js, please read
-`my thoughts on it <https://opkode.com/media/blog/2013/11/11/conversejs-otr-support>`_.
+.. note::
+    Converse versions older than 8.0.0 do NOT support encryption or decryption
+    of uploaded files. Files will be uploaded WITHOUT ENCRYPTION, even when
+    OMEMO is enabled.
+
+.. note::
+    For end-to-end encryption via OMEMO, you'll need to load `libsignal-protocol.js
+    <https://github.com/signalapp/libsignal-protocol-javascript>`_ separately in
+    your page. Take a look at the section on :ref:`libsignal <dependency-libsignal>` and the
+    :ref:`security considerations around OMEMO <feature-omemo>`.
+
+Converse supports OMEMO encryption based on the
+`Signal Protocol <https://github.com/signalapp/libsignal-protocol-javascript>`_.
+
+The Signal Protocol is session-oriented. Clients establish a session, which is
+then used for all subsequent encrypt/decrypt operations. There is no need to
+ever tear down a session once one has been established.
+
+This means that a session needs to be stored permanently after logging out.
+
+Converse stores this session information in the browser's `IndexedDB <https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API>`_
+or `localStorage <https://developer.mozilla.org/en-US/docs/Web/API/Storage/LocalStorage>`_
+database, depending on the value provided to :ref:`persistent-store`.
+
+If you've checked the "This is not a trusted device" checkbox when logging in,
+then `sessionStorage <https://developer.mozilla.org/en-US/docs/Web/API/Window/sessionStorage>`_
+is used instead of localStorage and all data is cleared when you log out.
+
+For this reason, OMEMO is disabled when you've indicated that you're using
+an untrusted device. You would in any case not be able to decrypt previously
+received OMEMO messages, due to the Signal Protocol's forward secrecy and the
+fact that you don't have a pre-existing session.
+
+Security considerations for browser-based crypto
+------------------------------------------------
+
+Crypto apps deployed via regular web hosting can be described as relying on
+"host-based" security.
+
+Host-based security services require you to trust the host every time you access
+it, whereas with installable desktop software you trust the host when you
+download/install the software (and whenever it gets updated).
+
+The dynamic nature of "host-based" systems makes it impractical for security
+researchers to do security audits because the hosted code can change at any
+time.
+
+In such a setup you need to fully trust the host that serves you the JavaScript code.
+
+The host that serves the JavaScript code is not necessarily the same host that
+stores and procesess your chat messages. So using OMEMO can still protect your
+messages from snooping on the XMPP server where they're stored encrypted.
+
+In other words, you do have to trust the webserver that hosts Converse for you,
+but you don't necessarily have to trust the XMPP server (if it's on a different host),
+because it never gets hold of your private key.
+
+One way to improve this situation is to host Converse yourself, especially if
+you host it locally on your own machine. If you're not able to do that, then
+at least make sure you use a reputable host that serves files over HTTPS and
+that set `CSP <https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy>`_
+headers.
+
+Due to these reasons, it's NOT a good idea to use encrypted messaging with a
+browser-based solution in life-threatening situations.
+
+Security can be increased by using an installable app (like `Converse Desktop <https://github.com/conversejs/converse-desktop>`_).
+
+For further reading on the challenges of web-based crypto, take a look at these
+articles:
+
+* `What's wrong with webcrypto? <https://tonyarcieri.com/whats-wrong-with-webcrypto>`_
+* `Heartbleed and JavaScript crypto <https://tankredhase.com/2014/04/13/heartbleed-and-javascript-crypto/>`_
+
+OMEMO in Multi-user chats (MUC)
+-------------------------------
+
+Converse supports OMEMO encryption in groupchats, but only if the groupchat is
+set to `members only` and `non-anonymous`. This is the same criteria used by
+the popular Android XMPP client `Conversations <https://conversations.im/>`_.
+
+If the groupchat is configured properly, you'll see the lock icon in the
+toolbar.
+
+
+Open chats via URL
+==================
+
+From version 3.3.0, converse.js now has the ability to open chats (private or
+groupchat) based on the URL fragment.
+
+A room (aka groupchat) can be opened with a URL fragment such as `#converse/room?jid=room@domain`
+and a private chat with a URL fragment such as
+`#converse/chat?jid=user@domain`.
 
-For now, suffice to say that although its useful to have OTR support in
-Converse.js in order to avoid most eavesdroppers, if you need serious
-communications privacy, then you're much better off using native software.
 
 Notifications
 =============
 
-From version 0.8.1 Converse.js can play a sound notification when you receive a
+From version 0.8.1 Converse can play a sound notification when you receive a
 message.
 
 For more info, refer to the :ref:`play-sounds` configuration setting.
@@ -55,16 +142,16 @@ For more info, refer to the :ref:`show-desktop-notifications` configuration sett
 Multilingual Support
 ====================
 
-Converse.js is translated into multiple languages. The default build,
-``converse.min.js``, includes all languages.
+Converse is translated into over 30 languages. Translations can be added or
+updated on `Weblate <https://hosted.weblate.org/projects/conversejs/>`_.
 
-Languages increase the size of the Converse.js significantly.
+Translations are supplied in JSON format and are loaded on demand. Converse will expect to find the
+translations in the ``/dist/locales`` path of your site. This path can be
+changed via the :ref:`assets_path` configuration setting.
 
-If you only need one, or a subset of the available languages, it's better to
-make a custom build which includes only those languages that you need.
 
 Moderating chatrooms
-=====================
+====================
 
 Here are the different commands that may be used to moderate a chatroom:
 
@@ -97,7 +184,7 @@ Here are the different commands that may be used to moderate a chat room:
 Passwordless login with client certificates
 ===========================================
 
-Converse.js supports the SASL-EXTERNAL authentication mechanism, which can be
+Converse supports the SASL-EXTERNAL authentication mechanism, which can be
 used together with x509 client certificates to enable passwordless login or
 even 2-factor authentication.
 

docs/source/images/diagram.xml

@@ -0,0 +1 @@
+<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:55.0) Gecko/20100101 Firefox/55.0" version="7.3.5" editor="www.draw.io" type="device"><diagram name="Page-1" id="e3a06f82-3646-2815-327d-82caf3d4e204">7Vtbc5s4FP41ntl9KKMLuj3GTi8P6Wx28tDuU0cG2abFyAMkcfrrVwJhA8Kxk+Jsmll3xrWOhCS+8+k7R4JM8Gy9/ZjLzeqzjlU6QSDeTvDlBCEREvNtDQ+1gQhQG5Z5EtcmuDfcJD+VMzbNbpNYFZ2GpdZpmWy6xkhnmYrKjk3mub7vNlvotDvqRi6VZ7iJZNpYA7K3f0nicuXskIp9xSeVLFducI5YXTGX0Y9lrm8zN2KmM1XXrGXTjbvLYiVjfd8y4fcTPMu1Lutf6+1MpRbXBrPmuvKhmegET1flOjUFaH5W1R8OXAxPudjcV66ysj3cof6oZDFfYKQAjgVm4B1x0NzJ9LYZoT/k/Sop1c1GRrZ8b7jTncMiSdOZTnVetcbvL+0/a9dZ6VgCQ1Muylz/UE3LCmI8vVN5mRgfXqTJMjPmUm8Gb8sBYZurbcvkbvOj0mtV5g+miaslDS0dm6lw7LjfMwNh12bVIoW51HHS8XG563sPrPnhsD3gNzY2rIvFAkXRUVhNy5jOKaFHsPWAHID7ILYo7GIbNkrRwpaSAWwhx7+O7Y4Lo2EbE8Xj8BRsOZpjelZsGe3zlvq8ZefC1tcH7oE905m5w0IF34sJoqkZfjrPza9lWSFA5dpCkc0L+19+m2VJtrRDZHZu9kbU3EquFXyV/6rnpOKL46viUbGpLnUTACMoD6Ss40FGoedBDAc8iCE/gwcx9TBWsQmcruigqYKfiisIOoAXpcx3yNo6lcXt4ndVlg/OIG9LbUw6L1d6qTOZXmmLcO24noNMNxc26O+nYCwfEntf1RRqBzZhHFX1Boqvrroq/GMLQWiI7wzXKk8MYip3rQ56s9C3eaQOINYkLzJfqsY1tckC9ygFcpXKMrnr5ilD7nSXXuvEzGxHHYp61OEwYEBAgNxXt8N6hq6PHkV2k3oea3yNnaWJcuO0udSsqSs5V+m1LpIy0XZtzXVZ6rXxgSw2dba3SLaWYG1yDS/IwbVr8q6NHXK9XdrsNYiSMk+2QSo35qJvyJcGSqfog0FkatrHduqtOgAonc0GWDnC8kfAUFK0Ph2PcuSnISZB9cWA02CEPMRXA/ZG1OCkpU38lcz+o5UscBBCRriov15uJdPfZCVvYvmKFnGIAwJaH9rxpqDYD+kDEZ0+wpvnL2H+RpbwPqAHzHWxC+pmt3YgpqttUtYXEcBcub4GYOjKz8oDmC8W4oXEgpKuWIS9LuppevLgddTfPDBGA0AoRYLjEJEQnUt1sCcyX7pZvr9PeF3q00x0lD0c7rmBY+HJRcia+N4WDIbGiPrkf2884g0Rhi/qDf8oqPbGjcrvBjbAh6CvUXwK7jtnPQX6SEYr9a2o5zZOPE57d5LXCE+lm2eqFuU4riZ9IWX+1rsxtR0t2BiO9o9Sp3/dfDIWg5DpOTXxKKvCRGqnbEhQ6OiHCTVHD1H+UEm5slQxPJFZLNPqeHq267moQbKBQC9sCFuZavD18/W1vaRy5Z+vjWf3al6xLLHhd7rSefLT0EY2Y/Q5ExkGVIRsSLMzjKEQpEsbwgbOM/FAegd+nTTQF2vnuNepD43fKuxP91JbE8hIi713Cr0rtxc7HdJ1MYbf3syx2i6fFoB08mncFIfT6V5WfDS/dvLYzq9r8o+eT2OBAoEYEUiQUAgAcZcoorf7PjW9Nv12O0I9Io2XUEM/mFxdXlw3kn8RVfAgcJnkZr1rx90X1Ykq5NvPYbGIm9m1EoqeELxccsB4b3M0cC5PB9SC8zGSg4HnwL+7XhDMW3rxzmzA4aENeGurL0LY2+rjI+f3TxUa+HJKw/vPenCPKqdKC4Xdjuj5pGVgs+5R84nPpnmkTns2PeckJODgHnGMrAB2czkxkBXsFuP4z6ZDD9upNEl+Fk+aB59ys0nNnVdy98q23Z3c7hwZG4dd3wzk2efL2JpjkTekwLijwCDgHB0XYIJwV4ABQuMK8MBJar0wRtffsPeWD+c9opysvwgPU/MM+uu/UnHz95UxfFZFYd9xM+ldHq2q/O517f1iWcq5LNQJadxZ9+uM9HZ+1NeREA3pCBlBR7D/Ut5vqiN7TeCkKwkHn76cLggvkH2xsJs0Ef7c7AscINQZnpS8tSgEA0BwJwqZGH48CoH+Ez9MxLhRCPs8ZOcJQgAEvaQTsABCATiBZkcAmrOip9KSsO7LI4zZlQpESDGzpxH8bCR9e4dbIes+LBYncJTTXqYEx2Xo0Eb1TIkS6b+H1GxcnyyVuJco9TOuEVn4tt5VOs6O0b2OGO4rk4ABwYTBEPHq+3kswESciQWmuP9jirr5/q9V8Pt/AQ==</diagram></mxfile>

docs/source/index.rst

@@ -1,4 +1,4 @@
-.. Converse.js documentation master file, created by
+.. Converse documentation master file, created by
    sphinx-quickstart on Fri Apr 26 20:48:03 2013.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
@@ -7,23 +7,21 @@
 
     <div id="banner"><a href="https://github.com/jcbrand/converse.js/blob/master/docs/source/index.rst">Edit me on GitHub</a></div>
 
-=========================
-Converse.js Documentation
-=========================
+======================
+Converse Documentation
+======================
 
 Preface
 =======
 
-This is the official documentation for Converse.js. If you'd like to
+This is the official documentation for Converse. If you'd like to
 contribute, please read the :doc:`documentation` page.
 
-You might instead be looking for the `User Manual <manual.html>`_.
-
 Introduction
 ============
 
-Converse.js is a free and open-source `XMPP <http://xmpp.org/about-xmpp/>`_
-chat client written in Javascript which can be tightly integrated into any website.
+Converse is a free and open-source `XMPP <https://xmpp.org/about-xmpp/>`_
+chat client written in JavaScript which can be tightly integrated into any website.
 
 The benefit of using converse.js as opposed to relying on a SaaS
 (software-as-a-service) solution, is that your users can have a much more
@@ -46,10 +44,11 @@ Table of Contents
    quickstart
    features
    setup
+   session
    configuration
    development
-   security
    theming
+   security
    translations
    troubleshooting
    documentation

docs/source/jsdoc_intro.md

@@ -0,0 +1,59 @@
+# The Converse API documentation
+
+Welcome to the new Converse API documentation, generated with
+[JSDoc](http://usejsdoc.org/).
+
+## The public and private API
+
+Converse has a public API and a private API only available to plugins.
+
+The reason we make this distinction between public and private is so that API
+methods which could be used to "impersonate" the user, for example by
+sending messages on their behalf, are not available to random scripts running
+in your website.
+
+The public API is accessible via the [window.converse](/docs/html/api/converse.html)
+global and is therefore available to any JavaScript running in the page.
+
+The private API is only accessible to plugins, which have been whitelisted and
+registered before [converse.initialize](/docs/html/api/converse.html#.initialize)
+(which is a public API method) has been called.
+
+See the [plugin development](/docs/html/plugin_development.html)
+section for more info on writing plugins.
+
+Inside a plugin, you can get access to the {@link _converse.api}
+object. Note the underscore in front of {@link _converse},
+which indicates that this is a private, closured object.
+
+## API Namespaces
+
+The Converse API (private and public) makes use of namespaces to logically
+group relevant methods.
+
+So, for example, all the XEP-0030 service discovery methods are under the
+{@link \_converse.api.disco} namespace, in the [private API]{@link \_converse.api}.
+
+Which means that you access it via {@link _converse.api.disco}.
+
+### Nested Namespaces
+
+Namespaces can be nested.
+
+{@link _converse.api} is the top-level namespace, of which {@link \_converse.api.disco}
+is a nested, child namespace and {@link \_converse.api.disco.own} is nested another
+level deeper.
+
+Not all methods are however within a namespace. For example {@link converse.initialize}.
+
+## Stable API versus unstable API
+
+Converse uses [semantic versioning](https://semver.org/) for releases, which means that 
+we try to maintain a stable API for minor and patch releases and when we do change the
+stable API we will make a major release.
+
+In the JSDoc API documentation, all API methods that are **not** marked as *Private*
+are considered to be part of the stable API, and you can therefore expect them to
+not change between minor and patch releases. If a method is marked as *Private*,
+then you could still use it, but we don't provide any guarantee that it won't change
+between minor and patch releases.

docs/source/manual.rst

@@ -1,190 +0,0 @@
-.. raw:: html
-
-    <div id="banner"><a href="https://github.com/jcbrand/converse.js/blob/master/docs/source/manual.rst">Edit me on GitHub</a></div>
-
-===========================
-The Converse.js User Manual
-===========================
-
-.. |br| raw:: html
-
-   <br />
-
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
-.. figure:: images/homepage.jpg
-   :align: right
-   :alt: The converse.js website
-
-   The converse.js website
-
-**Welcome to the converse.js user manual**. This manual is very much still a work
-in progress and is far from complete. Please bear in mind that it's the work of volunteers.
-
-If you have requests or suggestions on how the manual can be improved or
-expanded, then please `contact me <https://opkode.com/contact.html>`_
-or create a new ticket on `Github <https://github.com/jcbrand/converse.js/issues>`_.
-
-Although converse.js can be integrated into any website, for this user manual
-we'll refer to the canonical version at https://conversejs.org.
-
-This documentation also integrates the converse.js chat client, so you can try
-out some of the steps right on this page! Just click the **Toggle chat** button
-at the bottom right of the page to open the so-called *control box* of the
-converse.js chat client.
-
-Registering a new chat account
-==============================
-
-.. figure:: images/register-panel.jpg
-   :align: left
-   :alt: The registration panel of the converse.js control box.
-
-   The registration panel of converse.js
-
-With converse.js you can register a new XMPP account on any publically available XMPP provider.
-To do so, click the **Register** tab on the chat client.
-
-You will then see the *registration panel* as shown in the picture below.
-
-Choosing your provider
-----------------------
-
-Converse.js uses a chat protocol called XMPP (also known as Jabber) which allows "federation".
-This means that it's similar to email, in the sense that people signed in at
-different XMPP chat providers can still chat with one another.
-
-For example, if you have a Yahoo! email account, you can send and receive emails from
-a friend with a Google email account. In the same way, if you have a chat
-account from **Conversejs.org**, you can send and receive chat messages with a
-friend who has an account at `Jappix.com <https://jappix.com>`_.
-
-There are many free providers online which allow you to register a new account.
-You can see a list of some of them at `xmpp.net <https://xmpp.net/directory.php>`_.
-The `xmpp.net <https://xmpp.net/directory.php>`_ website provides a security grading
-for the XMPP servers of the providers, which is very useful. They are however sometimes
-slow to add new servers to the list.
-A larger list of XMPP providers is also available at `list.jabber.net <https://list.jabber.at/>`_.
-
-You can find the domain name for a server under the *Domain* column at
-`xmpp.net <https://xmpp.net/directory.php>`_. or the *Server* column at
-`list.jabber.net <https://list.jabber.at/>`_.
-
-Once you know which XMPP provider you'd like to use, you can type its domain
-name and click the **Fetch registration form** button.
-
-|br|
-
-.. figure:: images/register-form.jpg
-   :align: left
-   :alt: The registration form for an XMPP account at conversejs.org
-
-   The registration form
-
-
-Filling out the registration form
----------------------------------
-
-After you've clicked **Fetch registration form**, the chat client will contact
-the chat provider, ask for its registration form and then present it to you.
-
-Different chat providers have different registration forms, but they're all
-relatively similar.
-
-Check the security score
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-At the top of the form you'll see a colored bar containing the text **xmpp.net score**.
-This shows the security score for this server as determined by `xmpp.net <https://xmpp.net>`_
-where you can test out a server for yourself. You should generally avoid providers with
-a poor security score (colored in red).
-
-Choosing a username
-~~~~~~~~~~~~~~~~~~~
-
-As you can see in the registration form, the **username** consists of two
-parts separated with an **@** sign, similar to an email address.
-
-The first part is your unique *handle* which you need to choose. The second part
-is the domain name of the chat provider, the one which you chose in the previous step
-when you fetched the registration form.
-
-When you want to give someone your XMPP chat username, or when you want to add
-someone else as a contact, you need to specify it in full, like you would an email address.
-
-Once you've chosen your user name and password, click **Register**. If
-Successful, you'll be automatically logged in to your new account.
-
-|br|
-
-.. figure:: images/add-contact.png
-   :align: left
-   :alt: Adding a contact in converse.js
-
-   The form for adding a new contact
-
-
-Adding a contact
-================
-
-In order to start chatting with someone, you first need to add them as a contact.
-
-To do this, click the **Add a contact** link in the **Contacts** tab. This will
-slide open a dropdown in which you can type the username of the person you'd
-like to add.
-
-Remember, an XMPP username (also called a JID or Jabber ID) is similar to an
-email address, in that you have both the user's *handle* and the *domain name*
-of the provider, separated with an **@** sign.
-
-Once you've typed the username and clicked submit, your request will be sent to
-this person. If they are online, they will immediately be notified of your
-request, otherwise they'll see it next time they come online.
-
-Technically, when you add someone as a contact, you're doing two things. Firstly,
-you are adding the contact to your *roster* (think of it as an address book) and secondly
-you are asking to be notified whenever that person comes online.
-
-.. figure:: images/pending-contact.jpg
-   :align: left
-   :alt: A pending contact
-
-   A pending contact
-
-A pending contact
------------------
-
-The person you are adding as a contact has the option to either accept or decline your request.
-Until that decision has been made, they will appear in your roster as a
-so-called *pending* contact. In other words, their final status is pending on whether
-they accept or decline your request.
-
-.. figure:: images/ungrouped-contact.png
-   :align: right
-   :alt: A normal, ungrouped contact
-
-   A normal contact
-
-A normal contact
-----------------
-
-If the person accepts your contact request, they will get a *chat status
-indicator* in your roster and will also become clickable. Clicking on the name
-of the user will open a chat box in which you can then start chatting with that
-user.
-
-.. figure:: images/remove-contact.png
-   :align: left
-   :alt: Removing a contact
-
-   Removing a contact
-
-Removing a contact
-==================
-
-To remove a contact, hover your mouse over their name and then click on the
-trash icon. You will be prompted to confirm, and if you do, the contact will no
-longer be visible in your roster.
-