check youre logged in with correct npm user when releasing

2018-09-28 11:42:39 +02:00
43 changed files with 3473 additions and 8455 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,18 +11,25 @@ sudo: required
 language: node_js
 node_js:
    # make sure we work with a range of node versions.
+    # As of the time of writing:
+    #  - 4.x is still in LTS (until April 2018), but some of our deps (notably
+    #    extract-zip) don't work with it
+    #  - 5.x has been EOLed for nearly a year.
+    #  - 6.x is the active 'LTS' version
+    #  - 7.x is no longer supported
+    #  - 8.x is the current 'current' version (until October 2017)
    #
-    # Current status of node versions: https://github.com/nodejs/LTS/
-    # We don't work with node 6 because it doesn't support package-lock
-    # files which we need to avoid the broken version of base-x
-    - 8
-    - 10
+    # see: https://github.com/nodejs/LTS/
+    #
+    # anything before 6.3 ships with npm 3.9 or earlier, which had problems
+    # with symlinks in node_modules (see
+    # https://github.com/npm/npm/releases/tag/v3.10.0 'FIXES AND REFACTORING').
+    - 6.3
+    - 6
+    - 7
 addons:
    chrome: stable
 install:
    # clone the deps with depth 1: we know we will only ever need that one
    # commit.
-    - npm install && scripts/fetch-develop.deps.sh --depth 1
-script:
-    - npm run test
-    - npm run lint
+    - scripts/fetch-develop.deps.sh --depth 1 && npm install
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,181 +1,3 @@
-Changes in [0.17.8-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.8-rc.1) (2018-12-06)
-======================================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.7...v0.17.8-rc.1)
-
- * Update from Weblate.
-   [\#7784](https://github.com/vector-im/riot-web/pull/7784)
- * Add a function to send a rageshake from the console
-   [\#7755](https://github.com/vector-im/riot-web/pull/7755)
- * Re-apply "Run lint on travis builds and use modern node versions"
-   [\#7738](https://github.com/vector-im/riot-web/pull/7738)
- * Revert "Run lint on travis builds and use modern node versions"
-   [\#7737](https://github.com/vector-im/riot-web/pull/7737)
- * Run lint on travis builds and use modern node versions
-   [\#7490](https://github.com/vector-im/riot-web/pull/7490)
- * Fix missing js-sdk logging
-   [\#7736](https://github.com/vector-im/riot-web/pull/7736)
- * Add $accent-color-50pct as a CSS variable to the Status theme
-   [\#7710](https://github.com/vector-im/riot-web/pull/7710)
-
-Changes in [0.17.7](https://github.com/vector-im/riot-web/releases/tag/v0.17.7) (2018-11-22)
-============================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.6...v0.17.7)
-
- * Warning when crypto DB is too new to use.
- * Fix missing entries from js-sdk in rageshake logs
-
-Changes in [0.17.6](https://github.com/vector-im/riot-web/releases/tag/v0.17.6) (2018-11-19)
-============================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.6-rc.2...v0.17.6)
-
- * No changes since rc.2
-
-Changes in [0.17.6-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.17.6-rc.2) (2018-11-15)
-======================================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.6-rc.1...v0.17.6-rc.2)
-
- * Update to js-sdk 0.14 and react-sdk rc.2. rc.1 was broken as it was built against
-   js-sdk 0.13 which does not use the new Olm 3.0 API.
-
-Changes in [0.17.6-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.6-rc.1) (2018-11-15)
-======================================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.5...v0.17.6-rc.1)
-
- * Update from Weblate.
-   [\#7708](https://github.com/vector-im/riot-web/pull/7708)
- * Add Japanese (#7599)
-   [\#7673](https://github.com/vector-im/riot-web/pull/7673)
- * Allow Webpack dev server to listen to all interfaces
-   [\#7674](https://github.com/vector-im/riot-web/pull/7674)
- * Remove the request-only stuff we don't need anymore
-   [\#7637](https://github.com/vector-im/riot-web/pull/7637)
- * Correct the author of the electron app
-   [\#7615](https://github.com/vector-im/riot-web/pull/7615)
- * Mock fs, tls, and net to support request in the browser
-   [\#7552](https://github.com/vector-im/riot-web/pull/7552)
- * Update chokidar to transitively get newer fsevents
-   [\#7598](https://github.com/vector-im/riot-web/pull/7598)
- * Support WebAssembly version of Olm
-   [\#7385](https://github.com/vector-im/riot-web/pull/7385)
-
-Changes in [0.17.5](https://github.com/vector-im/riot-web/releases/tag/v0.17.5) (2018-11-13)
-============================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.4...v0.17.5)
-
- * Include change that was supposed to be included in orevious version
-
-Changes in [0.17.4](https://github.com/vector-im/riot-web/releases/tag/v0.17.4) (2018-11-13)
-============================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.3...v0.17.4)
-
- * Add banner with login/register links for users who aren't logged in
-
-Changes in [0.17.3](https://github.com/vector-im/riot-web/releases/tag/v0.17.3) (2018-10-29)
-============================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.3-rc.1...v0.17.3)
-
- * Fix for autocompleting text emoji from react-sdk v0.14.2
-
-Changes in [0.17.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.3-rc.1) (2018-10-24)
-======================================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.2...v0.17.3-rc.1)
-
- * Update from Weblate.
-   [\#7549](https://github.com/vector-im/riot-web/pull/7549)
- * Don't set tags on notifications
-   [\#7518](https://github.com/vector-im/riot-web/pull/7518)
- * Update to latest electron builder
-   [\#7498](https://github.com/vector-im/riot-web/pull/7498)
- * Fix Tinter.setTheme to not fire using Firefox
-   [\#6831](https://github.com/vector-im/riot-web/pull/6831)
-
-Changes in [0.17.2](https://github.com/vector-im/riot-web/releases/tag/v0.17.2) (2018-10-19)
-============================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.1...v0.17.2)
-
- * Update react-sdk version to "Apply the user's tint once the MatrixClientPeg is moderately ready"
- * Electron: don't set tags on notifications
-   [\#7518](https://github.com/vector-im/riot-web/pull/7518)
-
-Changes in [0.17.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.1) (2018-10-18)
-============================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.0...v0.17.1)
-
- * Stop electron crashing
-   [\#7517](https://github.com/vector-im/riot-web/pull/7517)
-
-Changes in [0.17.0](https://github.com/vector-im/riot-web/releases/tag/v0.17.0) (2018-10-16)
-============================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.0-rc.1...v0.17.0)
-
- * Phased rollout of lazyloading
-   [\#7503](https://github.com/vector-im/riot-web/pull/7503)
- * Update to latest electron builder
-   [\#7501](https://github.com/vector-im/riot-web/pull/7501)
-
-Changes in [0.17.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.0-rc.1) (2018-10-11)
-======================================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5...v0.17.0-rc.1)
-
- * Revert "also commit the lock file when bumping version as it is now
-   committed to the repo"
-   [\#7483](https://github.com/vector-im/riot-web/pull/7483)
- * Update from Weblate.
-   [\#7478](https://github.com/vector-im/riot-web/pull/7478)
- *  Fix riot-web Promise.defer warnings (#7409)
-   [\#7444](https://github.com/vector-im/riot-web/pull/7444)
- * Use HTTPS cloning for riot-web too
-   [\#7459](https://github.com/vector-im/riot-web/pull/7459)
- * Disable webpack-dev-server auto reload
-   [\#7463](https://github.com/vector-im/riot-web/pull/7463)
- * Silence bluebird warnings
-   [\#7462](https://github.com/vector-im/riot-web/pull/7462)
- * Fix reskindex on matrix-react-side not being called if using build script
-   [\#7443](https://github.com/vector-im/riot-web/pull/7443)
- * Fix double-closed tags
-   [\#7454](https://github.com/vector-im/riot-web/pull/7454)
- * Document how to turn off Piwik and bug reports (#6738)
-   [\#7435](https://github.com/vector-im/riot-web/pull/7435)
- * also commit the lock file when bumping version as it is now committed to the
-   repo
-   [\#7429](https://github.com/vector-im/riot-web/pull/7429)
- * Update a bunch of deps
-   [\#7393](https://github.com/vector-im/riot-web/pull/7393)
- * Don't show mobile guide if deep linking
-   [\#7415](https://github.com/vector-im/riot-web/pull/7415)
- * Don't show custom server bit on matrix.org
-   [\#7408](https://github.com/vector-im/riot-web/pull/7408)
- * Update Webpack to version 4
-   [\#6620](https://github.com/vector-im/riot-web/pull/6620)
- * Webpack4
-   [\#7387](https://github.com/vector-im/riot-web/pull/7387)
-
-Changes in [0.16.6](https://github.com/vector-im/riot-web/releases/tag/v0.16.6) (2018-10-08)
-============================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5...v0.16.6)
-
- * Update to matrix-react-sdk v0.13.6
-
-Changes in [0.16.5](https://github.com/vector-im/riot-web/releases/tag/v0.16.5) (2018-10-01)
-============================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5-rc.1...v0.16.5)
-
- * Don't show mobile guide if deep linking
-   [\#7415](https://github.com/vector-im/riot-web/pull/7415)
- * Don't show custom server bit on matrix.org
-   [\#7408](https://github.com/vector-im/riot-web/pull/7408)
-
-Changes in [0.16.5-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.5-rc.1) (2018-09-27)
-======================================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.4...v0.16.5-rc.1)
-
- * Update from Weblate.
-   [\#7395](https://github.com/vector-im/riot-web/pull/7395)
- * Reduce the number of terminals required to build riot-web to 1
-   [\#7355](https://github.com/vector-im/riot-web/pull/7355)
- * Small typo in release notes v0.16.3
-   [\#7274](https://github.com/vector-im/riot-web/pull/7274)
-
 Changes in [0.16.4](https://github.com/vector-im/riot-web/releases/tag/v0.16.4) (2018-09-10)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.4-rc.1...v0.16.4)
@@ -402,7 +224,7 @@ Changes in [0.15.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.1
 ======================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0-rc.1...v0.15.0-rc.2)

- * Update to matrix-react-sdk 0.12.4-rc.2
+ * Update to matrix-react-sdk 0.12.4-rc.2 

 Changes in [0.15.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.1) (2018-05-09)
 ======================================================================================================
@@ -506,7 +328,7 @@ Changes in [0.14.0-rc.6](https://github.com/vector-im/riot-web/releases/tag/v0.1
 ======================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.0-rc.5...v0.14.0-rc.6)

- * Bump react-sdk to [rc.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.6)
+ * Bump react-sdk to [rc.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.6) 

 Changes in [0.14.0-rc.5](https://github.com/vector-im/riot-web/releases/tag/v0.14.0-rc.5) (2018-04-09)
 ======================================================================================================
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ to build.
   npm install
   npm run build
   ```
-   Or just use https://riot.im/develop - the continuous integration release of the
+   Or just use https://riot.im/develop - the continuous integration release of the 
   develop branch. (Note that we don't reference the develop versions in git directly
   due to https://github.com/npm/npm/issues/3055.)
 1. Install the prerequisites: `npm install`.
@@ -134,9 +134,7 @@ For a good example, see https://riot.im/develop/config.json
 1. `integrations_rest_url`: URL to the REST interface for the integrations server.
 1. `integrations_widgets_urls`: list of URLs to the REST interface for the widget integrations server.
 1. `bug_report_endpoint_url`: endpoint to send bug reports to (must be running a
-   https://github.com/matrix-org/rageshake server). Bug reports are sent when a user clicks
-   "Send Logs" within the application. Bug reports can be disabled by leaving the
-   `bug_report_endpoint_url` out of your config file.
+   https://github.com/matrix-org/rageshake server)
 1. `roomDirectory`: config for the public room directory. This section is optional.
 1. `roomDirectory.servers`: List of other homeservers' directories to include in the drop
   down list. Optional.
@@ -149,13 +147,11 @@ For a good example, see https://riot.im/develop/config.json
   anything else since it is used to isolate the privileges of file attachments to this
   domain. Default: `https://usercontent.riot.im/v1.html`. This needs to contain v1.html from
   https://github.com/matrix-org/usercontent/blob/master/v1.html
-1. `piwik`: Analytics can be disabled by setting `piwik: false` or by leaving the piwik config
-   option out of your config file. If you want to enable analytics, set `piwik` to be an object
-   containing the following properties:
-    1. `url`: The URL of the Piwik instance to use for collecting analytics
-    1. `whitelistedHSUrls`: a list of HS URLs to not redact from the analytics
-    1. `whitelistedISUrls`: a list of IS URLs to not redact from the analytics
-    1. `siteId`: The Piwik Site ID to use when sending analytics to the Piwik server configured above
+1. `piwik`: an object containing the following properties:
+    1. `url`: The URL of the Piwik instance to use for collecting Analytics
+    1. `whitelistedHSUrls`: a list of HS URLs to not redact from the Analytics
+    1. `whitelistedISUrls`: a list of IS URLs to not redact from the Analytics
+    1. `siteId`: The Piwik Site ID to use when sending Analytics to the Piwik server configured above
 1. `teamServerConfig`, `teamTokenMap`, `referralBaseUrl`: an obsolete precursor to communities
   with referral tracking; please ignore it.
 1. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour
@@ -234,10 +230,6 @@ Before attempting to develop on Riot you **must** read the developer guide
 for `matrix-react-sdk` at https://github.com/matrix-org/matrix-react-sdk, which
 also defines the design, architecture and style for Riot too.

-You should also familiarise yourself with the "Here be Dragons" guide to the
-tame & not-so-tame dragons (gotchas) which exist in the codebase:
-https://docs.google.com/document/d/12jYzvkidrp1h7liEuLIe6BMdU0NUjndUYI971O06ooM
-
 The idea of Riot is to be a relatively lightweight "skin" of customisations on
 top of the underlying `matrix-react-sdk`. `matrix-react-sdk` provides both the
 higher and lower level React components useful for building Matrix communication
@@ -278,7 +270,7 @@ Then similarly with `matrix-react-sdk`:

 Finally, build and start Riot itself:

-1. `git clone https://github.com/vector-im/riot-web.git`
+1. `git clone git@github.com:vector-im/riot-web.git`
 1. `cd riot-web`
 1. `git checkout develop`
 1. `npm install`
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,9 +2,9 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "src/electron-main.js",
-  "version": "0.17.8-rc.1",
+  "version": "0.16.4",
  "description": "A feature-rich client for Matrix.org",
-  "author": "New Vector Ltd.",
+  "author": "Vector Creations Ltd.",
  "dependencies": {
    "auto-launch": "^5.0.1",
    "electron-window-state": "^4.1.0",
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -21,15 +21,6 @@
        "siteId": 1,
        "policyUrl": "https://matrix.org/docs/guides/riot_im_cookie_policy"
    },
-    "phasedRollOut": {
-        "feature_lazyloading": {
-            "offset": 1539684000000,
-            "period": 604800000
-        }
-    },
-    "features": {
-        "feature_lazyloading": "enable"
-    },
    "enable_presence_by_hs_url": {
        "https://matrix.org": false
    }
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -32,12 +32,9 @@ const olm_entry = webpack_config.entry['olm'];
 // 'preprocessors' config below)
 delete webpack_config['entry'];

-// make sure we're flagged as development to avoid wasting time optimising
-webpack_config.mode = 'development';
-
 // add ./test as a search path for js
-webpack_config.module.rules.unshift({
-    test: /\.js$/, use: "babel-loader",
+webpack_config.module.loaders.unshift({
+    test: /\.js$/, loader: "babel",
    include: [path.resolve('./src'), path.resolve('./test')],
 });

@@ -49,9 +46,8 @@ webpack_config.module.noParse.push(/sinon\/pkg\/sinon\.js$/);
 // ?
 webpack_config.resolve.alias['sinon'] = 'sinon/pkg/sinon.js';

-webpack_config.resolve.modules = [
+webpack_config.resolve.root = [
    path.resolve('./test'),
-    "node_modules"
 ];

 webpack_config.devtool = 'inline-source-map';
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "electron_app/src/electron-main.js",
-  "version": "0.17.8-rc.1",
+  "version": "0.16.4",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "repository": {
@@ -33,10 +33,10 @@
    "build:res": "node scripts/copy-res.js",
    "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
    "build:compile": "npm run reskindex && babel --source-maps -d lib src",
-    "build:bundle": "cross-env NODE_ENV=production webpack-cli -p --progress --bail --mode production",
-    "build:bundle:dev": "webpack-cli --progress --bail --mode development",
+    "build:bundle": "cross-env NODE_ENV=production webpack -p --progress --bail",
+    "build:bundle:dev": "webpack --optimize-occurence-order --progress --bail",
    "build:electron": "npm run clean && npm run build && npm run install:electron && build -wml --ia32 --x64",
-    "build:react-sdk": "node scripts/npm-sub.js matrix-react-sdk run build",
+    "build:react-sdk": "node scripts/npm-sub.js matrix-react-sdk run start:init",
    "build:js-sdk": "node scripts/npm-sub.js matrix-js-sdk run start:init",
    "build": "npm run build:js-sdk && npm run build:react-sdk && npm run reskindex && npm run build:res && npm run build:bundle",
    "build:dev": "npm run build:js-sdk && npm run build:react-sdk && npm run reskindex && npm run build:res && npm run build:bundle:dev",
@@ -44,7 +44,7 @@
    "install:electron": "install-app-deps",
    "electron": "npm run install:electron && electron .",
    "start:res": "node scripts/copy-res.js -w",
-    "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --progress --mode development",
+    "start:js": "webpack-dev-server --output-filename=bundles/_dev_/[name].js --output-chunk-file=bundles/_dev_/[name].js -w --progress",
    "start:js:prod": "cross-env NODE_ENV=production webpack-dev-server -w --progress",
    "start:js-sdk": "node scripts/npm-sub.js matrix-js-sdk run start:watch",
    "start:js-sdk:prod": "cross-env NODE_ENV=production node scripts/npm-sub.js matrix-js-sdk run start:watch",
@@ -60,97 +60,101 @@
    "test-multi": "karma start"
  },
  "dependencies": {
-    "babel-polyfill": "^6.26.0",
-    "babel-runtime": "^6.26.0",
-    "bluebird": "^3.5.2",
+    "babel-polyfill": "^6.5.0",
+    "babel-runtime": "^6.11.6",
+    "bluebird": "^3.5.0",
    "browser-request": "^0.3.3",
    "draft-js": "^0.11.0-alpha",
-    "extract-text-webpack-plugin": "^4.0.0-beta.0",
+    "extract-text-webpack-plugin": "^0.9.1",
    "favico.js": "^0.3.10",
-    "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
-    "gfm.css": "^1.1.2",
-    "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "0.14.2-rc.1",
-    "matrix-react-sdk": "0.14.7-rc.2",
-    "modernizr": "^3.6.0",
-    "prop-types": "^15.6.2",
+    "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
+    "gfm.css": "^1.1.1",
+    "highlight.js": "^9.0.0",
+    "matrix-js-sdk": "0.11.0",
+    "matrix-react-sdk": "0.13.4",
+    "modernizr": "^3.1.0",
+    "prop-types": "^15.5.10",
    "react": "^15.6.0",
    "react-dom": "^15.6.0",
-    "sanitize-html": "^1.19.1",
-    "ua-parser-js": "^0.7.19",
+    "sanitize-html": "^1.18.4",
+    "ua-parser-js": "^0.7.10",
    "url": "^0.11.0"
  },
  "devDependencies": {
    "autoprefixer": "^6.6.0",
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.3",
-    "babel-eslint": "^8.1.1",
-    "babel-loader": "^7.1.5",
+    "babel-cli": "^6.5.2",
+    "babel-core": "^6.14.0",
+    "babel-eslint": "^6.1.0",
+    "babel-loader": "^6.2.5",
    "babel-plugin-add-module-exports": "^0.2.1",
    "babel-plugin-transform-async-to-bluebird": "^1.1.1",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-es2016": "^6.24.1",
-    "babel-preset-es2017": "^6.24.1",
-    "babel-preset-react": "^6.24.1",
-    "babel-preset-stage-2": "^6.24.1",
-    "chokidar": "^2.0.4",
+    "babel-plugin-transform-class-properties": "^6.16.0",
+    "babel-plugin-transform-object-rest-spread": "^6.16.0",
+    "babel-plugin-transform-runtime": "^6.15.0",
+    "babel-preset-es2015": "^6.16.0",
+    "babel-preset-es2016": "^6.16.0",
+    "babel-preset-es2017": "^6.16.0",
+    "babel-preset-react": "^6.16.0",
+    "babel-preset-stage-2": "^6.17.0",
+    "chokidar": "^1.6.1",
    "concurrently": "^4.0.1",
    "cpx": "^1.3.2",
    "cross-env": "^4.0.0",
-    "electron-builder": "^20.29.0",
-    "electron-builder-squirrel-windows": "^11.6.1",
-    "electron-devtools-installer": "^2.2.4",
+    "css-raw-loader": "^0.1.1",
+    "electron-builder": "^11.2.4",
+    "electron-builder-squirrel-windows": "^11.2.1",
+    "electron-devtools-installer": "^2.2.0",
    "emojione": "^2.2.7",
-    "eslint": "^5.8.0",
+    "eslint": "^3.14.0",
    "eslint-config-google": "^0.7.1",
-    "eslint-plugin-babel": "^4.1.2",
-    "eslint-plugin-flowtype": "^2.50.3",
-    "eslint-plugin-react": "^7.11.1",
+    "eslint-plugin-babel": "^4.1.1",
+    "eslint-plugin-flowtype": "^2.30.0",
+    "eslint-plugin-react": "^7.4.0",
    "expect": "^1.16.0",
    "fs-extra": "^0.30.0",
-    "html-webpack-plugin": "^3.2.0",
+    "html-webpack-plugin": "^2.24.0",
    "json-loader": "^0.5.3",
-    "karma": "^3.1.1",
+    "karma": "^1.7.0",
    "karma-chrome-launcher": "^0.2.3",
-    "karma-cli": "^1.0.1",
-    "karma-junit-reporter": "^2.0.0",
+    "karma-cli": "^0.1.2",
+    "karma-junit-reporter": "^0.4.1",
    "karma-logcapture-reporter": "0.0.1",
-    "karma-mocha": "^1.3.0",
+    "karma-mocha": "^0.2.2",
    "karma-sourcemap-loader": "^0.3.7",
    "karma-spec-reporter": "0.0.31",
-    "karma-summary-reporter": "^1.5.1",
-    "karma-webpack": "4.0.0-beta.0",
-    "matrix-mock-request": "^1.2.2",
+    "karma-summary-reporter": "^1.3.3",
+    "karma-webpack": "^1.7.0",
+    "matrix-mock-request": "^1.2.0",
    "matrix-react-test-utils": "^0.2.0",
    "minimist": "^1.2.0",
    "mkdirp": "^0.5.1",
-    "mocha": "^5.2.0",
+    "mocha": "^2.4.5",
    "postcss-extend": "^1.0.5",
-    "postcss-import": "^11.1.0",
-    "postcss-loader": "^2.1.6",
-    "postcss-mixins": "^6.2.0",
-    "postcss-nested": "^3.0.0",
-    "postcss-scss": "^1.0.6",
-    "postcss-simple-vars": "^4.1.0",
+    "postcss-import": "^9.0.0",
+    "postcss-loader": "^1.2.2",
+    "postcss-mixins": "^5.4.1",
+    "postcss-nested": "^1.0.0",
+    "postcss-scss": "^0.4.0",
+    "postcss-simple-vars": "^3.0.0",
    "postcss-strip-inline-comments": "^0.1.5",
-    "raw-loader": "^0.5.1",
    "react-addons-perf": "^15.4.0",
    "react-addons-test-utils": "^15.6.0",
    "rimraf": "^2.4.3",
-    "source-map-loader": "^0.2.4",
-    "webpack": "^4.23.1",
-    "webpack-cli": "^3.1.2",
-    "webpack-dev-server": "^3.1.10"
+    "source-map-loader": "^0.2.3",
+    "webpack": "^1.12.14",
+    "webpack-dev-server": "^1.16.2"
  },
  "optionalDependencies": {
-    "olm": "https://matrix.org/packages/npm/olm/olm-3.0.0.tgz"
+    "olm": "https://matrix.org/packages/npm/olm/olm-2.2.1.tgz"
  },
  "build": {
    "appId": "im.riot.app",
-    "electronVersion": "3.0.10",
+    "category": "Network",
+    "electronVersion": "2.0.8",
+    "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
+    "asar": false,
+    "dereference": true,
+    "//files": "We bundle everything, so we only need to include webapp/",
    "files": [
      "node_modules/**",
      "src/**",
@@ -167,13 +171,8 @@
        "StartupWMClass": "riot"
      }
    },
-    "mac": {
-      "category": "public.app-category.social-networking"
-    },
    "win": {
-      "target": {
-        "target": "squirrel"
-      }
+      "target": "squirrel"
    },
    "directories": {
      "buildResources": "electron_app/build",
--- a/release.sh
+++ b/release.sh
@@ -47,4 +47,4 @@ git commit package.json -m "$tag"

 cd ..

-exec ./node_modules/matrix-js-sdk/release.sh -z "$orig_args"
+exec ./node_modules/matrix-js-sdk/release.sh -u "vector-im" -z "$orig_args"
--- a/res/themes/status/css/_status.scss
+++ b/res/themes/status/css/_status.scss
@@ -68,7 +68,6 @@ $focus-bg-color: #dddddd;
 // button UI (white-on-green in light skin)
 $accent-fg-color: #ffffff;
 $accent-color: #6CC1F6;
-$accent-color-50pct: #6CC1F67F;
 $accent-hover-color: #84cfff;

 $selection-fg-color: $primary-bg-color;
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -25,7 +25,6 @@ const INCLUDE_LANGS = [
    {'value': 'gl', 'label': 'Galego'},
    {'value': 'hu', 'label': 'Magyar'},
    {'value': 'it', 'label': 'Italiano'},
-    {'value': 'ja', 'label': '日本語'},
    {'value': 'ko', 'label': '한국어'},
    {'value': 'lv', 'label': 'Latviešu'},
    {'value': 'nb_NO', 'label': 'Norwegian Bokmål'},
@@ -58,11 +57,6 @@ const COPY_LIST = [
    ["res/themes/**", "webapp/themes"],
    ["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
    ["node_modules/emojione/assets/png/*", "webapp/emojione/png/"],
-    // XXX: This is tied quite heavily to the matching olm.js so it really should be
-    // in the bundle dir with the js to avoid caching issues giving us wasm that
-    // doesn't match our js, but I cannot find any way to get webpack to do this.
-    ["node_modules/olm/olm.wasm", "webapp", { directwatch: 1 }],
-    ["node_modules/olm/olm_legacy.js", "webapp", { directwatch: 1 }],
    ["./config.json", "webapp", { directwatch: 1 }],
 ];

--- a/scripts/electron-package.sh
+++ b/scripts/electron-package.sh
@@ -100,7 +100,7 @@ mkdir -p "$projdir/electron_app/dist/unsigned/"
 # Install packages: what the user downloads the first time,
 # (DMGs for mac, exe installer for windows)
 mkdir -p "$pubdir/install/macos"
-cp $distdir/*.dmg "$pubdir/install/macos/"
+cp $distdir/mac/*.dmg "$pubdir/install/macos/"

 # Windows installers go to the dist dir because they need signing
 mkdir -p "$pubdir/install/win32/ia32/"
@@ -111,7 +111,7 @@ cp $distdir/win/*.exe "$projdir/electron_app/dist/unsigned/"

 # Packages for auto-update
 mkdir -p "$pubdir/update/macos"
-cp $distdir/*-mac.zip "$pubdir/update/macos/"
+cp $distdir/mac/*.zip "$pubdir/update/macos/"
 echo "$vername" > "$pubdir/update/macos/latest"

 mkdir -p "$pubdir/update/win32/ia32/"
--- a/scripts/jenkins.sh
+++ b/scripts/jenkins.sh
@@ -4,23 +4,21 @@ set -e

 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
-nvm use 10
+nvm use 6

 set -x

-npm install
-
-# apparently npm 3.10.3 on node 6.4.0 doesn't upgrade #develop target with npm install unless explicitly asked.
-npm install olm
-
 # check out corresponding branches of dependencies.
 #
 # clone the deps with depth 1: we know we will only ever need that one
 # commit.
-# We need to do this after npm install otherwise modern node versions
-# just reset it back.
 `dirname $0`/fetch-develop.deps.sh --depth 1

+npm install
+
+# apparently npm 3.10.3 on node 6.4.0 doesn't upgrade #develop target with npm install unless explicitly asked.
+npm install olm
+
 # install olm. A naive 'npm i ./olm/olm-*.tgz' fails because it uses the url
 # from our package.json (or even matrix-js-sdk's) in preference.
 #
--- a/src/components/structures/VectorHomePage.js
+++ b/src/components/structures/VectorHomePage.js
@@ -17,6 +17,7 @@ limitations under the License.

 'use strict';

+import React from 'react';
 import HomePage from 'matrix-react-sdk/lib/components/structures/HomePage';
 import sanitizeHtml from 'sanitize-html';
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
--- a/src/components/views/login/VectorCustomServerDialog.js
+++ b/src/components/views/login/VectorCustomServerDialog.js
@@ -15,8 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-const React = require("react");
-const sanitizeHtml = require("sanitize-html");
+var React = require("react");
+var sanitizeHtml = require("sanitize-html");
 import { _t } from 'matrix-react-sdk/lib/languageHandler';

 module.exports = React.createClass({
@@ -47,5 +47,5 @@ module.exports = React.createClass({
                </div>
            </div>
        );
-    },
+    }
 });
--- a/src/components/views/login/VectorLoginFooter.js
+++ b/src/components/views/login/VectorLoginFooter.js
@@ -16,7 +16,7 @@ limitations under the License.

 'use strict';

-const React = require('react');
+var React = require('react');
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
 import SettingsStore from 'matrix-react-sdk/lib/settings/SettingsStore';

@@ -29,8 +29,8 @@ module.exports = React.createClass({
    render: function() {
        // FIXME: replace this with a proper Status skin
        // ...except then we wouldn't be able to switch to the Status theme at runtime.
-        if (SettingsStore.getValue("theme") === 'status') return <div />;
-
+        if (SettingsStore.getValue("theme") === 'status') return <div/>;
+        
        return (
            <div className="mx_Login_links">
                <a href="https://medium.com/@RiotChat">blog</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
@@ -39,5 +39,5 @@ module.exports = React.createClass({
                <a href="https://matrix.org">{ _t('powered by Matrix') }</a>
            </div>
        );
-    },
+    }
 });
--- a/src/components/views/login/VectorLoginHeader.js
+++ b/src/components/views/login/VectorLoginHeader.js
@@ -35,9 +35,9 @@ module.exports = React.createClass({
        return (
            <div className="mx_Login_header">
                <div className="mx_Login_logo">
-                    <img src={this.props.icon || DEFAULT_LOGO_URI} alt="Riot" />
+                    <img src={this.props.icon || DEFAULT_LOGO_URI} alt="Riot"/>
                </div>
            </div>
        );
-    },
+    }
 });
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -34,6 +34,5 @@
    "Dev chat for the Dendrite dev team": "Babilado por la programista skipo de Dendrite",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Multaj ĉambroj jam ekzistas en Matrix; kaj sendependaj, kaj ligitaj kun jamaj retoj (Slock, IRC, Gitter, ktp.). Rigardu la ĉambrujon!",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s per %(browserName)s je %(osName)s",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Vi povas uzi proprajn servilajn elektojn por saluti aliajn servilojn de Matrix, per specifo de alia hejmservila URL.<br/>Tio permesas al vi uzi klienton Riot kun jama konto de Matrix en alia hejmservilo.<br/><br/>Vi ankaŭ povas agordi propran identigan servilon, sed vi ne povos inviti uzantojn per retpoŝtadreso, aŭ esti invitata per retpoŝtadreso mem.",
-    "Co-ordination for Riot translators": "Kunordigo por tradukantoj de Riot"
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Vi povas uzi proprajn servilajn elektojn por saluti aliajn servilojn de Matrix, per specifo de alia hejmservila URL.<br/>Tio permesas al vi uzi klienton Riot kun jama konto de Matrix en alia hejmservilo.<br/><br/>Vi ankaŭ povas agordi propran identigan servilon, sed vi ne povos inviti uzantojn per retpoŝtadreso, aŭ esti invitata per retpoŝtadreso mem."
 }
--- a/src/i18n/strings/hi.json
+++ b/src/i18n/strings/hi.json
@@ -1,39 +1 @@
-{
-    "Riot is not supported on mobile web. Install the app?": "रायट फ़ोन पर समर्थन नहीं हैं। एप्लिकेशन इनस्टॉल करना चाहेंगे ?",
-    "Riot Desktop on %(platformName)s": "%(platformName)s पर रायट डेस्कटॉप",
-    "Unknown device": "अज्ञात यन्त्र",
-    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s पर %(browserName)s के माध्यम से %(appName)s",
-    "You need to be using HTTPS to place a screen-sharing call.": "स्क्रीन साझा की कॉल करने के लिए आपको HTTPS का उपयोग करने की आवश्यकता है।",
-    "Custom Server Options": "कस्टम सर्वर विकल्प",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "आप एक अलग होम सर्वर यूआरएल निर्दिष्ट करके अन्य मैट्रिक्स सर्वरों में साइन इन करने के लिए कस्टम सर्वर विकल्प का उपयोग कर सकते हैं। <br/> यह आपको एक अलग होम सर्वर पर मौजूदा मैट्रिक्स खाते के साथ रायट का उपयोग करने की अनुमति देता है। <br/> <br/> आप अपना आइडेंटिटी सर्वर भी सेट कर सकते हैं लेकिन आप ईमेल पते से उपयोगकर्ताओं को आमंत्रित नहीं कर पाएंगे, या ईमेल पते से स्वयं आमंत्रित नहीं हों सकेंगे।",
-    "Dismiss": "खारिज",
-    "powered by Matrix": "मैट्रिक्स द्वारा संचालित",
-    "Welcome to Riot.im": "Riot.im में आपका स्वागत है",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "[मैट्रिक्स] द्वारा संचालित विकेंद्रीकृत, एन्क्रिप्टेड चैट और सहयोगिता",
-    "Search the room directory": "रूम डायरेक्टरी को खोजें",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "मौजूदा नेटवर्क से जुड़े मैट्रिक्स में बहुत से कमरे पहले से मौजूद हैं (स्लैक, आईआरसी, गिटर इत्यादि) या स्वतंत्र। डायरेक्टरी देखें!",
-    "Chat with Riot Bot": "रायट बॉट के साथ चैट करें",
-    "Get started with some tips from Riot Bot!": "रायट बॉट से कुछ सुझावों के साथ शुरू करें!",
-    "General discussion about Matrix and Riot": "मैट्रिक्स और रायट के बारे में सामान्य चर्चा",
-    "Discussion of all things Matrix!": "मैट्रिक्स की सभी चीजों की चर्चा!",
-    "Riot/Web &amp; Desktop chat": "रायट/वेब और डेस्कटॉप चैट",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "रायट / iOS और matrix-ios-sdk चैट",
-    "Riot/Android &amp; matrix-android-sdk chat": "रायट / एंड्रॉइड और matrix-android-sdk चैट",
-    "Matrix technical discussions": "मैट्रिक्स तकनीकी चर्चाएं",
-    "Running Matrix services": "मैट्रिक्स सेवाएं चलाना",
-    "Community-run support for Synapse": "सामुदायिक चालित Synapse के लिए समर्थन",
-    "Admin support for Dendrite": "डेंडर्राइट के लिए व्यवस्थापक समर्थन",
-    "Announcements about Synapse releases": "Synapse रिलीज के बारे में घोषणाएं",
-    "Support for those using and running matrix-appservice-irc": "Matrix-appservice-irc का उपयोग और चलाने वाले लोगों के लिए समर्थन",
-    "Building services on Matrix": "मैट्रिक्स पर सेवाएं बनाना",
-    "Support for those using the Matrix spec": "मैट्रिक्स spec का उपयोग करने वालों के लिए समर्थन",
-    "Design and implementation of E2E in Matrix": "मैट्रिक्स में E2E के डिजाइन और कार्यान्वयन",
-    "Implementing VR services with Matrix": "मैट्रिक्स के साथ VR सेवाओं को लागू करना",
-    "Implementing VoIP services with Matrix": "मैट्रिक्स के साथ वीओआईपी सेवाओं को लागू करना",
-    "Discussion of the Identity Service API": "आइडेंटिटी सर्विस API की चर्चा",
-    "Support for those using, running and writing other bridges": "अन्य ब्रिज का उपयोग, चलाने और लिखने वालों के लिए समर्थन",
-    "Contributing code to Matrix and Riot": "मैट्रिक्स और रायट में कोड योगदान करना",
-    "Dev chat for the Riot/Web dev team": "रायट  / वेब डेव टीम के लिए डेवलपर चैट",
-    "Dev chat for the Dendrite dev team": "डेन्ड्राइट देव टीम के लिए डेवलपर चैट",
-    "Co-ordination for Riot translators": "रायट अनुवादकों के लिए समन्वय"
-}
+{}
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -22,18 +22,18 @@
    "Support for those using and running matrix-appservice-irc": "Supporto per chi usa e amministra matrix-appservice-irc",
    "Building services on Matrix": "Costruzione servizi su Matrix",
    "Support for those using the Matrix spec": "Supporto per chi utilizza le specifiche Matrix",
-    "Design and implementation of E2E in Matrix": "Progetto e implementazione di E2E in Matrix",
+    "Design and implementation of E2E in Matrix": "Design e implementazione di E2E in Matrix",
    "Implementing VR services with Matrix": "Implementazione servizi VR con Matrix",
    "Implementing VoIP services with Matrix": "Implementazione servizi VoIP con Matrix",
-    "Discussion of the Identity Service API": "Discussione API del servizio identità",
-    "Support for those using, running and writing other bridges": "Supporto per chi usa, amministra e scrive altri ponti (bridge)",
+    "Discussion of the Identity Service API": "Discussione sull'Identity Service API",
+    "Support for those using, running and writing other bridges": "Supporto per chi usa, amministra e scrive altri bridge",
    "Contributing code to Matrix and Riot": "Contributi di codice per Matrix e Riot",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s tramite %(browserName)s su %(osName)s",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat criptate e decentralizzate &amp; collaborazione offerta da [matrix]",
-    "Discussion of all things Matrix!": "Discussione su tutto riguardo Matrix!",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat criptate e collaborazioni decentralizzate offerte da [matrix]",
+    "Discussion of all things Matrix!": "Discussione su tutto quanto riguardi Matrix!",
    "Dev chat for the Riot/Web dev team": "Chat per gli sviluppatori di Riot/Web",
    "Dev chat for the Dendrite dev team": "Chat per gli sviluppatori di Dendrite",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Esistono già molte stanze in Matrix, collegate a reti esistenti (Slack, IRC, Gitter, ecc.) o indipendenti. Controlla l'elenco!",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Puoi usare le opzioni server personalizzate per accedere ad altri server Matrix specificando l'indirizzo del server home.<br/> Questo permette di usare Riot con un account Matrix esistente su un server home diverso.<br/><br/>È anche possibile impostare un diverso server identità, ma in tal caso non sarà possibile invitare utenti attraverso l'indirizzo e-mail o essere invitati attraverso l'indirizzo e-mail.",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Esistono già molte stanze in Matrix, collegate a reti già esistenti (Slack, IRC, Gitter ecc) o indipendenti. Dai un'occhiata all'elenco!",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Puoi usare le opzioni server personalizzate per accedere ad altri server Matrix specificando l'indirizzo dell'home server.<br/> Questo permette di usare Matrix con un account esistente su un home server diverso.<br/><br/>È anche possibile impostare un diverso identity server, ma in quel caso non sarà possibile invitare utenti attraverso l'indirizzo e-mail o essere invitati attraverso l'indirizzo e-mail.",
    "Co-ordination for Riot translators": "Coordinazione per i traduttori di Riot"
 }
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -15,7 +15,7 @@
    "Chat with Riot Bot": "Riot Botと会話",
    "Get started with some tips from Riot Bot!": "Riot Botにヒントをもらって始めましょう！",
    "General discussion about Matrix and Riot": "MatrixとRiotの概略",
-    "Discussion of all things Matrix!": "Matrixなんでも議論！",
+    "Discussion of all things Matrix!": "Matrixなんでも討論",
    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; デスクトップ版チャット",
    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk チャット",
    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk チャット",
@@ -25,15 +25,14 @@
    "Admin support for Dendrite": "Dendriteの管理者サポート",
    "Announcements about Synapse releases": "Synapseの公開についてのお知らせ",
    "Support for those using and running matrix-appservice-irc": "matrix-appservice-ircを利用並びに運営している方へのサポート",
-    "Building services on Matrix": "Matrix上でのサービスの開発",
+    "Building services on Matrix": "Matrixでのサービスの開発",
    "Support for those using the Matrix spec": "Matrixスペックを利用する方へのサポート",
-    "Design and implementation of E2E in Matrix": "Matrixのデザインとエンドツーエンドの実装",
+    "Design and implementation of E2E in Matrix": "Matrixでのデザインとエンドツーエンドの実装",
    "Implementing VR services with Matrix": "MatrixでのVRサービスの実装",
    "Implementing VoIP services with Matrix": "MatrixでのIP電話サービスの実装",
    "Discussion of the Identity Service API": "Identity Service APIの議論",
    "Support for those using, running and writing other bridges": "他のブリッジを利用、運営、作成している方へのサポート",
    "Contributing code to Matrix and Riot": "MatrixとRiotにコードを提供する",
    "Dev chat for the Riot/Web dev team": "Riot/Web開発者チームのための開発者チャット",
-    "Dev chat for the Dendrite dev team": "Dendrite開発者チームのための開発者チャット",
-    "Co-ordination for Riot translators": "Riot 翻訳者による共同作業"
+    "Dev chat for the Dendrite dev team": "Dendrite開発者チームのための開発者チャット"
 }
--- a/src/i18n/strings/jbo.json
+++ b/src/i18n/strings/jbo.json
@@ -1,39 +0,0 @@
-{
-    "Riot is not supported on mobile web. Install the app?": ".i lo samfonxa na kakne lo nu pilno la kibro nu zunti .i .au pei kibycpa le samtci",
-    "Riot Desktop on %(platformName)s": "la skami nu zunti ci'e la'o gy. %(platformName)s .gy.",
-    "Unknown device": "lo na'e te djuno se pilno",
-    "%(appName)s via %(browserName)s on %(osName)s": "la'o gy. %(appName)s .gy. xe be'i la'o gy. %(browserName)s .gy. ci'e la'o gy. %(osName)s .gy.",
-    "You need to be using HTTPS to place a screen-sharing call.": ".i la .hytytypysys. sarcu lo nu co'a vidni jorne",
-    "Custom Server Options": "lo macnu se cuxna be fi lo'i samse'u",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": ".i zukte lo nu macnu cuxna lo samse'u kei goi ko'a lo nu pilno lo drata samse'u pe la nacmeimei<br/>.i ko'a se cumki lo nu do pilno lo pilno poi zvati lo drata samse'u pe la nacmeimei<br/><br/>.i ji'a cumki fa lo nu do pilno lo drata ke prenu datni samse'u kei goi ko'a .i ku'i ko'a to'e rinka la'a lo nu do zvacpe ja se zvacpe",
-    "Dismiss": "mipri",
-    "powered by Matrix": ".i la nacmeimei cu cumgau",
-    "Welcome to Riot.im": ".i fi'i lo pilno be la nu zunti",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": ".i la nacmeimei cu cumgau lo mifra je na'e se midju nu tavla je ke kansa gunka",
-    "Search the room directory": "sisku fi lo'i kumfa pe'a",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": ".i ci'e la nacmeimei cu kumfa pe'a fa so'i da noi jorne jo nai no'e jorne lo drata ciste no'u mu'a la .slak. jo'u lo te irci jo'u la .gityr. .i",
-    "Chat with Riot Bot": "tavla la nu zunti kei sampre",
-    "Get started with some tips from Riot Bot!": ".i .e'u la nu zunti kei sampre cu sidju ko",
-    "General discussion about Matrix and Riot": "lo nu casnu be la nacmeimei .e la nu zunti",
-    "Discussion of all things Matrix!": "lo nu casnu be ro me la nacmeimei",
-    "Riot/Web &amp; Desktop chat": "lo nu casnu be la kibro nu zunti .e la skami nu zunti",
-    "Running Matrix services": "lo nu ralte lo samtcise'u pe la nacmeimei",
-    "Community-run support for Synapse": "lo nu lo cecmu cu sidju fi tu'a la .sinaps.",
-    "Discussion of the Identity Service API": "lo nu casnu lo prenu datni favgau cimde",
-    "Contributing code to Matrix and Riot": "lo nu dunda lo samselpla la nacmeimei .a la nu zunti",
-    "Co-ordination for Riot translators": "lo nu lo fanva pe la nu zunti cu kansa gunka",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "lo nu casnu la plisyfonkemsamcmu nu zunti .e la'o gy. matrix-ios-sdk .gy.",
-    "Riot/Android &amp; matrix-android-sdk chat": "lo nu casnu la guglyfonkemsamcmu nu zunti .e la'o gy. matrix-android-sdk .gy.",
-    "Matrix technical discussions": "lo nu casnu lo zbaske be la nacmeimei",
-    "Announcements about Synapse releases": "lo notci be lo farvi tcini pe la nirna",
-    "Support for those using and running matrix-appservice-irc": "lo nu sidju lo pilno ja admine be la'o gy. matrix-appservice-irc .gy.",
-    "Building services on Matrix": "lo nu finti lo te selfu ji'u la nacmeimei",
-    "Support for those using the Matrix spec": "lo nu sidju lo pilno be lo sarcu pe la nacmeimei",
-    "Design and implementation of E2E in Matrix": "lo nu finti lo mulno mifra te platu .a lo samtcise'u be my. ji'u la nacmeimei",
-    "Support for those using, running and writing other bridges": "lo nu sidju lo pilno ja admine ja finti be lo drata te jorne",
-    "Dev chat for the Riot/Web dev team": "lo nu lo favgau be la kibro nu zunti cu casnu",
-    "Dev chat for the Dendrite dev team": "lo nu lo favgau be la nirndendriti cu casnu",
-    "Implementing VoIP services with Matrix": "lo nu finti lo samtcise'u be fi la .voip. ji'u la nacmeimei",
-    "Implementing VR services with Matrix": "lo nu finti lo samtcise'u be fi lo na'e fatci munje ji'u la nacmeimei",
-    "Admin support for Dendrite": "lo nu sidju lo admine be la nirndendriti"
-}
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -33,7 +33,5 @@
    "Contributing code to Matrix and Riot": "Matrix와 Riot에 코드 기여하기",
    "Dev chat for the Riot/Web dev team": "Riot/웹 개발 팀을 위한 개발자 대화",
    "Dev chat for the Dendrite dev team": "덴드라이트 개발 팀을 위한 개발자 대화",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방이 이미 Matrix에 있습니다. 목록을 확인해보세요!",
-    "Co-ordination for Riot translators": "Riot 번역자 조합",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "사용자정의 서버 설정에서 다른 홈서버 URL를 지정해 다른 Matrix 서버에 접속할 수 있습니다. <br/>이렇게하면 다른 홈서버에서 기존의 Matrix 계정으로 Riot을 이용할 수 있습니다.<br/><br/>사용자정의 아이덴티티 서버도 설정할 수 있지만 이메일 주소로 이용자를 초대하거나 자신이 이메일 주소로 초대받을 수 없습니다."
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방이 이미 Matrix에 있습니다. 목록을 확인해보세요!"
 }
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -34,6 +34,6 @@
    "Support for those using, running and writing other bridges": "Ondersteuning voor het gebruiken, draaien en ontwikkelen aan andere bruggen",
    "Dev chat for the Riot/Web dev team": "Dev-chat voor het Riot/Web ontwikkelteam",
    "Dev chat for the Dendrite dev team": "Dev-chat voor het Dendrite-ontwikkelteam",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Je kan de custom serveropties gebruiken om op andere Matrix-servers in te loggen door een andere thuisserver-URL op te geven.<br/> Dit laat je toe om Riot te gebruiken met een bestaand Matrix-account op een andere thuisserver.<br/><br/>Je kan ook een aangepaste-identiteitsserver opzetten maar dan kan je geen gebruikers uitnodigen via hun e-mailadres, of zelf uitgenodigd worden via je e-mailadres.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Je kan de custom server opties gebruiken om op andere Matrix server in te loggen door een andere Home server URL op te geven.<br/> Dit laat je toe om Riot te gebruiken met een bestaande Matrix account op een andere home server.<br/><br/>Je kan ook een custom identiteits-server opzetten maar dan kan je geen gebruikers uitnodigen via hun email adres, of zelf uitgenodigd worden via je email adres.",
    "Co-ordination for Riot translators": "Coördinatie voor Riot vertalers"
 }
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -1,5 +1,5 @@
 {
-    "Riot is not supported on mobile web. Install the app?": "Riot-i nuk mbulohet në web për celularë. Të instalohet aplikacioni?",
+    "Riot is not supported on mobile web. Install the app?": "Riot-i nuk mbulohet nën web për celularët. Të instalohet aplikacioni?",
    "Riot Desktop on %(platformName)s": "Riot Desktop në %(platformName)s",
    "Unknown device": "Pajisje e panjohur",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s përmes %(browserName)s nën %(osName)s",
@@ -9,7 +9,7 @@
    "Dismiss": "Mos e merr parasysh",
    "powered by Matrix": "bazuar në Matrix",
    "Welcome to Riot.im": "Mirë se vini te Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Fjalosje &amp; bashkëpunim i decentralizuar, i fshehtëzuar, bazuar në [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted Fjalosje &amp; bashkëpunim i decentralizuar, i fshehtëzuar, bazuar në [matrix]",
    "Search the room directory": "Kërkoni te drejtoria e dhomave",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Ka tashmë plot dhoma në Matrix, të lidhura me rrjete ekzistues (Slack, IRC, Gitter, etj) ose të pavarur. Hidhini një sy listës!",
    "Chat with Riot Bot": "Fjalosuni me Robotin Riot",
@@ -27,13 +27,12 @@
    "Support for those using and running matrix-appservice-irc": "Asistencë për ata që përdorin dhe xhirojnë matrix-appservice-irc",
    "Building services on Matrix": "Ndërtim shërbimesh mbi Matrix",
    "Support for those using the Matrix spec": "Asistencë për ata që përdorin specifikimet Matrix",
-    "Design and implementation of E2E in Matrix": "Konceptimi dhe sendërtimi i E2E-s në Matrix",
+    "Design and implementation of E2E in Matrix": "Konceptimi dhe sendërtimi i E2E në Matrix",
    "Implementing VR services with Matrix": "Sendërtim shërbimesh VR me Matrix-in",
    "Implementing VoIP services with Matrix": "Sendërtim shërbimesh VoIP me Matrix-in",
-    "Discussion of the Identity Service API": "Diskutime mbi API-n Identity Service",
+    "Discussion of the Identity Service API": "Diskutime mbi Identity Service API",
    "Support for those using, running and writing other bridges": "Asistencë për ata që përdorin, xhirojnë ose programojnë ura të tjera",
    "Contributing code to Matrix and Riot": "Kontribut me kod te Matrix dhe te Riot",
    "Dev chat for the Riot/Web dev team": "Fjalosje mbi zhvillimin, për ekipin e zhvilluesve të Riot/Web-i",
-    "Dev chat for the Dendrite dev team": "Fjalosje mbi zhvillimi, për ekipin e zhvilluesve të Dendrite-it",
-    "Co-ordination for Riot translators": "Bashkërendim për përkthyes të Riot-it"
+    "Dev chat for the Dendrite dev team": "Fjalosje zhvillimi, për ekipin e zhvilluesve të Dendrite-it"
 }
--- a/src/i18n/strings/te.json
+++ b/src/i18n/strings/te.json
@@ -1,12 +1,9 @@
 {
-    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s %(browserName)s ద్వార %(osName)s కి",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s %(browserName)s ద్వర %(osName)s కి",
    "Custom Server Options": "మలచిన  సేవిక ఎంపికలు",
    "Dismiss": "రద్దుచేసే",
    "Riot Desktop on %(platformName)s": "రియట్ రంగస్థలం లో %(platformName)s",
    "Welcome to Riot.im": "రిమోట్.ఇం కి స్వగతం",
    "Search the room directory": "గది వివరాన్ని శోధించండి",
-    "Chat with Riot Bot": "రియోట్ బొట్తో మాటామంతి చేయండి",
-    "Unknown device": "తెలుయని పరికరం",
-    "You need to be using HTTPS to place a screen-sharing call.": "తెర ని పంచే కాల్ కి HTTPS అవసరం.",
-    "Riot is not supported on mobile web. Install the app?": "మొబైల్ బ్రౌజర్ లో రియట్ పనిచేయదు. ఆప్ ఇన్స్టాల్ చేయాలా?"
+    "Chat with Riot Bot": "రియోట్ బొట్తో మాటామంతి చేయండి"
 }
--- a/src/vector/getconfig.js
+++ b/src/vector/getconfig.js
@@ -33,33 +33,35 @@ export async function getVectorConfig(relativeLocation) {
 }

 function getConfig(configJsonFilename) {
-    return new Promise(function(resolve, reject) {
-        request(
-            { method: "GET", url: configJsonFilename },
-            (err, response, body) => {
-                if (err || response.status < 200 || response.status >= 300) {
-                    // Lack of a config isn't an error, we should
-                    // just use the defaults.
-                    // Also treat a blank config as no config, assuming
-                    // the status code is 0, because we don't get 404s
-                    // from file: URIs so this is the only way we can
-                    // not fail if the file doesn't exist when loading
-                    // from a file:// URI.
-                    if (response) {
-                        if (response.status == 404 || (response.status == 0 && body == '')) {
-                            resolve({});
-                        }
-                    }
-                    reject({err: err, response: response});
-                    return;
-                }
+    let deferred = Promise.defer();

-                // We parse the JSON ourselves rather than use the JSON
-                // parameter, since this throws a parse error on empty
-                // which breaks if there's no config.json and we're
-                // loading from the filesystem (see above).
-                resolve(JSON.parse(body));
-            },
-        );
-    });
+    request(
+        { method: "GET", url: configJsonFilename },
+        (err, response, body) => {
+            if (err || response.status < 200 || response.status >= 300) {
+                // Lack of a config isn't an error, we should
+                // just use the defaults.
+                // Also treat a blank config as no config, assuming
+                // the status code is 0, because we don't get 404s
+                // from file: URIs so this is the only way we can
+                // not fail if the file doesn't exist when loading
+                // from a file:// URI.
+                if (response) {
+                    if (response.status == 404 || (response.status == 0 && body == '')) {
+                        deferred.resolve({});
+                    }
+                }
+                deferred.reject({err: err, response: response});
+                return;
+            }
+
+            // We parse the JSON ourselves rather than use the JSON
+            // parameter, since this throws a parse error on empty
+            // which breaks if there's no config.json and we're
+            // loading from the filesystem (see above).
+            deferred.resolve(JSON.parse(body));
+        }
+    );
+
+    return deferred.promise;
 }
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -37,14 +37,6 @@
    <section id="matrixchat" style="height: 100%;"></section>
    <noscript>Sorry, Riot requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
    <% for (var i=0; i < htmlWebpackPlugin.files.js.length; i++) {
-        if (_.endsWith(htmlWebpackPlugin.files.js[i], 'olm.js')) {
-            var array = htmlWebpackPlugin.files.js;
-            htmlWebpackPlugin.files.js.unshift(htmlWebpackPlugin.files.js[i]);
-            htmlWebpackPlugin.files.js.splice(i, 1);
-        }
-       }
-
-       for (var i=0; i < htmlWebpackPlugin.files.js.length; i++) {
        // Not a particularly graceful way of not putting the indexeddb worker script
        // into the main page
        if (_.endsWith(htmlWebpackPlugin.files.js[i], 'indexeddb-worker.js')) {
@@ -81,6 +73,6 @@
    </audio>
    <audio id="remoteAudio"></audio>
    <!-- let CSS themes pass constants to the app -->
-    <div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"></div><div id="mx_theme_tertiaryAccentColor"></div>
+    <div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"/></div><div id="mx_theme_tertiaryAccentColor"/></div>
  </body>
 </html>
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -24,8 +24,6 @@ require('gfm.css/gfm.css');
 require('highlight.js/styles/github.css');
 require('draft-js/dist/Draft.css');

-import './rageshakesetup';
-
 import React from 'react';
 // add React and ReactPerf to the global namespace, to make them easier to
 // access via the console
@@ -34,7 +32,7 @@ if (process.env.NODE_ENV !== 'production') {
    global.Perf = require('react-addons-perf');
 }

-import './modernizr';
+import RunModernizrTests from './modernizr'; // this side-effects a global
 import ReactDOM from 'react-dom';
 import sdk from 'matrix-react-sdk';
 import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
@@ -43,6 +41,8 @@ import VectorConferenceHandler from 'matrix-react-sdk/lib/VectorConferenceHandle
 import Promise from 'bluebird';
 import request from 'browser-request';
 import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
+// Also import _t directly so we can call it just `_t` as this is what gen-i18n.js expects
+import { _t } from 'matrix-react-sdk/lib/languageHandler';

 import url from 'url';

@@ -50,11 +50,11 @@ import {parseQs, parseQsFromFragment} from './url_utils';
 import Platform from './platform';

 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
-import SettingsStore from "matrix-react-sdk/lib/settings/SettingsStore";
+import SettingsStore, {SettingLevel} from "matrix-react-sdk/lib/settings/SettingsStore";
 import Tinter from 'matrix-react-sdk/lib/Tinter';
 import SdkConfig from "matrix-react-sdk/lib/SdkConfig";

-import Olm from 'olm';
+import rageshake from "matrix-react-sdk/lib/rageshake/rageshake";

 import CallHandler from 'matrix-react-sdk/lib/CallHandler';

@@ -62,21 +62,33 @@ import {getVectorConfig} from './getconfig';

 let lastLocationHashSet = null;

-// Disable warnings for now: we use deprecated bluebird functions
-// and need to migrate, but they spam the console with warnings.
-Promise.config({warnings: false});
+function initRageshake() {
+    rageshake.init().then(() => {
+        console.log("Initialised rageshake: See https://bugs.chromium.org/p/chromium/issues/detail?id=583193 to fix line numbers on Chrome.");
+
+        window.addEventListener('beforeunload', (e) => {
+            console.log('riot-web closing');
+            // try to flush the logs to indexeddb
+            rageshake.flush();
+        });
+
+        rageshake.cleanup();
+    }, (err) => {
+        console.error("Failed to initialise rageshake: " + err);
+    });
+}

 function checkBrowserFeatures(featureList) {
    if (!window.Modernizr) {
        console.error("Cannot check features - Modernizr global is missing.");
        return false;
    }
-    let featureComplete = true;
-    for (let i = 0; i < featureList.length; i++) {
+    var featureComplete = true;
+    for (var i = 0; i < featureList.length; i++) {
        if (window.Modernizr[featureList[i]] === undefined) {
            console.error(
                "Looked for feature '%s' but Modernizr has no results for this. " +
-                "Has it been configured correctly?", featureList[i],
+                "Has it been configured correctly?", featureList[i]
            );
            return false;
        }
@@ -97,7 +109,7 @@ function getScreenFromLocation(location) {
    return {
        screen: fragparts.location.substring(1),
        params: fragparts.params,
-    };
+    }
 }

 // Here, we do some crude URL analysis to allow
@@ -122,10 +134,10 @@ function onHashChange(ev) {
 // so a web page can update the URL bar appropriately.
 function onNewScreen(screen) {
    console.log("newscreen "+screen);
-    const hash = '#/' + screen;
+    var hash = '#/' + screen;
    lastLocationHashSet = hash;
    window.location.hash = hash;
-}
+};

 // We use this to work out what URL the SDK should
 // pass through when registering to allow the user to
@@ -162,58 +174,59 @@ function makeRegistrationUrl(params) {
    return url;
 }

-export function getConfig(configJsonFilename) {
-    return new Promise(function(resolve, reject) {
-        request(
-            { method: "GET", url: configJsonFilename },
-            (err, response, body) => {
-                if (err || response.status < 200 || response.status >= 300) {
-                    // Lack of a config isn't an error, we should
-                    // just use the defaults.
-                    // Also treat a blank config as no config, assuming
-                    // the status code is 0, because we don't get 404s
-                    // from file: URIs so this is the only way we can
-                    // not fail if the file doesn't exist when loading
-                    // from a file:// URI.
-                    if (response) {
-                        if (response.status == 404 || (response.status == 0 && body == '')) {
-                            resolve({});
-                        }
-                    }
-                    reject({err: err, response: response});
-                    return;
-                }
+function getConfig(configJsonFilename) {
+    let deferred = Promise.defer();

-                // We parse the JSON ourselves rather than use the JSON
-                // parameter, since this throws a parse error on empty
-                // which breaks if there's no config.json and we're
-                // loading from the filesystem (see above).
-                resolve(JSON.parse(body));
-            },
-        );
-    });
+    request(
+        { method: "GET", url: configJsonFilename },
+        (err, response, body) => {
+            if (err || response.status < 200 || response.status >= 300) {
+                // Lack of a config isn't an error, we should
+                // just use the defaults.
+                // Also treat a blank config as no config, assuming
+                // the status code is 0, because we don't get 404s
+                // from file: URIs so this is the only way we can
+                // not fail if the file doesn't exist when loading
+                // from a file:// URI.
+                if (response) {
+                    if (response.status == 404 || (response.status == 0 && body == '')) {
+                        deferred.resolve({});
+                    }
+                }
+                deferred.reject({err: err, response: response});
+                return;
+            }
+
+            // We parse the JSON ourselves rather than use the JSON
+            // parameter, since this throws a parse error on empty
+            // which breaks if there's no config.json and we're
+            // loading from the filesystem (see above).
+            deferred.resolve(JSON.parse(body));
+        }
+    );
+
+    return deferred.promise;
 }

 function onTokenLoginCompleted() {
    // if we did a token login, we're now left with the token, hs and is
    // url as query params in the url; a little nasty but let's redirect to
    // clear them.
-    const parsedUrl = url.parse(window.location.href);
+    var parsedUrl = url.parse(window.location.href);
    parsedUrl.search = "";
-    const formatted = url.format(parsedUrl);
+    var formatted = url.format(parsedUrl);
    console.log("Redirecting to " + formatted + " to drop loginToken " +
                "from queryparams");
    window.location.href = formatted;
 }

 async function loadApp() {
+    initRageshake();
    MatrixClientPeg.setIndexedDbWorkerScript(window.vector_indexeddb_worker_script);
    CallHandler.setConferenceHandler(VectorConferenceHandler);

    window.addEventListener('hashchange', onHashChange);

-    await loadOlm();
-
    await loadLanguage();

    const fragparts = parseQsFromFragment(window.location);
@@ -238,9 +251,7 @@ async function loadApp() {

    // don't try to redirect to the native apps if we're
    // verifying a 3pid (but after we've loaded the config)
-    // or if the user is following a deep link
-    // (https://github.com/vector-im/riot-web/issues/7378)
-    const preventRedirect = fragparts.params.client_secret || fragparts.location.length > 0;
+    const preventRedirect = Boolean(fragparts.params.client_secret);

    if (!preventRedirect) {
        const isIos = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
@@ -254,6 +265,7 @@ async function loadApp() {
    }

    // as quickly as we possibly can, set a default theme...
+    const styleElements = Object.create(null);
    let a;
    const theme = SettingsStore.getValue("theme");
    for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
@@ -273,23 +285,12 @@ async function loadApp() {
                // in case the Tinter.tint() in MatrixChat fires before the
                // CSS has actually loaded (which in practice happens)...

-                // This if fixes Tinter.setTheme to not fire on Firefox
-                // in case it is the first time loading Riot.
-                // `InstallTrigger` is a Object which only exists on Firefox
-                // (it is used for their Plugins) and can be used as a
-                // feature check.
-                // Firefox loads css always before js. This is why we dont use
-                // onload or it's EventListener as thoose will never trigger.
-                if (typeof InstallTrigger !== 'undefined') {
+                // FIXME: we should probably block loading the app or even
+                // showing a spinner until the theme is loaded, to avoid
+                // flashes of unstyled content.
+                a.onload = () => {
                    Tinter.setTheme(theme);
-                } else {
-                    // FIXME: we should probably block loading the app or even
-                    // showing a spinner until the theme is loaded, to avoid
-                    // flashes of unstyled content.
-                    a.onload = () => {
-                        Tinter.setTheme(theme);
-                    };
-                }
+                };
            } else {
                // Firefox requires this to not be done via `setAttribute`
                // or via HTML.
@@ -329,59 +330,23 @@ async function loadApp() {
                initialScreenAfterLogin={getScreenFromLocation(window.location)}
                defaultDeviceDisplayName={platform.getDefaultDeviceDisplayName()}
            />,
-            document.getElementById('matrixchat'),
+            document.getElementById('matrixchat')
        );
    } else {
        console.error("Browser is missing required features.");
        // take to a different landing page to AWOOOOOGA at the user
-        const CompatibilityPage = sdk.getComponent("structures.CompatibilityPage");
+        var CompatibilityPage = sdk.getComponent("structures.CompatibilityPage");
        window.matrixChat = ReactDOM.render(
            <CompatibilityPage onAccept={function() {
                if (window.localStorage) window.localStorage.setItem('mx_accepts_unsupported_browser', true);
                console.log("User accepts the compatibility risks.");
                loadApp();
            }} />,
-            document.getElementById('matrixchat'),
+            document.getElementById('matrixchat')
        );
    }
 }

-function loadOlm() {
-    /* Load Olm. We try the WebAssembly version first, and then the legacy,
-     * asm.js version if that fails. For this reason we need to wait for this
-     * to finish before continuing to load the rest of the app. In future
-     * we could somehow pass a promise down to react-sdk and have it wait on
-     * that so olm can be loading in parallel with the rest of the app.
-     *
-     * We also need to tell the Olm js to look for its wasm file at the same
-     * level as index.html. It really should be in the same place as the js,
-     * ie. in the bundle directory, to avoid caching issues, but as far as I
-     * can tell this is completely impossible with webpack.
-     */
-    return Olm.init({
-        locateFile: () => 'olm.wasm',
-    }).then(() => {
-        console.log("Using WebAssembly Olm");
-    }).catch((e) => {
-        console.log("Failed to load Olm: trying legacy version");
-        return new Promise((resolve, reject) => {
-            const s = document.createElement('script');
-            s.src = 'olm_legacy.js';
-            s.onload = resolve;
-            s.onerror = reject;
-            document.body.appendChild(s);
-        }).then(() => {
-            // Init window.Olm, ie. the one just loaded by the script tag,
-            // not 'Olm' which is still the failed wasm version.
-            return window.Olm.init();
-        }).then(() => {
-            console.log("Using legacy Olm");
-        }).catch((e) => {
-            console.log("Both WebAssembly and asm.js Olm failed!", e);
-        });
-    });
-}
-
 async function loadLanguage() {
    const prefLang = SettingsStore.getValue("language", null, /*excludeDefault=*/true);
    let langs = [];
--- a/src/vector/indexeddb-worker.js
+++ b/src/vector/indexeddb-worker.js
@@ -18,4 +18,4 @@ import {IndexedDBStoreWorker} from 'matrix-js-sdk/lib/indexeddb-worker.js';

 const remoteWorker = new IndexedDBStoreWorker(postMessage);

-export const onmessage = remoteWorker.onMessage;
+onmessage = remoteWorker.onMessage;
--- a/src/vector/mobile_guide/index.js
+++ b/src/vector/mobile_guide/index.js
@@ -13,7 +13,6 @@ async function initPage() {
    if (config && config['default_hs_url']) {
        hsUrl = config['default_hs_url'];
    }
-    if (hsUrl && !hsUrl.endsWith('/')) hsUrl += '/';
    if (hsUrl && hsUrl !== 'https://matrix.org/') {
        document.getElementById('step2_container').style.display = 'block';
        document.getElementById('hs_url').innerHTML = hsUrl;
--- a/src/vector/olm-loader.js
+++ b/src/vector/olm-loader.js
@@ -0,0 +1,41 @@
+/*
+Copyright 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/* a very thin shim for loading olm.js: just sets the global OLM_OPTIONS and
+ * requires the actual olm.js library.
+ *
+ * olm.js reads global.OLM_OPTIONS and defines global.Olm. The latter is fine for us,
+ * but we need to prepare the former.
+ *
+ * We can't use webpack's definePlugin to do this, because we tell webpack not
+ * to parse olm.js. We also can't put this code in index.js, because olm and
+ * index.js are loaded in parallel, and we need to make sure OLM_OPTIONS is set
+ * before olm.js is loaded.
+ */
+
+/* total_memory must be a power of two, and at least twice the stack.
+ *
+ * We don't need a lot of stack, but we do need about 128K of heap to encrypt a
+ * 64K event (enough to store the ciphertext and the plaintext, bearing in mind
+ * that the plaintext can only be 48K because base64). We also have about 36K
+ * of statics. So let's have 256K of memory.
+ */
+global.OLM_OPTIONS = {
+    TOTAL_STACK: 64*1024,
+    TOTAL_MEMORY: 256*1024,
+};
+
+require('olm/olm.js');
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -27,7 +27,7 @@ import rageshake from 'matrix-react-sdk/lib/rageshake/rageshake';
 remote.autoUpdater.on('update-downloaded', onUpdateDownloaded);

 // try to flush the rageshake logs to indexeddb before quit.
-ipcRenderer.on('before-quit', function() {
+ipcRenderer.on('before-quit', function () {
    console.log('riot-desktop closing');
    rageshake.flush();
 });
@@ -143,6 +143,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
            {
                body: msg,
                icon: avatarUrl,
+                tag: 'vector',
                silent: true, // we play our own sounds
            },
        );
--- a/src/vector/platform/VectorBasePlatform.js
+++ b/src/vector/platform/VectorBasePlatform.js
@@ -60,8 +60,8 @@ export default class VectorBasePlatform extends BasePlatform {
            // This needs to be in in a try block as it will throw
            // if there are more than 100 badge count changes in
            // its internal queue
-            let bgColor = "#d00";
-            let notif = this.notificationCount;
+            let bgColor = "#d00",
+                notif = this.notificationCount;

            if (this.errorDidOccur) {
                notif = notif || "×";
@@ -114,7 +114,7 @@ export default class VectorBasePlatform extends BasePlatform {
        dis.dispatch({
            action: 'check_updates',
            value: false,
-        });
+        })
    }

    getUpdateCheckStatusEnum() {
--- a/src/vector/platform/WebPlatform.js
+++ b/src/vector/platform/WebPlatform.js
@@ -26,7 +26,7 @@ import Promise from 'bluebird';
 import url from 'url';
 import UAParser from 'ua-parser-js';

-const POKE_RATE_MS = 10 * 60 * 1000; // 10 min
+var POKE_RATE_MS = 10 * 60 * 1000; // 10 min

 export default class WebPlatform extends VectorBasePlatform {
    constructor() {
@@ -68,11 +68,11 @@ export default class WebPlatform extends VectorBasePlatform {
        // annoyingly, the latest spec says this returns a
        // promise, but this is only supported in Chrome 46
        // and Firefox 47, so adapt the callback API.
-        return new Promise(function(resolve, reject) {
-            global.Notification.requestPermission((result) => {
-                resolve(result);
-            });
+        const defer = Promise.defer();
+        global.Notification.requestPermission((result) => {
+            defer.resolve(result);
        });
+        return defer.promise;
    }

    displayNotification(title: string, msg: string, avatarUrl: string, room: Object) {
@@ -103,31 +103,31 @@ export default class WebPlatform extends VectorBasePlatform {
    }

    _getVersion(): Promise<string> {
+        const deferred = Promise.defer();
+
        // We add a cachebuster to the request to make sure that we know about
        // the most recent version on the origin server. That might not
        // actually be the version we'd get on a reload (particularly in the
        // presence of intermediate caching proxies), but still: we're trying
        // to tell the user that there is a new version.
+        request(
+            {
+                method: "GET",
+                url: "version",
+                qs: { cachebuster: Date.now() },
+            },
+            (err, response, body) => {
+                if (err || response.status < 200 || response.status >= 300) {
+                    if (err === null) err = { status: response.status };
+                    deferred.reject(err);
+                    return;
+                }

-        return new Promise(function(resolve, reject) {
-            request(
-                {
-                    method: "GET",
-                    url: "version",
-                    qs: { cachebuster: Date.now() },
-                },
-                (err, response, body) => {
-                    if (err || response.status < 200 || response.status >= 300) {
-                        if (err === null) err = { status: response.status };
-                        reject(err);
-                        return;
-                    }
-
-                    const ver = body.trim();
-                    resolve(ver);
-                },
-            );
-        });
+                const ver = body.trim();
+                deferred.resolve(ver);
+            },
+        );
+        return deferred.promise;
    }

    getAppVersion(): Promise<string> {
--- a/src/vector/rageshakesetup.js
+++ b/src/vector/rageshakesetup.js
@@ -1,62 +0,0 @@
-/*
-Copyright 2018 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
- * Separate file that sets up rageshake logging when imported.
- * This is necessary so that rageshake logging is set up before
- * anything else. Webpack puts all import statements at the top
- * of the file before any code, so imports will always be
- * evaluated first. Other imports can cause other code to be
- * evaluated (eg. the loglevel library in js-sdk, which if set
- * up before rageshake causes some js-sdk logging to be missing
- * from the rageshake.)
- */
-
-import rageshake from "matrix-react-sdk/lib/rageshake/rageshake";
-import SdkConfig from "matrix-react-sdk/src/SdkConfig";
-
-function initRageshake() {
-    rageshake.init().then(() => {
-        console.log("Initialised rageshake: See https://bugs.chromium.org/p/chromium/issues/detail?id=583193 to fix line numbers on Chrome.");
-
-        window.addEventListener('beforeunload', (e) => {
-            console.log('riot-web closing');
-            // try to flush the logs to indexeddb
-            rageshake.flush();
-        });
-
-        rageshake.cleanup();
-    }, (err) => {
-        console.error("Failed to initialise rageshake: " + err);
-    });
-}
-
-initRageshake();
-
-global.mxSendRageshake = function(text, withLogs) {
-    if (withLogs === undefined) withLogs = true;
-    require(['matrix-react-sdk/lib/rageshake/submit-rageshake'], (s) => {
-        s(SdkConfig.get().bug_report_endpoint_url, {
-            userText: text,
-            sendLogs: withLogs,
-            progressCallback: console.log.bind(console),
-        }).then(() => {
-            console.log("Bug report sent!");
-        }, (err) => {
-            console.error(err);
-        });
-    });
-};
--- a/src/vector/url_utils.js
+++ b/src/vector/url_utils.js
@@ -23,16 +23,16 @@ import qs from 'querystring';
 export function parseQsFromFragment(location) {
    // if we have a fragment, it will start with '#', which we need to drop.
    // (if we don't, this will return '').
-    const fragment = location.hash.substring(1);
+    var fragment = location.hash.substring(1);

    // our fragment may contain a query-param-like section. we need to fish
    // this out *before* URI-decoding because the params may contain ? and &
    // characters which are only URI-encoded once.
-    const hashparts = fragment.split('?');
+    var hashparts = fragment.split('?');

-    const result = {
+    var result = {
        location: decodeURIComponent(hashparts[0]),
-        params: {},
+        params: {}
    };

    if (hashparts.length > 1) {
--- a/test/all-tests.js
+++ b/test/all-tests.js
@@ -6,8 +6,8 @@
 // ideally these unit tests could be run under nodejs rather than in a browser
 // via karma, but having two separate test frameworks in the same project
 // seems confusing
-const unit_tests = require.context('./unit-tests', true, /\.js$/);
+var unit_tests = require.context('./unit-tests', true, /\.js$/);
 unit_tests.keys().forEach(unit_tests);

-const app_tests = require.context('./app-tests', true, /\.jsx?$/);
+var app_tests = require.context('./app-tests', true, /\.jsx?$/);
 app_tests.keys().forEach(app_tests);
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -21,36 +21,36 @@ import Platform from '../../src/vector/platform';

 require('skin-sdk');

-const jssdk = require('matrix-js-sdk');
+var jssdk = require('matrix-js-sdk');

-const sdk = require('matrix-react-sdk');
-const peg = require('matrix-react-sdk/lib/MatrixClientPeg');
-const dis = require('matrix-react-sdk/lib/dispatcher');
-const PageTypes = require('matrix-react-sdk/lib/PageTypes');
-const MatrixChat = sdk.getComponent('structures.MatrixChat');
-const RoomDirectory = sdk.getComponent('structures.RoomDirectory');
-const RoomPreviewBar = sdk.getComponent('rooms.RoomPreviewBar');
-const RoomView = sdk.getComponent('structures.RoomView');
+var sdk = require('matrix-react-sdk');
+var peg = require('matrix-react-sdk/lib/MatrixClientPeg');
+var dis = require('matrix-react-sdk/lib/dispatcher');
+var PageTypes = require('matrix-react-sdk/lib/PageTypes');
+var MatrixChat = sdk.getComponent('structures.MatrixChat');
+var RoomDirectory = sdk.getComponent('structures.RoomDirectory');
+var RoomPreviewBar = sdk.getComponent('rooms.RoomPreviewBar');
+var RoomView = sdk.getComponent('structures.RoomView');

-const React = require('react');
-const ReactDOM = require('react-dom');
-const ReactTestUtils = require('react-addons-test-utils');
-const expect = require('expect');
+var React = require('react');
+var ReactDOM = require('react-dom');
+var ReactTestUtils = require('react-addons-test-utils');
+var expect = require('expect');
 import Promise from 'bluebird';

-const test_utils = require('../test-utils');
-const MockHttpBackend = require('matrix-mock-request');
+var test_utils = require('../test-utils');
+var MockHttpBackend = require('matrix-mock-request');

-const HS_URL='http://localhost';
-const IS_URL='http://localhost';
-const USER_ID='@me:localhost';
-const ACCESS_TOKEN='access_token';
+var HS_URL='http://localhost';
+var IS_URL='http://localhost';
+var USER_ID='@me:localhost';
+var ACCESS_TOKEN='access_token';

-describe('joining a room', function() {
-    describe('over federation', function() {
-        let parentDiv;
-        let httpBackend;
-        let matrixChat;
+describe('joining a room', function () {
+    describe('over federation', function () {
+        var parentDiv;
+        var httpBackend;
+        var matrixChat;

        beforeEach(function() {
            test_utils.beforeEach(this);
@@ -72,8 +72,8 @@ describe('joining a room', function() {
        });

        it('should not get stuck at a spinner', function() {
-            const ROOM_ALIAS = '#alias:localhost';
-            const ROOM_ID = '!id:localhost';
+            var ROOM_ALIAS = '#alias:localhost';
+            var ROOM_ID = '!id:localhost';

            httpBackend.when('GET', '/pushrules').respond(200, {});
            httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
@@ -90,7 +90,7 @@ describe('joining a room', function() {

            PlatformPeg.set(new Platform());

-            const mc = (
+            var mc = (
                <MatrixChat config={{}}
                    makeRegistrationUrl={()=>{throw new Error("unimplemented");}}
                    initialScreenAfterLogin={{
@@ -100,7 +100,7 @@ describe('joining a room', function() {
            );
            matrixChat = ReactDOM.render(mc, parentDiv);

-            let roomView;
+            var roomView;

            // wait for /sync to happen. This may take some time, as the client
            // has to initialise indexeddb.
@@ -118,11 +118,11 @@ describe('joining a room', function() {
            }).then(() => {
                console.log(`${Date.now()} App made requests for directory view; switching to a room.`);

-                const roomDir = ReactTestUtils.findRenderedComponentWithType(
+                var roomDir = ReactTestUtils.findRenderedComponentWithType(
                    matrixChat, RoomDirectory);

                // enter an alias in the input, and simulate enter
-                const input = ReactTestUtils.findRenderedDOMComponentWithTag(
+                var input = ReactTestUtils.findRenderedDOMComponentWithTag(
                    roomDir, 'input');
                input.value = ROOM_ALIAS;
                ReactTestUtils.Simulate.change(input);
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -40,10 +40,10 @@ import * as test_utils from '../test-utils';
 import MockHttpBackend from 'matrix-mock-request';
 import {parseQs, parseQsFromFragment} from '../../src/vector/url_utils';

-const DEFAULT_HS_URL='http://my_server';
-const DEFAULT_IS_URL='http://my_is';
+var DEFAULT_HS_URL='http://my_server';
+var DEFAULT_IS_URL='http://my_is';

-describe('loading:', function() {
+describe('loading:', function () {
    let parentDiv;
    let httpBackend;

@@ -74,7 +74,7 @@ describe('loading:', function() {
        });
    });

-    afterEach(async function() {
+    afterEach(async function () {
        console.log(`${Date.now()}: loading: afterEach`);
        if (parentDiv) {
            ReactDOM.unmountComponentAtNode(parentDiv);
@@ -112,12 +112,12 @@ describe('loading:', function() {
            toString: function() { return this.search + this.hash; },
        };

-        const tokenLoginCompleteDefer = Promise.defer();
+        let tokenLoginCompleteDefer = Promise.defer();
        tokenLoginCompletePromise = tokenLoginCompleteDefer.promise;

        function onNewScreen(screen) {
            console.log(Date.now() + " newscreen "+screen);
-            const hash = '#/' + screen;
+            var hash = '#/' + screen;
            windowLocation.hash = hash;
            console.log(Date.now() + " browser URI now "+ windowLocation);
        }
@@ -129,7 +129,7 @@ describe('loading:', function() {
            return {
                screen: fragparts.location.substring(1),
                params: fragparts.params,
-            };
+            }
        }

        const MatrixChat = sdk.getComponent('structures.MatrixChat');
@@ -142,7 +142,7 @@ describe('loading:', function() {

        PlatformPeg.set(new Platform());

-        const params = parseQs(windowLocation);
+        var params = parseQs(windowLocation);
        matrixChat = ReactDOM.render(
            <MatrixChat
                onNewScreen={onNewScreen}
@@ -153,7 +153,7 @@ describe('loading:', function() {
                onTokenLoginCompleted={() => tokenLoginCompleteDefer.resolve()}
                initialScreenAfterLogin={getScreenFromLocation(windowLocation)}
                makeRegistrationUrl={() => {throw new Error('Not implemented');}}
-            />, parentDiv,
+            />, parentDiv
        );
    }

@@ -179,7 +179,7 @@ describe('loading:', function() {
    }

    describe("Clean load with no stored credentials:", function() {
-        it('gives a login panel by default', function(done) {
+        it('gives a login panel by default', function (done) {
            loadApp();

            Promise.delay(1).then(() => {
@@ -257,6 +257,7 @@ describe('loading:', function() {
                }
                return completeLogin(matrixChat);
            }).then(() => {
+
                // once the sync completes, we should have a room view
                ReactTestUtils.findRenderedComponentWithType(
                    matrixChat, sdk.getComponent('structures.HomePage'));
@@ -355,7 +356,7 @@ describe('loading:', function() {
                });
                return httpBackend.flush();
            }).then(() => {
-                return awaitSyncingSpinner(matrixChat);
+                return awaitSyncingSpinner(matrixChat)
            }).then(() => {
                // we got a sync spinner - let the sync complete
                return expectAndAwaitSync();
@@ -379,7 +380,7 @@ describe('loading:', function() {
            it('shows a login view', function() {
                // we expect a single <Login> component
                ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('structures.login.Login'),
+                    matrixChat, sdk.getComponent('structures.login.Login')
                );

                // the only outstanding request should be a GET /login
@@ -407,7 +408,7 @@ describe('loading:', function() {
    });

    describe('Guest auto-registration:', function() {
-        it('shows a home page by default', function(done) {
+        it('shows a home page by default', function (done) {
            loadApp();

            Promise.delay(1).then(() => {
@@ -437,7 +438,7 @@ describe('loading:', function() {
            }).done(done, done);
        });

-        it('uses the last known homeserver to register with', function(done) {
+        it('uses the last known homeserver to register with', function (done) {
            localStorage.setItem("mx_hs_url", "https://homeserver" );
            localStorage.setItem("mx_is_url", "https://idserver" );

@@ -476,7 +477,7 @@ describe('loading:', function() {

        it('shows a room view if we followed a room link', function(done) {
            loadApp({
-                uriFragment: "#/room/!room:id",
+                uriFragment: "#/room/!room:id"
            });
            Promise.delay(1).then(() => {
                // at this point, we're trying to do a guest registration;
@@ -546,7 +547,7 @@ describe('loading:', function() {

                // we expect a single <Login> component
                ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('structures.login.Login'),
+                    matrixChat, sdk.getComponent('structures.login.Login')
                );
            });

@@ -579,7 +580,7 @@ describe('loading:', function() {
    });

    describe('Token login:', function() {
-        it('logs in successfully', function(done) {
+        it('logs in successfully', function (done) {
            loadApp({
                queryString: "?loginToken=secretToken&homeserver=https%3A%2F%2Fhomeserver&identityServer=https%3A%2F%2Fidserver",
            });
@@ -657,7 +658,7 @@ describe('loading:', function() {

 // assert that we are on the loading page
 function assertAtLoadingSpinner(matrixChat) {
-    const domComponent = ReactDOM.findDOMNode(matrixChat);
+    var domComponent = ReactDOM.findDOMNode(matrixChat);
    expect(domComponent.className).toEqual("mx_MatrixChat_splash");

    // just the spinner
@@ -696,12 +697,12 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) {
 }

 function assertAtSyncingSpinner(matrixChat) {
-    const domComponent = ReactDOM.findDOMNode(matrixChat);
+    var domComponent = ReactDOM.findDOMNode(matrixChat);
    expect(domComponent.className).toEqual("mx_MatrixChat_splash");

    ReactTestUtils.findRenderedComponentWithType(
        matrixChat, sdk.getComponent('elements.Spinner'));
-    const logoutLink = ReactTestUtils.findRenderedDOMComponentWithTag(
+    var logoutLink = ReactTestUtils.findRenderedDOMComponentWithTag(
        matrixChat, 'a');
    expect(logoutLink.text).toEqual("Logout");
 }
--- a/test/skin-sdk.js
+++ b/test/skin-sdk.js
@@ -4,5 +4,5 @@
 * Skins the react-sdk with the vector components
 */

-const sdk = require('matrix-react-sdk');
+var sdk = require('matrix-react-sdk');
 sdk.loadSkin(require('../src/component-index'));
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -8,7 +8,7 @@ import Promise from 'bluebird';
 * @param {Mocha.Context} context  The test context
 */
 export function beforeEach(context) {
-    const desc = context.currentTest.fullTitle();
+    var desc = context.currentTest.fullTitle();
    console.log();
    console.log(desc);
    console.log(new Array(1 + desc.length).join("="));
@@ -22,7 +22,7 @@ export function beforeEach(context) {
 * returns true if the current environment supports webrtc
 */
 export function browserSupportsWebRTC() {
-    const n = global.window.navigator;
+    var n = global.window.navigator;
    return n.getUserMedia || n.webkitGetUserMedia ||
        n.mozGetUserMedia;
 }
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -15,46 +15,44 @@ module.exports = {

        "mobileguide": "./src/vector/mobile_guide/index.js",

+        // We ship olm.js as a separate lump of javascript. This makes it get
+        // loaded via a separate <script/> tag in index.html (which loads it
+        // into the browser global `Olm`, where js-sdk expects to find it).
+        //
+        // (we should probably make js-sdk load it asynchronously at some
+        // point, so that it doesn't block the pageload, but that is a separate
+        // problem)
+        "olm": "./src/vector/olm-loader.js",
+
        // CSS themes
        "theme-light":  "./node_modules/matrix-react-sdk/res/themes/light/css/light.scss",
        "theme-dark":   "./node_modules/matrix-react-sdk/res/themes/dark/css/dark.scss",
        "theme-status": "./res/themes/status/css/status.scss",
    },
    module: {
-        rules: [
-            { enforce: 'pre', test: /\.js$/, use: "source-map-loader", exclude: /node_modules/, },
-            { test: /\.js$/, use: "babel-loader", include: path.resolve(__dirname, 'src') },
+        preLoaders: [
+            { test: /\.js$/, loader: "source-map-loader" },
+        ],
+        loaders: [
+            { test: /\.json$/, loader: "json" },
+            { test: /\.js$/, loader: "babel", include: path.resolve('./src') },
            {
                test: /\.scss$/,
+
                // 1. postcss-loader turns the SCSS into normal CSS.
-                // 2. raw-loader turns the CSS into a javascript module
+                // 2. css-raw-loader turns the CSS into a javascript module
                //    whose default export is a string containing the CSS.
-                //    (raw-loader is similar to css-loader, but the latter
+                //    (css-raw-loader is similar to css-loader, but the latter
                //    would also drag in the imgs and fonts that our CSS refers to
                //    as webpack inputs.)
                // 3. ExtractTextPlugin turns that string into a separate asset.
-                use: ExtractTextPlugin.extract({
-                    use: [
-                        "raw-loader",
-                        {
-                            loader: 'postcss-loader',
-                            options: {
-                                config: {
-                                    path: './postcss.config.js'
-                                }
-                            }
-                        }
-                    ],
-                }),
+                loader: ExtractTextPlugin.extract("css-raw-loader!postcss-loader?config=postcss.config.js"),
            },
            {
                // this works similarly to the scss case, without postcss.
                test: /\.css$/,
-                use: ExtractTextPlugin.extract({
-                    use: "raw-loader"
-                }),
+                loader: ExtractTextPlugin.extract("css-raw-loader"),
            },
-
        ],
        noParse: [
            // for cross platform compatibility use [\\\/] as the path separator
@@ -154,11 +152,14 @@ module.exports = {
            // don't fill the console up with a mahoosive list of modules
            chunks: false,
        },
-
-        // hot mdule replacement doesn't work (I think we'd need react-hot-reload?)
-        // so webpack-dev-server reloads the page on every update which is quite
-        // tedious in Riot since that can take a while.
-        hot: false,
-        inline: false,
    },
 };
+
+// olm is an optional dependency. Ignore it if it's not installed, to avoid a
+// scary-looking error.
+try {
+    require('olm');
+} catch (e) {
+    console.log("Olm is not installed; not shipping it");
+    delete(module.exports.entry["olm"]);
+}