v1.2.2

Update from Weblate

.babelrc

@@ -1,4 +1,21 @@
 {
-  "presets": ["react", "es2015", "es2016"],
-  "plugins": ["transform-class-properties", "transform-object-rest-spread", "transform-async-to-bluebird", "transform-runtime", "add-module-exports"]
+    "presets": [
+        "react",
+        "es2015",
+        "es2016"
+    ],
+    "plugins": [
+        [
+            "transform-builtin-extend",
+            {
+                "globals": ["Error"]
+            }
+        ],
+        "transform-class-properties",
+        "transform-object-rest-spread",
+        "transform-async-to-bluebird",
+        "transform-runtime",
+        "add-module-exports",
+        "syntax-dynamic-import"
+    ]
 }

.buildkite/pipeline.yaml

@@ -0,0 +1,46 @@
+steps:
+  - label: ":eslint: Lint"
+    command:
+      - "yarn install"
+      - "yarn lint"
+    plugins:
+      - docker#v3.0.1:
+          image: "node:10"
+
+  - label: ":karma: Tests"
+    agents:
+      # We use a medium sized instance instead of the normal small ones because
+      # webpack loves to gorge itself on resources.
+      queue: "medium"
+    command:
+      # Install chrome
+      - "echo '--- Installing Chrome'"
+      - "wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -"
+      - "sh -c 'echo \"deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main\" >> /etc/apt/sources.list.d/google.list'"
+      - "apt-get update"
+      - "apt-get install -y google-chrome-stable"
+      # Run tests
+      - "echo '--- Fetching Dependencies'"
+      - "./scripts/fetch-develop.deps.sh --depth 1"
+      - "yarn install"
+      - "echo '+++ Running Tests'"
+      - "yarn test"
+    env:
+      CHROME_BIN: "/usr/bin/google-chrome-stable"
+    plugins:
+      - docker#v3.0.1:
+          image: "node:10"
+          propagate-environment: true
+
+  - label: ":hammer: Package"
+    command:
+      - "echo '--- Fetching Dependencies'"
+      - "./scripts/fetch-develop.deps.sh --depth 1"
+      - "yarn install"
+      - "echo '+++ Packaging'"
+      - "./scripts/ci_package.sh"
+    branches: "develop"
+    artifact_paths: "dist/riot-*.tar.gz"
+    plugins:
+      - docker#v3.0.1:
+          image: "node:10"

.dockerignore

@@ -0,0 +1,11 @@
+# Exclude a bunch of stuff which can make the build context a larger than it needs to be
+.git/
+test/
+webapp/
+lib/
+node_modules/
+electron_app/
+karma-reports/
+.idea/
+.tmp/
+config.json*

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+patreon: matrixdotorg
+liberapay: matrixdotorg

.github/ISSUE_TEMPLATE.md

@@ -43,4 +43,4 @@ For the web app:
 For the desktop app:
 
 - **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
-- **Version**: 0.x.y <!-- check the user settings panel if unsure -->
+- **Version**: 1.x.y <!-- check the user settings panel if unsure -->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: ''
+labels: bug
 assignees: ''
 
 ---
@@ -52,4 +52,4 @@ For the web app:
 For the desktop app:
 
 - **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
-- **Version**: 0.x.y <!-- check the user settings panel if unsure -->
+- **Version**: 1.x.y <!-- check the user settings panel if unsure -->

.github/ISSUE_TEMPLATE/redesign_issue.md

@@ -1,32 +0,0 @@
----
-name: Redesign Issue
-about: Bugs, feedback or feature requests specifically associated with the Redesign
-  project (https://riot.im/experimental)
-title: ''
-labels: redesign
-assignees: ''
-
----
-
-<!-- Thanks for providing feedback on the redesign! By filling out the sections with your information, you will help the us to process your issue.
--->
-
-- **Browser**: Chrome, Safari, Firefox? which version?
-- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
-
-### Description
-
-Describe here the problem that you are experiencing, or the feature you are requesting.
-Include screenshots if possible: you can drag and drop images below.
-
-### Steps to reproduce
-
-- For bugs, list the steps
-- that reproduce the bug
-- using hyphens as bullet points
-
-Describe how what happens differs from what you expected.
-
-Log: sent/not sent?    <!-- You can send us the app's logs via the 'Report bug'
-link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
-file a bug here too! -->

.github/ISSUE_TEMPLATE/suggestion-or-feature-request.md

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

.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md

@@ -0,0 +1,57 @@
+---
+name: User Interface or Usability Bug report
+about: Please include screenshots in UI/UX bug reports
+title: ''
+labels: bug, ui/ux
+assignees: ''
+
+---
+
+<!-- A picture's worth a thousand words: PLEASE INCLUDE A SCREENSHOT :P -->
+
+<!-- Please report security issues by email to security@matrix.org -->
+
+<!-- This is a bug report template. By following the instructions below and
+filling out the sections with your information, you will help the us to get all
+the necessary data to fix your issue.
+
+You can also preview your report before submitting it. You may remove sections
+that aren't relevant to your particular case.
+
+Text between <!-- and --​> marks will be invisible in the report.
+-->
+
+### Description
+
+Describe here the problem that you are experiencing, or the feature you are requesting.
+
+### Steps to reproduce
+
+- For bugs, list the steps
+- that reproduce the bug
+- using hyphens as bullet points
+
+Describe how what happens differs from what you expected.
+
+Log: sent/not sent?    <!-- You can send us the app's logs via the 'Report bug'
+link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
+file a bug here too! -->
+
+<!-- Include screenshots if possible: you can drag and drop images below. -->
+
+### Version information
+
+<!-- IMPORTANT: please answer the following questions, to help us narrow down the problem -->
+
+- **Platform**: web (in-browser) or desktop?
+
+For the web app:
+
+- **Browser**: Chrome, Safari, Firefox? which version?
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **URL**: riot.im/develop / riot.im/app / somewhere else? If a private server, what version of riot-web?
+
+For the desktop app:
+
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **Version**: 1.x.y <!-- check the user settings panel if unsure -->

.gitignore

@@ -1,17 +1,18 @@
 /build
 /cert.pem
 /dist
-/karma-reports
 /key.pem
 /lib
 /node_modules
 /electron_app/node_modules
 /electron_app/dist
+/electron_app/pub
 /packages/
 /webapp
 /.npmrc
+/*.log
+package-lock.json
 .DS_Store
-npm-debug.log
 electron/dist
 electron/pub
 **/.idea

.travis.yml

@@ -1,28 +0,0 @@
-# we need trusty for the chrome addon
-dist: trusty
-
-# we don't need sudo, so can run in a container, which makes startup much
-# quicker.
-#
-# unfortunately we do temporarily require sudo as a workaround for
-# https://github.com/travis-ci/travis-ci/issues/8836
-sudo: required
-
-language: node_js
-node_js:
-    # make sure we work with a range of node versions.
-    #
-    # 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
-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

CHANGELOG.md

@@ -1,3 +1,344 @@
+Changes in [1.2.2](https://github.com/vector-im/riot-web/releases/tag/v1.2.2) (2019-06-19)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2-rc.2...v1.2.2)
+
+ No changes since rc.2
+
+Changes in [1.2.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.2.2-rc.2) (2019-06-18)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2-rc.1...v1.2.2-rc.2)
+
+ * Update to react-sdk and js-sdk rc.2 for registration fixes,
+   redaction local echo fix and removing unnecessary calls
+   to the integration manager.
+
+Changes in [1.2.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.2-rc.1) (2019-06-12)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.1...v1.2.2-rc.1)
+
+ * Update from Weblate
+   [\#10012](https://github.com/vector-im/riot-web/pull/10012)
+ * Add funding details for GitHub sponsor button
+   [\#9982](https://github.com/vector-im/riot-web/pull/9982)
+ * Do not fail on server liveliness checks during startup
+   [\#9960](https://github.com/vector-im/riot-web/pull/9960)
+ * Hide guest functions on the welcome page if not logged in
+   [\#9957](https://github.com/vector-im/riot-web/pull/9957)
+ * Add Albanian and West Flemish languages
+   [\#9953](https://github.com/vector-im/riot-web/pull/9953)
+ * Update from Weblate
+   [\#9951](https://github.com/vector-im/riot-web/pull/9951)
+ * Add docs for defaultCountryCode
+   [\#9927](https://github.com/vector-im/riot-web/pull/9927)
+ * Use the user's pre-existing HS when config validation fails
+   [\#9892](https://github.com/vector-im/riot-web/pull/9892)
+ * Low bandwidth mode
+   [\#9909](https://github.com/vector-im/riot-web/pull/9909)
+ * Fix Twemoji loading on Windows dev machines
+   [\#9869](https://github.com/vector-im/riot-web/pull/9869)
+ * Base Docker image on nginx:alpine, not the larger nginx:latest
+   [\#9848](https://github.com/vector-im/riot-web/pull/9848)
+ * Validate homeserver configuration prior to loading the app
+   [\#9779](https://github.com/vector-im/riot-web/pull/9779)
+ * Show resolved homeserver configuration on the mobile guide
+   [\#9726](https://github.com/vector-im/riot-web/pull/9726)
+ * Flag the validated config as the default config
+   [\#9721](https://github.com/vector-im/riot-web/pull/9721)
+ * Clarify comment on is_url and hs_url handling
+   [\#9719](https://github.com/vector-im/riot-web/pull/9719)
+ * Validate default homeserver config before loading the app
+   [\#9496](https://github.com/vector-im/riot-web/pull/9496)
+
+Changes in [1.2.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.1) (2019-05-31)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.0...v1.2.1)
+
+ * Upgrade JS SDK to 2.0.0 and React SDK to 1.2.1 to fix key backup and native emoji height
+
+Changes in [1.2.0](https://github.com/vector-im/riot-web/releases/tag/v1.2.0) (2019-05-29)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.0-rc.1...v1.2.0)
+
+ * Upgrade to JS SDK v1.2.0 and React SDK v1.2.0 to fix some regressions
+
+Changes in [1.2.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.0-rc.1) (2019-05-23)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.2...v1.2.0-rc.1)
+
+ * Update from Weblate
+   [\#9802](https://github.com/vector-im/riot-web/pull/9802)
+ * remove emojione
+   [\#9766](https://github.com/vector-im/riot-web/pull/9766)
+ * Make Dockerfile work for develop and other branches
+   [\#9736](https://github.com/vector-im/riot-web/pull/9736)
+ * add description of new labs feature for message editing
+   [\#9728](https://github.com/vector-im/riot-web/pull/9728)
+ * Remove karma junit output
+   [\#9628](https://github.com/vector-im/riot-web/pull/9628)
+ * yarn upgrade
+   [\#9626](https://github.com/vector-im/riot-web/pull/9626)
+ * Respond quickly to buildkite pokes
+   [\#9617](https://github.com/vector-im/riot-web/pull/9617)
+ * Delay creating the `Favico` instance
+   [\#9616](https://github.com/vector-im/riot-web/pull/9616)
+ * Add reactions feature to config sample
+   [\#9598](https://github.com/vector-im/riot-web/pull/9598)
+
+Changes in [1.1.2](https://github.com/vector-im/riot-web/releases/tag/v1.1.2) (2019-05-15)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.1...v1.1.2)
+
+ * react-sdk v1.1.2 to fix single sign-on and GIF autoplaying
+
+Changes in [1.1.1](https://github.com/vector-im/riot-web/releases/tag/v1.1.1) (2019-05-14)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0...v1.1.1)
+
+ * react-sdk v1.1.1 to fix regressions with registration
+
+Changes in [1.1.0](https://github.com/vector-im/riot-web/releases/tag/v1.1.0) (2019-05-07)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0-rc.1...v1.1.0)
+
+ * Add Dockerfile
+   [\#9632](https://github.com/vector-im/riot-web/pull/9632)
+ * Add Dockerfile (part 2)
+   [\#9426](https://github.com/vector-im/riot-web/pull/9426)
+ * Add new scalar staging url
+   [\#9601](https://github.com/vector-im/riot-web/pull/9601)
+
+Changes in [1.1.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.1.0-rc.1) (2019-04-30)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.8...v1.1.0-rc.1)
+
+ * Convert redeploy.py to buildkite
+   [\#9577](https://github.com/vector-im/riot-web/pull/9577)
+ * Add package step to buildkite pipeline
+   [\#9568](https://github.com/vector-im/riot-web/pull/9568)
+ * Don't fail if there's no local config to remove
+   [\#9571](https://github.com/vector-im/riot-web/pull/9571)
+ * Change jenkins script to package script
+   [\#9567](https://github.com/vector-im/riot-web/pull/9567)
+ * Remove config.json from package dir
+   [\#9555](https://github.com/vector-im/riot-web/pull/9555)
+ * use the release version of olm 3.1.0
+   [\#9550](https://github.com/vector-im/riot-web/pull/9550)
+ * Fix default for --include arg
+   [\#9517](https://github.com/vector-im/riot-web/pull/9517)
+ * update installation instructions with new repo
+   [\#9500](https://github.com/vector-im/riot-web/pull/9500)
+ * Use packages.matrix.org for Olm
+   [\#9498](https://github.com/vector-im/riot-web/pull/9498)
+ * Add separate platform electron build commands
+   [\#9412](https://github.com/vector-im/riot-web/pull/9412)
+ * Add support for custom profile directory
+   [\#9408](https://github.com/vector-im/riot-web/pull/9408)
+ * Improved mobile install guide
+   [\#9410](https://github.com/vector-im/riot-web/pull/9410)
+ * Remove vector-electron-desktop from README
+   [\#9404](https://github.com/vector-im/riot-web/pull/9404)
+ * Update from Weblate
+   [\#9398](https://github.com/vector-im/riot-web/pull/9398)
+ * bump olm version to 3.1.0-pre3
+   [\#9392](https://github.com/vector-im/riot-web/pull/9392)
+ * Add expiration to mobile guide cookie
+   [\#9383](https://github.com/vector-im/riot-web/pull/9383)
+ * Fix autolaunch setting appearing toggled off
+   [\#9368](https://github.com/vector-im/riot-web/pull/9368)
+ * Don't try to save files the user didn't want to save
+   [\#9352](https://github.com/vector-im/riot-web/pull/9352)
+ * Setup crypto store for restore session tests
+   [\#9325](https://github.com/vector-im/riot-web/pull/9325)
+ * Update from Weblate
+   [\#9333](https://github.com/vector-im/riot-web/pull/9333)
+ * Add "Save image as..." button to context menu on images
+   [\#9326](https://github.com/vector-im/riot-web/pull/9326)
+ * Configure auth footer links through Riot config
+   [\#9297](https://github.com/vector-im/riot-web/pull/9297)
+
+Changes in [1.0.8](https://github.com/vector-im/riot-web/releases/tag/v1.0.8) (2019-04-16)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.7...v1.0.8)
+
+ * No changes in this release. This is the same code as v1.0.7 from our new clean-room
+   packaging and signing infrastructure.
+
+Changes in [1.0.7](https://github.com/vector-im/riot-web/releases/tag/v1.0.7) (2019-04-08)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.6...v1.0.7)
+
+ * Hotfix: bump js-sdk to 1.0.4, see https://github.com/matrix-org/matrix-js-sdk/releases/tag/v1.0.4
+
+Changes in [1.0.6](https://github.com/vector-im/riot-web/releases/tag/v1.0.6) (2019-04-01)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.6-rc.1...v1.0.6)
+
+ * Add "Save image as..." button to context menu on images
+   [\#9327](https://github.com/vector-im/riot-web/pull/9327)
+
+Changes in [1.0.6-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.6-rc.1) (2019-03-27)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.5...v1.0.6-rc.1)
+
+ * Use `on_logged_in` action in tests
+   [\#9279](https://github.com/vector-im/riot-web/pull/9279)
+ * Convert away from `Promise.defer`
+   [\#9278](https://github.com/vector-im/riot-web/pull/9278)
+ * update react-sdk version in yarn lockfile
+   [\#9233](https://github.com/vector-im/riot-web/pull/9233)
+ * "Render simple counters in room header" details
+   [\#9154](https://github.com/vector-im/riot-web/pull/9154)
+ * Use medium agents for the more resource intensive builds
+   [\#9238](https://github.com/vector-im/riot-web/pull/9238)
+ * Add log grouping to buildkite
+   [\#9223](https://github.com/vector-im/riot-web/pull/9223)
+ * Switch to `git` protocol for CI dependencies
+   [\#9222](https://github.com/vector-im/riot-web/pull/9222)
+ * Support CI for matching branches on forks
+   [\#9212](https://github.com/vector-im/riot-web/pull/9212)
+ * Update from Weblate
+   [\#9199](https://github.com/vector-im/riot-web/pull/9199)
+ * Declare the officially supported browsers in the README
+   [\#9177](https://github.com/vector-im/riot-web/pull/9177)
+ * Document some desktop app things
+   [\#9011](https://github.com/vector-im/riot-web/pull/9011)
+ * Use Buildkite for CI
+   [\#9165](https://github.com/vector-im/riot-web/pull/9165)
+ * Update version number in issue templates
+   [\#9170](https://github.com/vector-im/riot-web/pull/9170)
+ * Remove node 8.x from the build matrix
+   [\#9159](https://github.com/vector-im/riot-web/pull/9159)
+ * Update Electron help menu link
+   [\#9157](https://github.com/vector-im/riot-web/pull/9157)
+
+Changes in [1.0.5](https://github.com/vector-im/riot-web/releases/tag/v1.0.5) (2019-03-21)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.4...v1.0.5)
+
+ * Hotfix for [\#9205](https://github.com/vector-im/riot-web/issues/9205) disabling jump prevention for typing notifications, while we're reworking this functionally to enable it again soon.
+
+Changes in [1.0.4](https://github.com/vector-im/riot-web/releases/tag/v1.0.4) (2019-03-18)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.4-rc.1...v1.0.4)
+
+ * No changes since rc.1
+
+Changes in [1.0.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.4-rc.1) (2019-03-13)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.3...v1.0.4-rc.1)
+
+ * Update from Weblate
+   [\#9152](https://github.com/vector-im/riot-web/pull/9152)
+ * Use modern Yarn version on Travis CI
+   [\#9151](https://github.com/vector-im/riot-web/pull/9151)
+ * Switch to `yarn` for dependency management
+   [\#9132](https://github.com/vector-im/riot-web/pull/9132)
+ * Update from Weblate
+   [\#9104](https://github.com/vector-im/riot-web/pull/9104)
+ * Don't copy the 32 bit linux deb
+   [\#9075](https://github.com/vector-im/riot-web/pull/9075)
+ * Change olm dependency to normal dep
+   [\#9068](https://github.com/vector-im/riot-web/pull/9068)
+ * Add modular.im hosting link to electron app config
+   [\#9047](https://github.com/vector-im/riot-web/pull/9047)
+ * Nudge karma to 3.1.2
+   [\#8991](https://github.com/vector-im/riot-web/pull/8991)
+ * Add support for localConfig at $appData/config.json.
+   [\#8983](https://github.com/vector-im/riot-web/pull/8983)
+
+Changes in [1.0.3](https://github.com/vector-im/riot-web/releases/tag/v1.0.3) (2019-03-06)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2...v1.0.3)
+
+ * react-sdk 1.0.3 to fix ctrl+k shortcut and room list bugs
+
+Changes in [1.0.2](https://github.com/vector-im/riot-web/releases/tag/v1.0.2) (2019-03-06)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.3...v1.0.2)
+
+ * New react-sdk for minor hosting link fixes
+
+Changes in [1.0.2-rc.3](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.3) (2019-03-05)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.2...v1.0.2-rc.3)
+
+ * Add modular.im hosting link to electron app config
+   [\#9051](https://github.com/vector-im/riot-web/pull/9051)
+
+Changes in [1.0.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.2) (2019-03-01)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.1...v1.0.2-rc.2)
+
+ * Update to react-sdk rc.3
+
+Changes in [1.0.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.2-rc.1) (2019-03-01)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.1...v1.0.2-rc.1)
+
+ * Set a require alias for the webapp directory
+   [\#9014](https://github.com/vector-im/riot-web/pull/9014)
+ * Update from Weblate.
+   [\#8973](https://github.com/vector-im/riot-web/pull/8973)
+ * set chrome path for travis CI explicitly
+   [\#8987](https://github.com/vector-im/riot-web/pull/8987)
+ * Updated install spinner
+   [\#8984](https://github.com/vector-im/riot-web/pull/8984)
+ * Allow disabling update mechanism
+   [\#8911](https://github.com/vector-im/riot-web/pull/8911)
+ * Allow configuration of whether closing window closes or minimizes to tray
+   [\#8908](https://github.com/vector-im/riot-web/pull/8908)
+ * Fix language file path for Jenkins
+   [\#8854](https://github.com/vector-im/riot-web/pull/8854)
+ * Document and recommend `default_server_name`
+   [\#8832](https://github.com/vector-im/riot-web/pull/8832)
+ * Cache busting for icons & language files
+   [\#8710](https://github.com/vector-im/riot-web/pull/8710)
+ * Remove redesign issue template
+   [\#8722](https://github.com/vector-im/riot-web/pull/8722)
+ * Make scripts/make-icons.sh work on linux
+   [\#8550](https://github.com/vector-im/riot-web/pull/8550)
+
+Changes in [1.0.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.1) (2019-02-15)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.0...v1.0.1)
+
+
+Changes in [1.0.0](https://github.com/vector-im/riot-web/releases/tag/v1.0.0) (2019-02-14)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.0-rc.2...v1.0.0)
+
+ * Add snipping lines to welcome page without guests
+   [\#8634](https://github.com/vector-im/riot-web/pull/8634)
+ * Add home page to fix loading tests
+   [\#8625](https://github.com/vector-im/riot-web/pull/8625)
+
+Changes in [1.0.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.0.0-rc.2) (2019-02-14)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.0-rc.1...v1.0.0-rc.2)
+
+ * Update from Weblate.
+   [\#8615](https://github.com/vector-im/riot-web/pull/8615)
+ * Replace favicon assets to ones with transparent backgrounds
+   [\#8600](https://github.com/vector-im/riot-web/pull/8600)
+ * Refreshed icons
+   [\#8594](https://github.com/vector-im/riot-web/pull/8594)
+ * Fix order of fetch-develop-deps / npm install
+   [\#8566](https://github.com/vector-im/riot-web/pull/8566)
+ * Revive building dark theme
+   [\#8540](https://github.com/vector-im/riot-web/pull/8540)
+ * Update from Weblate.
+   [\#8546](https://github.com/vector-im/riot-web/pull/8546)
+ * Repair app loading tests after welcome page
+   [\#8525](https://github.com/vector-im/riot-web/pull/8525)
+ * Support configurable welcome background and logo
+   [\#8528](https://github.com/vector-im/riot-web/pull/8528)
+ * Update from Weblate.
+   [\#8518](https://github.com/vector-im/riot-web/pull/8518)
+ * Document `embeddedPages` configuration
+   [\#8514](https://github.com/vector-im/riot-web/pull/8514)
+ * README.md : Syntax Coloring
+   [\#8502](https://github.com/vector-im/riot-web/pull/8502)
+
 Changes in [1.0.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.0-rc.1) (2019-02-08)
 ====================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.9...v1.0.0-rc.1)

Dockerfile

@@ -0,0 +1,31 @@
+# Builder
+FROM node:10-alpine as builder
+
+# Support custom branches of the react-sdk and js-sdk. This also helps us build
+# images of riot-web develop.
+ARG USE_CUSTOM_SDKS=false
+ARG REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git"
+ARG REACT_SDK_BRANCH="master"
+ARG JS_SDK_REPO="https://github.com/matrix-org/matrix-js-sdk.git"
+ARG JS_SDK_BRANCH="master"
+
+RUN apk add --no-cache git dos2unix
+
+WORKDIR /src
+
+COPY . /src
+RUN dos2unix /src/scripts/docker-link-repos.sh && sh /src/scripts/docker-link-repos.sh
+RUN yarn --network-timeout=100000 install
+RUN yarn build
+
+# Copy the config now so that we don't create another layer in the app image
+RUN cp /src/config.sample.json /src/webapp/config.json
+
+
+# App
+FROM nginx:alpine
+
+COPY --from=builder /src/webapp /app
+
+RUN rm -rf /usr/share/nginx/html \
+ && ln -s /app /usr/share/nginx/html

README.md

@@ -1,41 +1,38 @@
 Riot
 ====
 
-Riot (formerly known as Vector) is a Matrix web client built using the Matrix
-React SDK (https://github.com/matrix-org/matrix-react-sdk).
+Riot (formerly known as Vector) is a Matrix web client built using the [Matrix React SDK](https://github.com/matrix-org/matrix-react-sdk).
+
+Riot is officially supported on the web in modern versions of Chrome, Firefox, and Safari. Other browsers may work, however
+official support is not provided. For accessing Riot on an Android or iOS device, check out [riot-android](https://github.com/vector-im/riot-android)
+and [riot-ios](https://github.com/vector-im/riot-ios) - riot-web does not support mobile devices.
 
 Getting Started
 ===============
 
-The easiest way to test Riot is to just use the hosted copy at
-https://riot.im/app.  The develop branch is continuously deployed by Jenkins at
-https://riot.im/develop for those who like living dangerously.
+The easiest way to test Riot is to just use the hosted copy at https://riot.im/app.
+The `develop` branch is continuously deployed by Jenkins at https://riot.im/develop
+for those who like living dangerously.
 
 To host your own copy of Riot, the quickest bet is to use a pre-built
 released version of Riot:
 
 1. Download the latest version from https://github.com/vector-im/riot-web/releases
 1. Untar the tarball on your web server
-1. Move (or symlink) the riot-x.x.x directory to an appropriate name
+1. Move (or symlink) the `riot-x.x.x` directory to an appropriate name
 1. If desired, copy `config.sample.json` to `config.json` and edit it
    as desired. See below for details.
 1. Enter the URL into your browser and log into Riot!
 
-Releases are signed by PGP, and can be checked against the public key
-at https://riot.im/packages/keys/riot.asc
+Releases are signed using gpg and the OpenPGP standard, and can be checked against the public key located
+at https://packages.riot.im/riot-release-key.asc.
 
 Note that Chrome does not allow microphone or webcam access for sites served
 over http (except localhost), so for working VoIP you will need to serve Riot
 over https.
 
-### Desktop Installation for Debian Stretch
-
-1. Add the repository to your sources.list using either of the following two options:
-  - Directly to sources.list: `echo "deb https://riot.im/packages/debian/ stretch main" | sudo tee -a /etc/apt/sources.list`
-  - As a separate entry in sources.list.d: `echo "deb https://riot.im/packages/debian/ stretch main" | sudo tee /etc/apt/sources.list.d/riot.list`
-2. Add the gpg signing key for the riot repository: `curl -s https://riot.im/packages/debian/repo-key.asc | sudo apt-key add -`
-3. Update your package lists: `sudo apt-get update`
-4. Install Riot: `sudo apt-get install riot-web`
+To install Riot as a desktop application, see [Running as a desktop
+app](#running-as-a-desktop-app) below.
 
 Important Security Note
 =======================
@@ -62,50 +59,47 @@ progress on replacing this with something better.
 Building From Source
 ====================
 
-Riot is a modular webapp built with modern ES6 and requires a npm build system
-to build.
+Riot is a modular webapp built with modern ES6 and uses a Node.js build system.
+Ensure you have the latest LTS version of Node.js installed.
 
-1. Install or update `node.js` so that your `node` is at least v8.12.0 (and `npm`
-   is at least v5.x).
+Using `yarn` instead of `npm` is recommended. Please see the Yarn [install
+guide](https://yarnpkg.com/docs/install/) if you do not have it already.
+
+1. Install or update `node.js` so that your `node` is at least v10.x.
+1. Install `yarn` if not present already.
 1. Clone the repo: `git clone https://github.com/vector-im/riot-web.git`.
 1. Switch to the riot-web directory: `cd riot-web`.
+1. Install the prerequisites: `yarn install`.
 1. If you're using the `develop` branch then it is recommended to set up a proper
    development environment ("Setting up a dev environment" below) however one can
    install the develop versions of the dependencies instead:
-   ```
+   ```bash
    scripts/fetch-develop.deps.sh
    ```
-   Whenever you git pull on riot-web you will also probably need to force an update
+   Whenever you git pull on `riot-web` you will also probably need to force an update
    to these dependencies - the simplest way is to re-run the script, but you can also
    manually update and rebuild them:
-   ```
+   ```bash
    cd matrix-js-sdk
    git pull
-   npm install # re-run to pull in any new dependencies
-   # Depending on your version of npm, npm run build may happen as part of
-   # the npm install above (https://docs.npmjs.com/misc/scripts#prepublish-and-prepare)
-   # If in doubt, run it anyway:
-   npm run build
+   yarn install # re-run to pull in any new dependencies
    cd ../matrix-react-sdk
    git pull
-   npm install
-   npm run build
+   yarn install
    ```
    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`.
 1. Configure the app by copying `config.sample.json` to `config.json` and
    modifying it (see below for details).
-1. `npm run dist` to build a tarball to deploy. Untaring this file will give
+1. `yarn dist` to build a tarball to deploy. Untaring this file will give
    a version-specific directory containing all the files that need to go on your
    web server.
 
-Note that `npm run dist` is not supported on Windows, so Windows users can run `npm
-run build`, which will build all the necessary files into the `webapp`
-directory. The version of Riot will not appear in Settings without
-using the dist script. You can then mount the `webapp` directory on your
-webserver to actually serve up the app, which is entirely static content.
+Note that `yarn dist` is not supported on Windows, so Windows users can run `yarn build`,
+which will build all the necessary files into the `webapp` directory. The version of Riot
+will not appear in Settings without using the dist script. You can then mount the
+`webapp` directory on your webserver to actually serve up the app, which is entirely static content.
 
 config.json
 ===========
@@ -113,22 +107,44 @@ config.json
 You can configure the app by copying `config.sample.json` to
 `config.json` and customising it:
 
-For a good example, see https://riot.im/develop/config.json
+For a good example, see https://riot.im/develop/config.json.
 
-1. `default_hs_url` is the default homeserver url.
-1. `default_is_url` is the default identity server url (this is the server used
-   for verifying third party identifiers like email addresses). If this is blank,
-   registering with an email address, adding an email address to your account,
-   or inviting users via email address will not work.  Matrix identity servers are
-   very simple web services which map third party identifiers (currently only email
-   addresses) to matrix IDs: see http://matrix.org/docs/spec/identity_service/unstable.html
-   for more details.  Currently the only public matrix identity servers are https://matrix.org
-   and https://vector.im.  In future identity servers will be decentralised.
+1. `default_server_config` sets the default homeserver and identity server URL for
+   Riot to use. The object is the same as returned by [https://<server_name>/.well-known/matrix/client](https://matrix.org/docs/spec/client_server/latest.html#get-well-known-matrix-client),
+   with added support for a `server_name` under the `m.homeserver` section to display
+   a custom homeserver name. Alternatively, the config can contain a `default_server_name`
+   instead which is where Riot will go to get that same object, although this option is
+   deprecated - see the `.well-known` link above for more information on using this option. 
+   Note that the `default_server_name` is used to get a complete server configuration 
+   whereas the `server_name` in the `default_server_config` is for display purposes only.
+   * *Note*: The URLs can also be individually specified as `default_hs_url` and 
+     `default_is_url`, however these are deprecated. They are maintained for backwards
+     compatibility with older configurations. `default_is_url` is respected only
+     if `default_hs_url` is used.
+   * The identity server is used for verifying third party identifiers like emails
+     and phone numbers. It is not used to store your password or account information.
+     If not provided, the identity server defaults to vector.im unless `disable_identity_server`
+     is set to true in the config. Currently the only two public identity servers
+     are https://matrix.org and https://vector.im, however in future identity servers
+     will be decentralised.
+   * Riot will fail to load if a mix of `default_server_config`, `default_server_name`, or
+     `default_hs_url` is specified. When multiple sources are specified, it is unclear
+     which should take priority and therefore the application cannot continue.
 1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or exposed to the user
    in the `labs` section of settings.  The available optional experimental features vary from
-   release to release.
+   release to release. Some of the available features are described in the Labs Feature section
+   of this README.
+1. `showLabsSettings`: Shows the "labs" tab of user settings even when no `features` are enabled
+   or present. Useful for getting at settings which may be otherwise hidden.
 1. `brand`: String to pass to your homeserver when configuring email notifications, to let the
    homeserver know what email template to use when talking to you.
+1. `branding`: Configures various branding and logo details, such as:
+    1. `welcomeBackgroundUrl`: An image to use as a wallpaper outside the app
+       during authentication flows
+    1. `authHeaderLogoUrl`: An logo image that is shown in the header during
+       authentication flows
+    1. `authFooterLinks`: a list of links to show in the authentication page footer:
+      `[{"text": "Link text", "url": "https://link.target"}, {"text": "Other link", ...}]`
 1. `integrations_ui_url`: URL to the web interface for the integrations server. The integrations
    server is not Riot and normally not your homeserver either. The integration server settings
    may be left blank to disable integrations.
@@ -158,6 +174,16 @@ For a good example, see https://riot.im/develop/config.json
     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. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour
+1. `embeddedPages`: Configures the pages displayed in portions of Riot that
+   embed static files, such as:
+    1. `welcomeUrl`: Initial content shown on the outside of the app when not
+       logged in. Defaults to `welcome.html` supplied with Riot.
+    1. `homeUrl`: Content shown on the inside of the app when a specific room is
+       not selected. By default, no home page is configured. If one is set, a
+       button to access it will be shown in the top left menu.
+1. `defaultCountryCode`: The ISO 3166 alpha2 country code to use when showing
+   country selectors, like the phone number input on the registration page.
+   Defaults to `GB` if the given code is unknown or not provided.
 
 
 Note that `index.html` also has an og:image meta tag that is set to an image
@@ -166,32 +192,31 @@ appear in some websites like Facebook, and indeed Riot itself. This has to be
 static in the HTML and an absolute URL (and HTTP rather than HTTPS), so it's
 not possible for this to be an option in config.json. If you'd like to change
 it, you can build Riot as above, but run
-`RIOT_OG_IMAGE_URL="http://example.com/logo.png" npm run build`.
+`RIOT_OG_IMAGE_URL="http://example.com/logo.png" yarn build`.
 Alternatively, you can edit the `og:image` meta tag in `index.html` directly
 each time you download a new version of Riot.
 
 Running as a Desktop app
 ========================
 
-Riot can also be run as a desktop app, wrapped in electron. You can download a
-pre-built version from https://riot.im/desktop.html or, if you prefer,
-build it yourself. Requires Electron >=1.6.0
+Riot can also be run as a desktop app, wrapped in Electron. You can download a
+pre-built version from https://riot.im/download/desktop/ or, if you prefer,
+build it yourself.
 
-To run as a desktop app:
+To build it yourself, follow the instructions below.
 
 1. Follow the instructions in 'Building From Source' above, but run
-   `npm run build` instead of `npm run dist` (since we don't need the tarball).
-2. Install electron and run it:
+   `yarn build` instead of `yarn dist` (since we don't need the tarball).
+2. Install Electron and run it:
 
-   ```
-   npm install electron
-   npm run electron
+   ```bash
+   yarn electron
    ```
 
-To build packages, use electron-builder. This is configured to output:
- * dmg + zip for macOS
- * exe + nupkg for Windows
- * deb for Linux
+To build packages, use `electron-builder`. This is configured to output:
+ * `dmg` + `zip` for macOS
+ * `exe` + `nupkg` for Windows
+ * `deb` for Linux
 But this can be customised by editing the `build` section of package.json
 as per https://github.com/electron-userland/electron-builder/wiki/Options
 
@@ -199,50 +224,103 @@ See https://github.com/electron-userland/electron-builder/wiki/Multi-Platform-Bu
 for dependencies required for building packages for various platforms.
 
 The only platform that can build packages for all three platforms is macOS:
-```
-brew install wine --without-x11
+```bash
 brew install mono
-brew install gnu-tar
-npm install
-npm run build:electron
+yarn install
+yarn build:electron
 ```
 
-For other packages, use electron-builder manually. For example, to build a package
-for 64 bit Linux:
+For other packages, use `electron-builder` manually. For example, to build a
+package for 64 bit Linux:
 
  1. Follow the instructions in 'Building From Source' above
  2. `node_modules/.bin/build -l --x64`
 
-All electron packages go into `electron_app/dist/`
+All Electron packages go into `electron_app/dist/`
 
-Many thanks to @aviraldg for the initial work on the electron integration.
+Many thanks to @aviraldg for the initial work on the Electron integration.
 
 Other options for running as a desktop app:
- * https://github.com/krisak/vector-electron-desktop
  * @asdf:matrix.org points out that you can use nativefier and it just works(tm)
 
-```
-sudo npm install nativefier -g
+```bash
+yarn global add nativefier
 nativefier https://riot.im/app/
 ```
 
+Desktop app configuration
+=========================
+
+To run multiple instances of the desktop app for different accounts, you can launch the executable with the `--profile` argument followed by a unique identifier, e.g `riot-web --profile Work` for it to run a separate profile and not interfere with the default one.
+
+Alternatively, a custom location for the profile data can be specified using the `--profile-dir` flag followed by the desired path.
+
+To change the config.json for the desktop app, create a config file which will be used to override values in the config which ships in the package:
++ `%APPDATA%\$NAME\config.json` on Windows
++ `$XDG_CONFIG_HOME\$NAME\config.json` or `~/.config/$NAME/config.json` on Linux
++ `~Library/Application Support/$NAME/config.json` on macOS
+
+In the paths above, `$NAME` is typically `Riot`, unless you use `--profile $PROFILE` in which case it becomes `Riot-$PROFILE`.
+
+Running from Docker
+===================
+
+The Docker image can be used to serve riot-web as a web server. The easiest way to use 
+it is to use the prebuilt image:
+```bash
+docker run -p 80:80 vectorim/riot-web
+``` 
+
+To supply your own custom `config.json`, map a volume to `/app/config.json`. For example, 
+if your custom config was located at `/etc/riot-web/config.json` then your Docker command
+would be:
+```bash
+docker run -p 80:80 -v /etc/riot-web/config.json:/app/config.json vectorim/riot-web
+```
+
+To build the image yourself:
+```bash
+git clone https://github.com/vector-im/riot-web.git riot-web
+cd riot-web
+git checkout master
+docker build -t vectorim/riot-web .
+```
+
+If you're building a custom branch, or want to use the develop branch, check out the appropriate
+riot-web branch and then run:
+```bash
+docker build -t vectorim/riot-web:develop \
+    --build-arg USE_CUSTOM_SDKS=true \
+    --build-arg REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git" \
+    --build-arg REACT_SDK_BRANCH="develop" \
+    --build-arg JS_SDK_REPO="https://github.com/matrix-org/matrix-js-sdk.git" \
+    --build-arg JS_SDK_BRANCH="develop" \
+    .
+```
+
+Labs Features
+=============
+
+Some features of Riot may be enabled by flags in the `Labs` section of the settings.
+Some of these features are described in [labs.md](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md).
+
 Development
 ===========
 
-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
+Before attempting to develop on Riot you **must** read the [developer guide
+for `matrix-react-sdk`](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
+You should also familiarise yourself with the ["Here be Dragons" guide
+](https://docs.google.com/document/d/12jYzvkidrp1h7liEuLIe6BMdU0NUjndUYI971O06ooM)
+to the tame & not-so-tame dragons (gotchas) which exist in the codebase.
 
 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
 apps using React.
 
-After creating a new component you must run `npm run reskindex` to regenerate
+After creating a new component you must run `yarn reskindex` to regenerate
 the `component-index.js` for the app (used in future for skinning).
 
 Please note that Riot is intended to run correctly without access to the public
@@ -260,52 +338,64 @@ having to manually rebuild each time.
 
 First clone and build `matrix-js-sdk`:
 
-1. `git clone https://github.com/matrix-org/matrix-js-sdk.git`
-1. `pushd matrix-js-sdk`
-1. `git checkout develop`
-1. `npm install`
-1. `npm install source-map-loader`  # because webpack is made of fail (https://github.com/webpack/webpack/issues/1472)
-1. `popd`
+``` bash
+git clone https://github.com/matrix-org/matrix-js-sdk.git
+pushd matrix-js-sdk
+git checkout develop
+yarn link
+yarn install
+popd
+```
 
 Then similarly with `matrix-react-sdk`:
 
-1. `git clone https://github.com/matrix-org/matrix-react-sdk.git`
-1. `pushd matrix-react-sdk`
-1. `git checkout develop`
-1. `npm link ../matrix-js-sdk`
-1. `popd`
+```bash
+git clone https://github.com/matrix-org/matrix-react-sdk.git
+pushd matrix-react-sdk
+git checkout develop
+yarn link
+yarn link matrix-js-sdk
+yarn install
+popd
+```
 
 Finally, build and start Riot itself:
 
-1. `git clone https://github.com/vector-im/riot-web.git`
-1. `cd riot-web`
-1. `git checkout develop`
-1. `npm install`
-1. `npm link ../matrix-js-sdk`
-1. `npm link ../matrix-react-sdk`
-1. `npm start`
-1. Wait a few seconds for the initial build to finish; you should see something like:
-    ```
-    Hash: b0af76309dd56d7275c8
-    Version: webpack 1.12.14
-    Time: 14533ms
-             Asset     Size  Chunks             Chunk Names
-         bundle.js   4.2 MB       0  [emitted]  main
-        bundle.css  91.5 kB       0  [emitted]  main
-     bundle.js.map  5.29 MB       0  [emitted]  main
-    bundle.css.map   116 kB       0  [emitted]  main
-        + 1013 hidden modules
-    ```
+```bash
+git clone https://github.com/vector-im/riot-web.git
+cd riot-web
+git checkout develop
+yarn link matrix-js-sdk
+yarn link matrix-react-sdk
+yarn install
+yarn start
+```
+
+Wait a few seconds for the initial build to finish; you should see something like:
+```
+Hash: b0af76309dd56d7275c8
+Version: webpack 1.12.14
+Time: 14533ms
+         Asset     Size  Chunks             Chunk Names
+     bundle.js   4.2 MB       0  [emitted]  main
+    bundle.css  91.5 kB       0  [emitted]  main
+ bundle.js.map  5.29 MB       0  [emitted]  main
+bundle.css.map   116 kB       0  [emitted]  main
+    + 1013 hidden modules
+```
    Remember, the command will not terminate since it runs the web server
    and rebuilds source files when they change. This development server also
    disables caching, so do NOT use it in production.
-1. Open http://127.0.0.1:8080/ in your browser to see your newly built Riot.
+
+Open http://127.0.0.1:8080/ in your browser to see your newly built Riot.
+
+___
 
 When you make changes to `matrix-react-sdk` or `matrix-js-sdk` they should be
 automatically picked up by webpack and built.
 
 If you add or remove any components from the Riot skin, you will need to rebuild
-the skin's index by running, `npm run reskindex`.
+the skin's index by running, `yarn reskindex`.
 
 If any of these steps error with, `file table overflow`, you are probably on a mac
 which has a very low limit on max open files. Run `ulimit -Sn 1024` and try again.
@@ -321,12 +411,12 @@ are designed to run in a browser instance under the control of
 * Make sure you have Chrome installed (a recent version, like 59)
 * Make sure you have `matrix-js-sdk` and `matrix-react-sdk` installed and
   built, as above
-* `npm run test`
+* `yarn test`
 
 The above will run the tests under Chrome in a `headless` mode.
 
 You can also tell karma to run the tests in a loop (every time the source
-changes), in an instance of Chrome on your desktop, with `npm run
+changes), in an instance of Chrome on your desktop, with `yarn
 test-multi`. This also gives you the option of running the tests in 'debug'
 mode, which is useful for stepping through the tests in the developer tools.
 

config.sample.json

@@ -1,6 +1,14 @@
 {
-    "default_hs_url": "https://matrix.org",
-    "default_is_url": "https://vector.im",
+    "default_server_config": {
+        "m.homeserver": {
+            "base_url": "https://matrix.org",
+            "server_name": "matrix.org"
+        },
+        "m.identity_server": {
+            "base_url": "https://vector.im"
+        }
+    },
+    "disable_identity_server": false,
     "disable_custom_urls": false,
     "disable_guests": false,
     "disable_login_language_selector": false,
@@ -10,9 +18,13 @@
     "integrations_rest_url": "https://scalar.vector.im/api",
     "integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html",
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
+    "defaultCountryCode": "GB",
+    "showLabsSettings": false,
     "features": {
         "feature_groups": "labs",
-        "feature_pinning": "labs"
+        "feature_pinning": "labs",
+        "feature_reactions": "labs",
+        "feature_message_editing": "labs"
     },
     "default_federate": true,
     "default_theme": "light",

docs/labs.md

@@ -0,0 +1,45 @@
+# Labs features
+
+Some notes on the features you can enable by going to `Settings->Labs`. Not exhaustive, chat in
+[#riot-web:matrix.org] for more information.
+
+**Be warned! Labs features are not finalised, they may be fragile, they may change, they may be
+dropped. Ask in the room if you are unclear about any details here.**
+
+## Render simple counters in room header
+
+Allows rendering of labelled counters above the message list.
+
+Once enabled, send a custom state event to a room to set values:
+
+1. In a room, type `/devtools` to bring up the devtools interface
+2. Click "Send Custom Event"
+3. Toggle from "Event" to "State Event"
+4. Set the event type to: `re.jki.counter` and give it a unique key
+5. Specify the content in the following format:
+
+```
+{
+    "link": "",
+    "severity": "normal",
+    "title": "my counter",
+    "value": 0
+}
+```
+
+That's it. Now should see your new counter under the header.
+
+## Reactions
+
+`feature_reactions` allows reacting to messages with emoji and displaying
+reactions from other people. This feature is currently under active development,
+and only portions have been implemented so far.
+
+## Message editing
+
+`feature_message_editing` allows editing messages after they have been sent,
+accessible from the reaction/context bar when hovering a message.
+This feature is currently under active development,
+and only portions have been implemented so far.
+
+[#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org

docs/translating-dev.md

@@ -4,7 +4,7 @@
 
 - A working [Development Setup](../../#setting-up-a-dev-environment)
   - Including up-to-date versions of matrix-react-sdk and matrix-js-sdk
-- Node 8 or later
+- Latest LTS version of Node.js installed
 - Be able to understand English
 - Be able to understand the language you want to translate riot-web into
 
@@ -32,14 +32,14 @@ function getColorName(hex) {
 
  1. Check if the import ``import { _t } from 'matrix-react-sdk/lib/languageHandler';`` is present. If not add it to the other import statements. Also import `_td` if needed.
  1. Add ``_t()`` to your string. (Don't forget curly braces when you assign an expression to JSX attributes in the render method). If the string is introduced at a point before the translation system has not yet been initialized, use `_td()` instead, and call `_t()` at the appropriate time.
- 1. Run `npm run i18n` to update ``src/i18n/strings/en_EN.json``
+ 1. Run `yarn i18n` to update ``src/i18n/strings/en_EN.json``
  1. If you added a string with a plural, you can add other English plural variants to ``src/i18n/strings/en_EN.json`` (remeber to edit the one in the same project as the source file containing your new translation).
 
 ## Editing existing strings
 
 1. Edit every occurrence of the string inside `_t()` and `_td()` in the JSX files.
-1. Run `npm run i18n` to update `src/i18n/strings/en_EN.json`. (Be sure to run this in the same project as the JSX files you just edited.)
-1. Run `npm run prunei18n` to remove the old string from `src/i18n/strings/*.json`.
+1. Run `yarn i18n` to update `src/i18n/strings/en_EN.json`. (Be sure to run this in the same project as the JSX files you just edited.)
+1. Run `yarn prunei18n` to remove the old string from `src/i18n/strings/*.json`.
 
 ## Adding variables inside a string.
 

electron_app/package.json

@@ -2,11 +2,12 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.0.0-rc.1",
+  "version": "1.2.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "dependencies": {
     "auto-launch": "^5.0.1",
+    "electron-store": "^2.0.0",
     "electron-window-state": "^4.1.0",
     "minimist": "^1.2.0",
     "png-to-ico": "^1.0.2"

electron_app/riot.im/config.json

@@ -6,9 +6,11 @@
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
     "integrations_widgets_urls": [
+        "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api",
         "https://scalar.vector.im/api"
     ],
+    "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
     "welcomeUserId": "@riot-bot:matrix.org",
     "roomDirectory": {

electron_app/src/electron-main.js

@@ -35,13 +35,16 @@ const updater = require('./updater');
 const { migrateFromOldOrigin } = require('./originMigrator');
 
 const windowStateKeeper = require('electron-window-state');
+const Store = require('electron-store');
 
 // boolean flag set whilst we are doing one-time origin migration
 // We only serve the origin migration script while we're actually
 // migrating to mitigate any risk of it being used maliciously.
 let migratingOrigin = false;
 
-if (argv['profile']) {
+if (argv['profile-dir']) {
+    app.setPath('userData', argv['profile-dir']);
+} else if (argv['profile']) {
     app.setPath('userData', `${app.getPath('userData')}-${argv['profile']}`);
 }
 
@@ -55,8 +58,19 @@ try {
     // Continue with the defaults (ie. an empty config)
 }
 
+try {
+    // Load local config and use it to override values from the one baked with the build
+    const localConfig = require(path.join(app.getPath('userData'), 'config.json'));
+    vectorConfig = Object.assign(vectorConfig, localConfig);
+} catch (e) {
+    // Could not load local config, this is expected in most cases.
+}
+
+const store = new Store({ name: "electron-config" });
+
 let mainWindow = null;
 global.appQuitting = false;
+global.minimizeToTray = store.get('minimizeToTray', true);
 
 
 // handle uncaught errors otherwise it displays
@@ -127,7 +141,7 @@ ipcMain.on('ipcCall', async function(ev, payload) {
             ret = autoUpdater.getFeedURL();
             break;
         case 'getAutoLaunchEnabled':
-            ret = launcher.isEnabled;
+            ret = await launcher.isEnabled();
             break;
         case 'setAutoLaunchEnabled':
             if (args[0]) {
@@ -136,6 +150,12 @@ ipcMain.on('ipcCall', async function(ev, payload) {
                 launcher.disable();
             }
             break;
+        case 'getMinimizeToTrayEnabled':
+            ret = global.minimizeToTray;
+            break;
+        case 'setMinimizeToTrayEnabled':
+            store.set('minimizeToTray', global.minimizeToTray = args[0]);
+            break;
         case 'getAppVersion':
             ret = app.getVersion();
             break;
@@ -147,6 +167,7 @@ ipcMain.on('ipcCall', async function(ev, payload) {
             } else {
                 mainWindow.focus();
             }
+            break;
         case 'origin_migrate':
             migratingOrigin = true;
             await migrateFromOldOrigin();
@@ -262,10 +283,12 @@ app.on('ready', () => {
             path: absTarget,
         });
     }, (error) => {
-        if (error) console.error('Failed to register protocol')
+        if (error) console.error('Failed to register protocol');
     });
 
-    if (vectorConfig['update_base_url']) {
+    if (argv['no-update']) {
+        console.log('Auto update disabled via command line flag "--no-update"');
+    } else if (vectorConfig['update_base_url']) {
         console.log(`Starting auto update with base URL: ${vectorConfig['update_base_url']}`);
         updater.start(vectorConfig['update_base_url']);
     } else {
@@ -331,7 +354,7 @@ app.on('ready', () => {
         mainWindow = global.mainWindow = null;
     });
     mainWindow.on('close', (e) => {
-        if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) {
+        if (global.minimizeToTray && !global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) {
             // On Mac, closing the window just hides it
             // (this is generally how single-window Mac apps
             // behave, eg. Mail.app)

electron_app/src/vectormenu.js

@@ -57,8 +57,8 @@ const template = [
         role: 'help',
         submenu: [
             {
-                label: 'riot.im',
-                click() { shell.openExternal('https://riot.im/'); },
+                label: 'Riot Help',
+                click() { shell.openExternal('https://about.riot.im/help'); },
             },
         ],
     },

electron_app/src/webcontents-handler.js

@@ -1,5 +1,7 @@
-const {clipboard, nativeImage, Menu, MenuItem, shell} = require('electron');
+const {clipboard, nativeImage, Menu, MenuItem, shell, dialog} = require('electron');
 const url = require('url');
+const fs = require('fs');
+const request = require('request');
 
 const MAILTO_PREFIX = "mailto:";
 
@@ -47,6 +49,7 @@ function onLinkContextMenu(ev, params) {
         }));
     }
 
+    let addSaveAs = false;
     if (params.mediaType && params.mediaType === 'image' && !url.startsWith('file://')) {
         popupMenu.append(new MenuItem({
             label: 'Copy image',
@@ -58,6 +61,10 @@ function onLinkContextMenu(ev, params) {
                 }
             },
         }));
+
+        // We want the link to be ordered below the copy stuff, but don't want to duplicate
+        // the `if` statement, so use a flag.
+        addSaveAs = true;
     }
 
     // No point offering to copy a blob: URL either
@@ -79,6 +86,36 @@ function onLinkContextMenu(ev, params) {
             }));
         }
     }
+
+    if (addSaveAs) {
+        popupMenu.append(new MenuItem({
+            label: 'Save image as...',
+            click() {
+                const targetFileName = params.titleText || "image.png";
+                const filePath = dialog.showSaveDialog({
+                    defaultPath: targetFileName,
+                });
+
+                if (!filePath) return; // user cancelled dialog
+
+                try {
+                    if (url.startsWith("data:")) {
+                        fs.writeFileSync(filePath, nativeImage.createFromDataURL(url));
+                    } else {
+                        request.get(url).pipe(fs.createWriteStream(filePath));
+                    }
+                } catch (err) {
+                    console.error(err);
+                    dialog.showMessageBox({
+                        type: "error",
+                        title: "Failed to save image",
+                        message: "The image failed to save",
+                    });
+                }
+            },
+        }));
+    }
+
     // popup() requires an options object even for no options
     popupMenu.popup({});
     ev.preventDefault();

electron_app/yarn.lock

@@ -0,0 +1,837 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/node@^9.4.0":
+  version "9.6.45"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.45.tgz#a9e5cfd026a3abaaf17e3c0318a470da9f2f178e"
+  integrity sha512-9scD7xI1kpIoMs3gVFMOWsWDyRIQ1AOZwe56i1CQPE6N/P4POYkn9UtW5F66t8C2AIoPtVfOFycQ2r11t3pcyg==
+
+ajv@^6.5.5:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+applescript@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/applescript/-/applescript-1.0.0.tgz#bb87af568cad034a4e48c4bdaf6067a3a2701317"
+  integrity sha1-u4evVoytA0pOSMS9r2Bno6JwExc=
+
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+auto-launch@^5.0.1:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/auto-launch/-/auto-launch-5.0.5.tgz#d14bd002b1ef642f85e991a6195ff5300c8ad3c0"
+  integrity sha512-ppdF4mihhYzMYLuCcx9H/c5TUOCev8uM7en53zWVQhyYAJrurd2bFZx3qQVeJKF2jrc7rsPRNN5cD+i23l6PdA==
+  dependencies:
+    applescript "^1.0.0"
+    mkdirp "^0.5.1"
+    path-is-absolute "^1.0.0"
+    untildify "^3.0.2"
+    winreg "1.2.4"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  dependencies:
+    tweetnacl "^0.14.3"
+
+bignumber.js@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.4.0.tgz#838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"
+  integrity sha1-g4qZLan51zfg9LLbC+YrsJ3Qxeg=
+
+bmp-js@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.0.3.tgz#64113e9c7cf1202b376ed607bf30626ebe57b18a"
+  integrity sha1-ZBE+nHzxICs3btYHvzBibr5XsYo=
+
+buffer-equal@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
+  integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+conf@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/conf/-/conf-2.2.0.tgz#ee282efafc1450b61e205372041ad7d866802d9a"
+  integrity sha512-93Kz74FOMo6aWRVpAZsonOdl2I57jKtHrNmxhumehFQw4X8Sk37SohNY11PG7Q8Okta+UnrVaI006WLeyp8/XA==
+  dependencies:
+    dot-prop "^4.1.0"
+    env-paths "^1.0.0"
+    make-dir "^1.0.0"
+    pkg-up "^2.0.0"
+    write-file-atomic "^2.3.0"
+
+core-util-is@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
+deep-equal@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
+
+define-properties@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
+dom-walk@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
+  integrity sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=
+
+dot-prop@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
+  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
+  dependencies:
+    is-obj "^1.0.0"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+electron-store@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-2.0.0.tgz#1035cca2a95409d1f54c7466606345852450d64a"
+  integrity sha512-1WCFYHsYvZBqDsoaS0Relnz0rd81ZkBAI0Fgx7Nq2UWU77rSNs1qxm4S6uH7TCZ0bV3LQpJFk7id/is/ZgoOPA==
+  dependencies:
+    conf "^2.0.0"
+
+electron-window-state@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-4.1.1.tgz#6b34fdc31b38514dfec8b7c8f7b5d4addb67632d"
+  integrity sha1-azT9wxs4UU3+yLfI97XUrdtnYy0=
+  dependencies:
+    deep-equal "^1.0.1"
+    jsonfile "^2.2.3"
+    mkdirp "^0.5.1"
+
+env-paths@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0"
+  integrity sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=
+
+es-abstract@^1.5.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
+  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
+  dependencies:
+    es-to-primitive "^1.2.0"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    is-callable "^1.1.4"
+    is-regex "^1.0.4"
+    object-keys "^1.0.12"
+
+es-to-primitive@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
+  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+es6-promise@^3.0.2:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
+  integrity sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=
+
+exif-parser@^0.1.9:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz#58a9d2d72c02c1f6f02a0ef4a9166272b7760922"
+  integrity sha1-WKnS1ywCwfbwKg70qRZicrd2CSI=
+
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+
+file-type@^3.1.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
+  integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek=
+
+find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
+  dependencies:
+    locate-path "^2.0.0"
+
+for-each@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+  dependencies:
+    is-callable "^1.1.3"
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
+function-bind@^1.0.2, function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
+global@~4.3.0:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
+  integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=
+  dependencies:
+    min-document "^2.19.0"
+    process "~0.5.1"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.6:
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.0:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+  dependencies:
+    ajv "^6.5.5"
+    har-schema "^2.0.0"
+
+has-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
+
+has@^1.0.1, has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+ip-regex@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd"
+  integrity sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=
+
+is-callable@^1.1.3, is-callable@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
+
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
+
+is-function@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
+  integrity sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=
+
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+
+is-regex@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
+  dependencies:
+    has "^1.0.1"
+
+is-symbol@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
+  dependencies:
+    has-symbols "^1.0.0"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+jimp@^0.2.28:
+  version "0.2.28"
+  resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.2.28.tgz#dd529a937190f42957a7937d1acc3a7762996ea2"
+  integrity sha1-3VKak3GQ9ClXp5N9Gsw6d2KZbqI=
+  dependencies:
+    bignumber.js "^2.1.0"
+    bmp-js "0.0.3"
+    es6-promise "^3.0.2"
+    exif-parser "^0.1.9"
+    file-type "^3.1.0"
+    jpeg-js "^0.2.0"
+    load-bmfont "^1.2.3"
+    mime "^1.3.4"
+    mkdirp "0.5.1"
+    pixelmatch "^4.0.0"
+    pngjs "^3.0.0"
+    read-chunk "^1.0.1"
+    request "^2.65.0"
+    stream-to-buffer "^0.1.0"
+    tinycolor2 "^1.1.2"
+    url-regex "^3.0.0"
+
+jpeg-js@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.2.0.tgz#53e448ec9d263e683266467e9442d2c5a2ef5482"
+  integrity sha1-U+RI7J0mPmgyZkZ+lELSxaLvVII=
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+jsonfile@^2.2.3:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+load-bmfont@^1.2.3:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.0.tgz#75f17070b14a8c785fe7f5bee2e6fd4f98093b6b"
+  integrity sha512-kT63aTAlNhZARowaNYcY29Fn/QYkc52M3l6V1ifRcPewg2lvUZDAj7R6dXjOL9D0sict76op3T5+odumDSF81g==
+  dependencies:
+    buffer-equal "0.0.1"
+    mime "^1.3.4"
+    parse-bmfont-ascii "^1.0.3"
+    parse-bmfont-binary "^1.0.5"
+    parse-bmfont-xml "^1.1.4"
+    phin "^2.9.1"
+    xhr "^2.0.1"
+    xtend "^4.0.0"
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+make-dir@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
+  dependencies:
+    pify "^3.0.0"
+
+mime-db@~1.38.0:
+  version "1.38.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
+  integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
+
+mime-types@^2.1.12, mime-types@~2.1.19:
+  version "2.1.22"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
+  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
+  dependencies:
+    mime-db "~1.38.0"
+
+mime@^1.3.4:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
+min-document@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+  integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
+  dependencies:
+    dom-walk "^0.1.0"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+
+minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+
+mkdirp@0.5.1, mkdirp@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+  dependencies:
+    minimist "0.0.8"
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+object-keys@^1.0.12:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
+  integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
+
+p-limit@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
+  dependencies:
+    p-try "^1.0.0"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+  dependencies:
+    p-limit "^1.1.0"
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+
+parse-bmfont-ascii@^1.0.3:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz#11ac3c3ff58f7c2020ab22769079108d4dfa0285"
+  integrity sha1-Eaw8P/WPfCAgqyJ2kHkQjU36AoU=
+
+parse-bmfont-binary@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz#d038b476d3e9dd9db1e11a0b0e53a22792b69006"
+  integrity sha1-0Di0dtPp3Z2x4RoLDlOiJ5K2kAY=
+
+parse-bmfont-xml@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz#015319797e3e12f9e739c4d513872cd2fa35f389"
+  integrity sha512-bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ==
+  dependencies:
+    xml-parse-from-string "^1.0.0"
+    xml2js "^0.4.5"
+
+parse-headers@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.2.tgz#9545e8a4c1ae5eaea7d24992bca890281ed26e34"
+  integrity sha512-/LypJhzFmyBIDYP9aDVgeyEb5sQfbfY5mnDq4hVhlQ69js87wXfmEI5V3xI6vvXasqebp0oCytYFLxsBVfCzSg==
+  dependencies:
+    for-each "^0.3.3"
+    string.prototype.trim "^1.1.2"
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+phin@^2.9.1:
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz#f9b6ac10a035636fb65dfc576aaaa17b8743125c"
+  integrity sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pixelmatch@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz#8f47dcec5011b477b67db03c243bc1f3085e8854"
+  integrity sha1-j0fc7FARtHe2fbA8JDvB8wheiFQ=
+  dependencies:
+    pngjs "^3.0.0"
+
+pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
+  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
+  dependencies:
+    find-up "^2.1.0"
+
+png-to-ico@^1.0.2:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/png-to-ico/-/png-to-ico-1.0.7.tgz#9346b5f4d6fd7e94cb08fd49eeb585f501c3e5f2"
+  integrity sha512-heHiZjPFhVgLiuSG4C4wwKN9YPGLpPJvOfXRyI+cEJf0vPutjJ4XDaeI2f/hzTFs+2juihDw3pP8R5JtTuQTGg==
+  dependencies:
+    "@types/node" "^9.4.0"
+    jimp "^0.2.28"
+    minimist "^1.2.0"
+
+pngjs@^3.0.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
+  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
+
+process@~0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
+  integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=
+
+psl@^1.1.24:
+  version "1.1.31"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
+  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
+
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+read-chunk@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-1.0.1.tgz#5f68cab307e663f19993527d9b589cace4661194"
+  integrity sha1-X2jKswfmY/GZk1J9m1icrORmEZQ=
+
+request@^2.65.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.0"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.4.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sax@>=0.6.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+signal-exit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+
+sshpk@^1.7.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
+stream-to-buffer@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/stream-to-buffer/-/stream-to-buffer-0.1.0.tgz#26799d903ab2025c9bd550ac47171b00f8dd80a9"
+  integrity sha1-JnmdkDqyAlyb1VCsRxcbAPjdgKk=
+  dependencies:
+    stream-to "~0.2.0"
+
+stream-to@~0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/stream-to/-/stream-to-0.2.2.tgz#84306098d85fdb990b9fa300b1b3ccf55e8ef01d"
+  integrity sha1-hDBgmNhf25kLn6MAsbPM9V6O8B0=
+
+string.prototype.trim@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"
+  integrity sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.5.0"
+    function-bind "^1.0.2"
+
+tinycolor2@^1.1.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
+  integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=
+
+tough-cookie@~2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+  dependencies:
+    psl "^1.1.24"
+    punycode "^1.4.1"
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+untildify@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"
+  integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==
+
+uri-js@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  dependencies:
+    punycode "^2.1.0"
+
+url-regex@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/url-regex/-/url-regex-3.2.0.tgz#dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"
+  integrity sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ=
+  dependencies:
+    ip-regex "^1.0.1"
+
+uuid@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+winreg@1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz#ba065629b7a925130e15779108cf540990e98d1b"
+  integrity sha1-ugZWKbepJRMOFXeRCM9UCZDpjRs=
+
+write-file-atomic@^2.3.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9"
+  integrity sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
+
+xhr@^2.0.1:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.5.0.tgz#bed8d1676d5ca36108667692b74b316c496e49dd"
+  integrity sha512-4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ==
+  dependencies:
+    global "~4.3.0"
+    is-function "^1.0.1"
+    parse-headers "^2.0.0"
+    xtend "^4.0.0"
+
+xml-parse-from-string@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz#a9029e929d3dbcded169f3c6e28238d95a5d5a28"
+  integrity sha1-qQKekp09vN7RafPG4oI42VpdWig=
+
+xml2js@^0.4.5:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
+  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~9.0.1"
+
+xmlbuilder@~9.0.1:
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
+
+xtend@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=

karma.conf.js

@@ -9,7 +9,7 @@ var webpack_config = require('./webpack.config');
  * to build everything; however it's the easiest way to load our dependencies
  * from node_modules.
  *
- * If you run karma in multi-run mode (with `npm run test-multi`), it will watch
+ * If you run karma in multi-run mode (with `yarn test-multi`), it will watch
  * the tests for changes, and webpack will rebuild using a cache. This is much quicker
  * than a clean rebuild.
  */
@@ -78,7 +78,7 @@ module.exports = function (config) {
                 watched: false, included: false, served: true, nocache: false,
             },
             {
-                pattern: 'res/themes/**',
+                pattern: 'res/**',
                 watched: false, included: false, served: true, nocache: false,
             },
         ],
@@ -87,6 +87,8 @@ module.exports = function (config) {
             // redirect img links to the karma server. See above.
             "/img/": "/base/node_modules/matrix-react-sdk/res/img/",
             "/themes/": "/base/res/themes/",
+            "/welcome.html": "/base/res/welcome.html",
+            "/welcome/": "/base/res/welcome/",
         },
 
         // preprocess matching files before serving them to the browser
@@ -98,7 +100,7 @@ module.exports = function (config) {
 
         // test results reporter to use
         // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-        reporters: ['logcapture', 'spec', 'junit', 'summary'],
+        reporters: ['logcapture', 'spec', 'summary'],
 
         specReporter: {
             suppressErrorSummary: false, // do print error summary
@@ -136,10 +138,10 @@ module.exports = function (config) {
         ],
 
         customLaunchers: {
-            'ChromeHeadless': {
+            'VectorChromeHeadless': {
                 base: 'Chrome',
                 flags: [
-                    // '--no-sandbox',
+                    '--no-sandbox',
                     // See https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md
                     '--headless',
                     '--disable-gpu',
@@ -157,10 +159,6 @@ module.exports = function (config) {
         // how many browser should be started simultaneous
         concurrency: Infinity,
 
-        junitReporter: {
-            outputDir: 'karma-reports',
-        },
-
         webpack: webpack_config,
 
         webpackMiddleware: {

package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "1.0.0-rc.1",
+  "version": "1.2.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -32,31 +32,34 @@
     "prunei18n": "matrix-prune-i18n",
     "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:compile": "yarn reskindex && babel --source-maps -d lib src",
     "build:bundle": "cross-env NODE_ENV=production webpack -p --progress --bail --mode production",
     "build:bundle:dev": "webpack --progress --bail --mode development",
-    "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: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",
+    "build:electron": "yarn clean && yarn build && yarn install:electron && build -wml --ia32 --x64",
+    "build:electron:linux": "yarn build && build -l --x64",
+    "build:electron:macos": "yarn build && build -m --x64",
+    "build:electron:windows": "yarn build && build -w --ia32 --x64",
+    "build:react-sdk": "node scripts/yarn-sub.js matrix-react-sdk build",
+    "build:js-sdk": "node scripts/yarn-sub.js matrix-js-sdk start:init",
+    "build": "yarn build:js-sdk && yarn build:react-sdk && yarn reskindex && yarn build:res && yarn build:bundle",
+    "build:dev": "yarn build:js-sdk && yarn build:react-sdk && yarn reskindex && yarn build:res && yarn build:bundle:dev",
     "dist": "scripts/package.sh",
     "install:electron": "install-app-deps",
-    "electron": "npm run install:electron && electron .",
+    "electron": "yarn 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: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",
-    "start:react-sdk": "node scripts/npm-sub.js matrix-react-sdk run start:all",
-    "start:react-sdk:prod": "cross-env NODE_ENV=production node scripts/npm-sub.js matrix-react-sdk run start:all",
-    "start": "npm run build:js-sdk && npm run build:react-sdk && concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n js-sdk,react-sdk,reskindex,res,riot-js \"npm run start:js-sdk\" \"npm run start:react-sdk\" \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js\"",
-    "start:prod": "npm run build:js-sdk && npm run build:react-sdk && concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n js-sdk,react-sdk,reskindex,res,riot-js \"npm run start:js-sdk:prod\" \"npm run start:react-sdk:prod\" \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js:prod\"",
+    "start:js-sdk": "node scripts/yarn-sub.js matrix-js-sdk start:watch",
+    "start:js-sdk:prod": "cross-env NODE_ENV=production node scripts/yarn-sub.js matrix-js-sdk start:watch",
+    "start:react-sdk": "node scripts/yarn-sub.js matrix-react-sdk start:all",
+    "start:react-sdk:prod": "cross-env NODE_ENV=production node scripts/yarn-sub.js matrix-react-sdk start:all",
+    "start": "yarn build:js-sdk && yarn build:react-sdk && concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n js-sdk,react-sdk,reskindex,res,riot-js \"yarn start:js-sdk\" \"yarn start:react-sdk\" \"yarn reskindex:watch\" \"yarn start:res\" \"yarn start:js\"",
+    "start:prod": "yarn build:js-sdk && yarn build:react-sdk && concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n js-sdk,react-sdk,reskindex,res,riot-js \"yarn start:js-sdk:prod\" \"yarn start:react-sdk:prod\" \"yarn reskindex:watch\" \"yarn start:res\" \"yarn start:js:prod\"",
     "lint": "eslint src/",
     "lintall": "eslint src/ test/",
     "clean": "rimraf lib webapp electron_app/dist",
-    "prepublish": "npm run clean && npm run build:compile",
-    "test": "karma start --single-run=true --autoWatch=false --browsers ChromeHeadless",
+    "prepare": "yarn clean && yarn build:compile",
+    "test": "karma start --single-run=true --autoWatch=false --browsers VectorChromeHeadless",
     "test-multi": "karma start"
   },
   "dependencies": {
@@ -70,9 +73,10 @@
     "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "1.0.0-rc.1",
-    "matrix-react-sdk": "1.0.0-rc.1",
+    "matrix-js-sdk": "2.0.1",
+    "matrix-react-sdk": "1.2.2",
     "modernizr": "^3.6.0",
+    "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
     "prop-types": "^15.6.2",
     "react": "^15.6.0",
     "react-dom": "^15.6.0",
@@ -87,7 +91,9 @@
     "babel-eslint": "^8.1.1",
     "babel-loader": "^7.1.5",
     "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-async-to-bluebird": "^1.1.1",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
@@ -102,9 +108,8 @@
     "cross-env": "^4.0.0",
     "css-loader": "^2.1.0",
     "electron-builder": "^20.38.5",
-    "electron-builder-squirrel-windows": "^11.6.1",
+    "electron-builder-squirrel-windows": "^20.38.5",
     "electron-devtools-installer": "^2.2.4",
-    "emojione": "^2.2.7",
     "eslint": "^5.8.0",
     "eslint-config-google": "^0.7.1",
     "eslint-plugin-babel": "^4.1.2",
@@ -115,17 +120,17 @@
     "fs-extra": "^0.30.0",
     "html-webpack-plugin": "^3.2.0",
     "json-loader": "^0.5.3",
-    "karma": "^3.1.1",
-    "karma-chrome-launcher": "^0.2.3",
+    "karma": "^3.1.2",
+    "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
-    "karma-junit-reporter": "^2.0.0",
     "karma-logcapture-reporter": "0.0.1",
     "karma-mocha": "^1.3.0",
     "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",
+    "loader-utils": "^1.2.3",
+    "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.0",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
@@ -144,14 +149,11 @@
     "source-map-loader": "^0.2.4",
     "webpack": "^4.23.1",
     "webpack-cli": "^3.1.2",
-    "webpack-dev-server": "^3.1.10"
-  },
-  "optionalDependencies": {
-    "olm": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre1.tgz"
+    "webpack-dev-server": "^3.1.11"
   },
   "build": {
     "appId": "im.riot.app",
-    "electronVersion": "4.0.4",
+    "electronVersion": "4.2.4",
     "files": [
       "node_modules/**",
       "src/**",

release.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Script to perform a release of vector-web.
+# Script to perform a release of riot-web.
 #
 # Requires github-changelog-generator; to install, do
 #   pip install git+https://github.com/matrix-org/github-changelog-generator.git
@@ -21,7 +21,7 @@ cd `dirname $0`
 for i in matrix-js-sdk matrix-react-sdk
 do
     depver=`cat package.json | jq -r .dependencies[\"$i\"]`
-    latestver=`npm show $i version`
+    latestver=`yarn info -s $i version`
     if [ "$depver" != "$latestver" ]
     then
         echo "The latest version of $i is $latestver but package.json depends on $depver"
@@ -38,13 +38,12 @@ done
 # bump Electron's package.json first
 release="${1#v}"
 tag="v${release}"
-echo "electron npm version"
+echo "electron yarn version"
 
 cd electron_app
-npm version --no-git-tag-version "$release"
+yarn version --no-git-tag-version --new-version "$release"
 git commit package.json -m "$tag"
 
-
 cd ..
 
 exec ./node_modules/matrix-js-sdk/release.sh -u vector-im -z "$orig_args"

release_config.yaml

@@ -1 +1 @@
-signing_id: packages@riot.im
+signing_id: releases@riot.im

res/home-status.html

@@ -1,192 +0,0 @@
-<style type="text/css">
-
-/* we deliberately inline style here to avoid flash-of-CSS problems, and to avoid
- * voodoo where we have to set display: none by default
- */
-
-.mx_HomePage_container {
-    text-align: center;
-    display: block ! important;
-    width: 690px;
-    margin: 20px;
-}
-
-.mx_HomePage_header {
-    margin-top: 37px;
-    margin-left: 10px;
-    width: 670px;
-    box-sizing: border-box;
-    font-size: 18px;
-    background-color: #fff;
-    box-shadow: 0px 2px 10px 0px rgba(48,55,81,0.05);
-    border-radius: 5px;
-    padding: 20px 80px 20px 80px;
-    align-items: center;
-}
-
-.mx_HomePage_header h1 {
-    font-size: 29px;
-    margin-bottom: 10px;
-}
-
-.mx_HomePage_intro h2 {
-    margin-top: 32px;
-    font-size: 25px;
-    color: #49555F;
-}
-
-.mx_HomePage_intro {
-    margin: auto;
-    width: 600px;
-    margin-top: 40px;
-    margin-bottom: 40px;
-    font-size: 18px;
-}
-
-.mx_HomePage_coc {
-    font-size: 16px;
-}
-
-.mx_HomePage_coc a {
-    color: #4360DF;
-}
-
-.mx_HomePage_room, .mx_HomePage_telegram {
-    float: left;
-    background-color: #fff;
-    box-shadow: 0px 2px 10px 0px rgba(48,55,81,0.05);
-    border-radius: 5px;
-    margin: 10px;
-    width: 210px;
-    height: 250px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-}
-
-.mx_HomePage_telegram {
-    background-color: transparent;
-    border: 1px solid rgba(113, 129, 142, 0.2);
-    box-shadow: none;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-direction: column;
-    font-size: 16px;
-    line-height: 25px;
-    box-sizing: border-box;
-}
-
-.mx_HomePage_telegram a {
-    text-transform: uppercase;
-    color: #4360DF;
-    font-size: 13px;
-    font-family: PostGrotesk-Medium, Arial, Helvetica, Sans-Serif;
-    font-weight: 600;
-    opacity: 1.0;
-    transition: opacity .2s ease;
-}
-
-.mx_HomePage_telegram a:hover {
-    opacity: 0.5;
-}
-
-.mx_HomePage_room .mx_HomePage_icon {
-    margin-top: 24px;
-    margin-bottom: 16px;
-    width: 50px;
-    height: 50px;
-}
-
-.mx_HomePage_room .mx_HomePage_name {
-    display: block;
-    font-family: PostGrotesk-Medium, Arial, Helvetica, Sans-Serif;
-    font-weight: 600;
-    font-size: 15px;
-    color: #49555F;
-    line-height: 25px;
-    margin: 0px 12px 0px 12px;
-}
-
-.mx_HomePage_room .mx_HomePage_desc {
-    flex: 1;
-    display: block;
-    margin: 0px 12px 0px 12px;
-    font-size: 14px;
-    line-height: 20px;
-}
-
-.mx_HomePage_button {
-    align-self: normal;
-    margin: 12px;
-    border-radius: 8px;
-    border: 1px solid rgba(199, 206, 209, 0.12);
-    background-color: #6CC1F6;
-    font-size: 13px;
-    font-family: PostGrotesk-Medium, Arial, Helvetica, Sans-Serif;
-    font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: 1px;
-    color: #fff ! important;
-    cursor: pointer;
-    outline: none;
-    padding: 14px;
-    box-sizing: border-box;
-    padding-left: 1.5em;
-    padding-right: 1.5em;
-}
-
-</style>
-
-<div class="mx_HomePage_container">
-    <div class="mx_HomePage_header">
-        <div>
-            <h1>Welcome to Status Community Chat, powered by Riot.</h1>
-            <p>For contributors, developers and Ethereum-enthusiasts who care about the movement for decentralization.</p>
-        </div>
-    </div>
-
-    <div class="mx_HomePage_intro">
-        <h2>Our rooms</h2>
-        <p>Please abide by the channels discussion categories and remain on topic to the specific category details listed.</p>
-        <p class="mx_HomePage_coc">Before posting please refer to our <a href="https://wiki.status.im/Code_of_conduct">Code of Conduct</a></p>
-    </div>
-
-
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/a.png">
-        <span class="mx_HomePage_name">#announcements</span>
-        <span class="mx_HomePage_desc">Company wide announcements.</span>
-        <a class="mx_HomePage_button" href="#/room/#announcements:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/i.png">
-        <span class="mx_HomePage_name">#introductions</span>
-        <span class="mx_HomePage_desc">Newcomer introductions.</span>
-        <a class="mx_HomePage_button" href="#/room/#introductions:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/g.png">
-        <span class="mx_HomePage_name">#general</span>
-        <span class="mx_HomePage_desc">General discussions of Status.</span>
-        <a class="mx_HomePage_button" href="#/room/#general:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/d.png">
-        <span class="mx_HomePage_name">#dev-status</span>
-        <span class="mx_HomePage_desc">Contributing to our codebase? Building a DApp or a chatbot? We're here to help.</span>
-        <a class="mx_HomePage_button" href="#/room/#dev-status:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/n.png">
-        <span class="mx_HomePage_name">#news-articles</span>
-        <span class="mx_HomePage_desc">Share news, articles related to Ethereum or projects you're excited about</span>
-        <a class="mx_HomePage_button" href="#/room/#news-articles:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_telegram">
-        <p>
-            Interested in market and cryptocurrency type discussions?
-        </p>
-        <a href="https://t.me/StatusNetworkChat">Join Telegram</a>
-    </div>
-</div>

res/themes/status/css/_StatusLogin.scss

@@ -1,232 +0,0 @@
-/*
-Copyright 2017 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.
-*/
-
-// overrides for mx_Login* specific to Status.
-// Ideally this would be all Status prefixes for a Status specific version of the component
-// but given we're not doing Status as a dedicated 'skin' yet...
-
-.mx_StatusLogin {
-
-    width: 100%;
-    height: 100%;
-
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    overflow: auto;
-
-    .mx_StatusLogin_brand {
-        position: absolute;
-        top: 30px;
-        left: 30px;
-    }
-
-    .mx_StatusLogin_content {
-        margin: auto;
-    }
-
-    .mx_StatusLogin_header {
-        text-align: center;
-        margin-top: 70px;
-        margin-bottom: 50px;
-    }
-
-    .mx_StatusLogin_header h1 {
-        font-size: 29px;
-        margin-bottom: 3px;
-    }
-
-    .mx_StatusLogin_subtitle {
-        font-size: 18px;
-    }
-
-    .mx_StatusLogin_subtitle a {
-        color: $riot-link-color;
-    }
-
-    .mx_StatusLogin_footer {
-        margin-top: 30px;
-        margin-bottom: 30px;
-        text-align: center;
-        font-size: 16px;
-        color: $footer-color;
-    }
-
-    .mx_StatusLogin_footer p {
-        margin-top: 0.5em;
-        margin-bottom: 0.5em;
-    }
-
-    .mx_StatusLogin_footer_cta {
-        color: $callout-color;
-        font-family: $header-font-family;
-        letter-spacing: 1px;
-        font-size: 13px;
-        text-transform: uppercase;
-        opacity: 1.0;
-        transition: opacity .2s ease;        
-    }
-
-    .mx_StatusLogin_footer_cta:hover {
-        opacity: 0.5;
-        text-decoration: none;
-    }
-
-    // overrides of .mx_Login
-
-    .mx_AuthPage_modal {
-        width: 330px;
-        min-height: initial;
-        padding-top: 40px;
-        padding-bottom: 20px;
-        padding-left: 10px;
-        padding-right: 10px;
-        border-radius: 8px;
-        color: $form-fg-color;
-        font-size: 16px;
-        line-height: 25px;
-        background-color: $form-bg-color;
-        background-image: url("$(status)/img/dot.svg");
-        box-shadow: 0px 5px 16px 0px rgba(25,12,46,0.16);
-        position: relative;
-        text-align: center;
-    }
-
-    .mx_AuthHeader_logo {
-        background-color: #fff;
-        width: 74px;
-        height: 74px;
-        border-radius: 37px;
-        box-shadow: 0px 5px 16px 0px rgba(0,0,0,0.2);
-        position: absolute;
-        top: -36px;
-        left: 50%;
-        margin-left: -36px;
-    }
-
-    .mx_AuthHeader_logo img {
-        width: 36px;
-        height: 36px;
-        padding: 19px;
-    }
-
-    .mx_AuthPage_modal h2 {
-        text-align: center;
-        color: $form-fg-color;
-        font-size: 25px;
-        margin-bottom: 24px;
-    }
-
-    .mx_Login_field {
-        width: 260px;
-        height: 27px;
-        padding: 8px 20px 10px 20px;
-        border-radius: 10px;
-        text-align: left;
-        border: 1px solid transparent;
-        background-color: $form-field-bg-color;
-        color: $form-field-fg-color;
-        font-weight: 300;
-        font-size: 15px;
-        margin-bottom: 14px;
-        transition: background-color .2s ease;
-    }
-
-    .mx_Login_field:focus {
-        border: 1px solid transparent;
-        background-color: $form-field-bg-hover-color;
-    }
-
-    .mx_Login_field::-webkit-input-placeholder {
-        font-family: $font-family;
-        color: $form-field-fg-color;
-        opacity: 0.6;
-    }
-
-    .mx_Login_field::-moz-placeholder {
-        font-family: $font-family;
-        color: $form-field-fg-color;
-        opacity: 0.6;        
-    }
-
-    .mx_Login_field_disabled {
-        opacity: 0.3;
-    }
-
-    .mx_Login_prompt {
-        font-size: 16px;
-    }
-
-    .mx_Login_submit {
-        min-width: 200px;
-        width: auto;
-        margin-top: 13px;
-        margin-bottom: 10px;
-    }
-
-    .mx_Login_submit:disabled {
-        opacity: 0.3;
-    }
-
-    .mx_Login_create {
-        margin-top: 10px;
-        display: block;
-        text-align: center;
-        width: 100%;
-        font-size: 15px;
-        opacity: 1.0;
-    }
-
-    .mx_Login_create:link,
-    .mx_Login_create:hover,
-    .mx_Login_create:visited
-    {
-        color: $form-fg-color;
-    }
-
-    .mx_Login_forgot {
-        display: block;
-        font-size: 15px;
-    }
-
-    .mx_Login_forgot:link,
-    .mx_Login_forgot:hover,
-    .mx_Login_forgot:visited
-    {
-        color: $form-fg-color;
-    }
-
-    .mx_Login_error {
-        color: $warning-color;
-        font-size: 18px;
-        width: 300px;
-        height: 44px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin: auto;
-        text-align: center;
-        margin-top: 12px;
-        margin-bottom: 16px;
-    }
-
-    .mx_Login_smallError {
-        font-size: 13px;
-        line-height: initial;
-    }
-
-}

res/themes/status/css/_fonts.scss

@@ -1,15 +0,0 @@
-@font-face {
-  font-family:PostGrotesk-Medium;
-  src:url('https://status.im/fonts/PostGrotesk-Medium.eot');
-  src:url('https://status.im/fonts/PostGrotesk-Medium.eot?#iefix') format("embedded-opentype"),url('https://status.im/fonts/PostGrotesk-Medium.woff') format("woff"),url('https://status.im/fonts/PostGrotesk-Medium.svg#PostGrotesk-Medium') format("svg");
-  font-weight: 400;
-  font-style: normal;
-}
-
-@font-face {
-  font-family:PostGrotesk-Book;
-  src:url('https://status.im/fonts/PostGrotesk-Book.eot');
-  src:url('https://status.im/fonts/PostGrotesk-Book.eot?#iefix') format("embedded-opentype"),url('https://status.im/fonts/PostGrotesk-Book.woff') format("woff"),url('https://status.im/fonts/PostGrotesk-Book.svg#PostGrotesk-Book') format("svg");
-  font-weight: 400;
-  font-style: normal;
-}

res/themes/status/css/_paths.scss

@@ -1,5 +0,0 @@
-// Path from root SCSS file (such as `status.scss`) to `res` dir in `matrix-react-sdk`
-$res: ../../../../node_modules/matrix-react-sdk/res;
-
-// Path from root SCSS file (such as `status.scss`) to `status` dir in `riot-web`
-$status: ..;

res/themes/status/css/_status.scss

@@ -1,292 +0,0 @@
-// We deliberately prioritise Arial over Helvetica here due to diacritic problems (see _base.scss)
-// N.B. that the status.im website uses:
-// font-family:PostGrotesk-Book,-apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif;
-// ...but can't be bothered to work out how the apple fonts & segoe interact, so keepingn it simple for now.
-
-$font-family: PostGrotesk-Book, Arial, Helvetica, Sans-Serif;
-
-// typical text (dark-on-white in light skin)
-$primary-fg-color: #70808D;
-$primary-bg-color: #EEF2F5;
-
-// ***** Start of Status theme specifics ******
-$header-color: #49555F;
-$header-font-family: PostGrotesk-Medium, Arial, Helvetica, Sans-Serif;
-
-$footer-color: #8D99A4;
-
-$riot-link-color: #A26988;
-
-a {
-    text-decoration: none;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-h1,h2,h3,h4,h5 {
-    color: $header-color;
-    font-family: $header-font-family;
-    font-weight: 400 ! important;
-}
-
-$callout-color: #4360DF; // or #4957b8 from status.im homepage
-
-$form-bg-color: $callout-color;
-$form-fg-color: #ffffff;
-
-$form-field-bg-color: rgba(244, 242, 247, 0.12);
-$form-field-bg-hover-color: rgba(255, 255, 255, 0.2);
-$form-field-fg-color: #ffffff;
-
-// ***** End of Status theme specifics ******
-
-
-// used for dialog box text
-$light-fg-color: #747474;
-
-// used for focusing form controls
-$focus-bg-color: #dddddd;
-
-// button UI (white-on-green in light skin)
-$accent-fg-color: #ffffff;
-$accent-color: #6CC1F6;
-$accent-color-alt: $accent-color;
-$accent-color-50pct: #6CC1F67F;
-$accent-hover-color: #84cfff;
-
-$selection-fg-color: $primary-bg-color;
-
-$focus-brightness: 125%;
-
-// red warning colour
-$warning-color: #F69E98;
-$warning-bg-color: #DF2A8B;
-$info-bg-color: #2A9EDF;
-$mention-user-pill-bg-color: #ff0064;
-$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
-
-$group-alert-color: #774f7e;
-
-$preview-bar-bg-color: #f7f7f7;
-
-// left-panel style muted accent color
-$secondary-accent-color: #586C7B;
-$tertiary-accent-color: #DBEBF6;
-
-// stop the tinter trying to change the secondary accent color
-// by overriding the key to something untintable
-// XXX: this is a bit of a hack.
-#mx_theme_secondaryAccentColor {
-    color: #c0ffee ! important;
-}
-
-#mx_theme_tertiaryAccentColor {
-    color: #c0ffee ! important;
-}
-
-// used by RoomDirectory permissions
-$plinth-bg-color: $secondary-accent-color;
-
-// used by RoomDropTarget
-$droptarget-bg-color: rgba(255,255,255,0.5);
-
-// used by AddressSelector
-$selected-color: #eaf5f0;
-
-// selected for hoverover & selected event tiles
-$event-selected-color: #f7f7f7;
-
-// used for the hairline dividers in RoomView
-$primary-hairline-color: #e5e5e5;
-
-// used for the border of input text fields
-$input-border-color: #c9cfd4;
-$input-darker-bg-color: #c1c9d6;
-$input-darker-fg-color: #9fa9ba;
-
-$button-bg-color: #7ac9a1;
-$button-fg-color: white;
-// apart from login forms, which have stronger border
-$strong-input-border-color: #c7c7c7;
-
-// used for UserSettings EditableText
-$input-underline-color: rgba(151, 151, 151, 0.5);
-$input-fg-color: rgba(74, 74, 74, 0.9);
-
-// context menus
-$menu-border-color: rgba(187, 187, 187, 0.5);
-$menu-bg-color: #f6f6f6;
-$menu-selected-color: #f5f8fa;
-
-$avatar-initial-color: #ffffff;
-$avatar-bg-color: transparent;
-
-$h3-color: #3d3b39;
-
-$dialog-background-bg-color: #e9e9e9;
-$lightbox-background-bg-color: #000;
-
-$greyed-fg-color: #888;
-
-$neutral-badge-color: #dbdbdb;
-
-$preview-widget-bar-color: #ddd;
-$preview-widget-fg-color: $greyed-fg-color;
-
-$blockquote-bar-color: #ddd;
-$blockquote-fg-color: #777;
-
-$settings-grey-fg-color: #a2a2a2;
-
-$voip-decline-color: #f48080;
-$voip-accept-color: #80f480;
-
-$rte-bg-color: #e9e9e9;
-$rte-code-bg-color: rgba(0, 0, 0, 0.04);
-$rte-room-pill-color: #aaa;
-
-// ********************
-
-$roomtile-name-color: #ffffff;
-$roomtile-selected-bg-color: #465561;
-$roomtile-focused-bg-color: #6d8597;
-
-$username-variant1-color: #1e7ddc;
-$username-variant2-color: #a756a8;
-$username-variant3-color: #7ac9a1;
-$username-variant4-color: #f2809d;
-$username-variant5-color: #ffc666;
-$username-variant6-color: #76ddd7;
-$username-variant7-color: #45529b;
-$username-variant8-color: #bfd251;
-
-$roomsublist-background: rgba(0, 0, 0, 0.2);
-$roomsublist-label-fg-color: #ffffff;
-$roomsublist-label-bg-color: $secondary-accent-color;
-$roomsublist-chevron-color: #ffffff;
-
-$panel-divider-color: rgba(0, 0, 0, 0.2);
-
-// ********************
-
-$widget-menu-bar-bg-color: #f7f7f7;
-
-// ********************
-
-// event tile lifecycle
-$event-encrypting-color: #abddbc;
-$event-sending-color: #ddd;
-$event-notsent-color: #f44;
-
-// event redaction
-$event-redacted-fg-color: #e2e2e2;
-$event-redacted-border-color: #cccccc;
-
-// event timestamp
-$event-timestamp-color: #acacac;
-
-$edit-button-url: "$(res)/img/icon_context_message.svg";
-$copy-button-url: "$(res)/img/icon_copy_message.svg";
-
-// e2e
-$e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
-$e2e-unverified-color: #e8bf37;
-$e2e-warning-color: #ba6363;
-
-/*** ImageView ***/
-$lightbox-bg-color: #454545;
-$lightbox-fg-color: #ffffff;
-$lightbox-border-color: #ffffff;
-
-// unused?
-$progressbar-color: #000;
-
-@define-mixin mx_DialogButton {
-    /* align images in buttons (eg spinners) */
-    vertical-align: middle;
-    border-radius: 8px;
-    border: 1px solid rgba(199, 206, 209, 0.12);
-    background-color: $accent-color;
-    font-size: 13px;
-    font-family: $header-font-family;
-    text-transform: uppercase;
-    letter-spacing: 1px;
-    color: $accent-fg-color;
-    cursor: pointer;
-    outline: none;
-    padding: 14px;
-    box-sizing: border-box;
-    padding-left: 1.5em;
-    padding-right: 1.5em;
-    display: inline-block;
-    transition: background-color .2s ease;
-}
-
-@define-mixin mx_DialogButton_hover {
-    background-color: $accent-hover-color;
-}
-
-@define-mixin mx_DialogButton_small {
-    @mixin mx_DialogButton;
-    height: auto;
-    padding-top: 7px;
-    padding-bottom: 7px;
-    padding-left: 1em;
-    padding-right: 1em;
-}
-
-.mx_RoomSubList_label {
-    font-size: 13px;
-    font-family: $header-font-family;
-    letter-spacing: 1px;
-}
-
-// FIXME: all these ! importants are horrid - we should instead go and define
-// variables or something.
-.mx_SearchBox_search {
-    color: #fff ! important;
-}
-
-.mx_SearchBox_search::-webkit-input-placeholder  {
-    color: rgba(255, 255, 255, 0.6) ! important;
-}
-
-.mx_SearchBox_search::-moz-placeholder  {
-    color: rgba(255, 255, 255, 0.6) ! important;
-}
-
-.mx_RoomList_emptySubListTip,
-.mx_RoomDropTarget {
-    font-size: 14px ! important;
-    border: 1.5px dashed rgba(0,0,0,0.2) ! important;
-    color: #fff ! important;
-    background-color: transparent ! important;
-    border-radius: 6px ! important;
-    margin-left: 6px ! important;
-    margin-right: 6px ! important;
-    margin-top: 8px ! important;
-    margin-bottom: 7px ! important;
-    padding: 8px ! important;
-}
-
-.mx_RoomDirectory_perm {
-    font-family: $header-font-family ! important;
-    background-color: #fff ! important;
-}
-
-.mx_RoomTile_badge,
-.mx_RoomSubList_badge {
-    height: 12px ! important;
-    padding-top: 1px ! important;
-    padding-bottom: 1px ! important;
-}
-
-.mx_RoomSubList_chevron {
-    top: 8px ! important;
-}
-
-.mx_MemberInfo .mx_RoomTile_name {
-    color: $primary-fg-color ! important;
-}

res/themes/status/css/status.scss

@@ -1,6 +0,0 @@
-@import "_paths.scss";
-@import "_fonts.scss";
-@import "../../../../node_modules/matrix-react-sdk/res/themes/light/css/_base.scss";
-@import "_status.scss";
-@import "../../../../node_modules/matrix-react-sdk/res/css/_components.scss";
-@import "_StatusLogin.scss";

res/themes/status/fonts/README

@@ -1 +0,0 @@
-We link out to status.im for fonts, although ideally we'd put them here.

res/themes/status/img/dot.svg

@@ -1 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><title>Artboard</title><circle cx="10" cy="10" r="1" fill="#FFF" fill-rule="evenodd" opacity=".11"/></svg>

res/welcome.html

@@ -149,6 +149,15 @@ h1::after {
     background-image: url('welcome/images/icon-room-directory.svg');
 }
 
+/*
+.mx_WelcomePage_loggedIn is applied by EmbeddedPage from the Welcome component
+If it is set on the page, we should show the buttons. Otherwise, we have to assume
+we don't have an account and should hide them. No account == no guest account either.
+ */
+.mx_WelcomePage:not(.mx_WelcomePage_loggedIn) .mx_WelcomePage_guestFunctions {
+    display: none;
+}
+
 </style>
 
 <div class="mx_Parent">
@@ -166,7 +175,12 @@ h1::after {
                 <div class="mx_ButtonLabel">_t("Create Account")</div>
             </a>
         </div>
-        <div class="mx_ButtonRow">
+        <!-- The comments below are meant to be used by Ansible as a quick way
+             to strip out the marked content when desired.
+             See https://github.com/vector-im/riot-web/issues/8622.
+             TODO: Strip out these comments and rely on the guest flag -->
+        <!-- BEGIN Ansible: Remove these lines when guest access is disabled -->
+        <div class="mx_ButtonRow mx_WelcomePage_guestFunctions">
             <div>
                 <div class="mx_ButtonWrapperText">_t("Need help?")</div>
                 <a href="#/user/@riot-bot:matrix.org?action=chat" class="mx_ButtonParent mx_SecondaryButton mx_Button_iconHelp">
@@ -180,5 +194,6 @@ h1::after {
                 </a>
             </div>
         </div>
+        <!-- END Ansible: Remove these lines when guest access is disabled -->
     </div>
 </div>

scripts/ci_package.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Runs package.sh setting the version to git hashes of the riot-web,
+# react-sdk & js-sdk checkouts, for the case where these dependencies
+# are git checkouts.
+
+set -ex
+
+rm dist/riot-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist
+
+# Since the deps are fetched from git, we can rev-parse
+REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
+JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
+
+VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
+
+DIST_VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA scripts/package.sh -d

scripts/cleanup.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# script to clean up the deployments made by redeploy.py for vectorwebdev and vectorwebexp
+set -e
+
+# currently live deployment (full path)
+live=`dirname $(readlink -f "$HOME/live")`
+
+# currently live bundle (just the name of the bundle)
+live_bundle=`grep 'script src="bundles' live/index.html | sed -e 's#.*bundles/##' -e 's#/.*##'`
+
+# clean up 'extracted': find things which are older than 7 days, exclude the
+# current live one, and remove
+find $HOME/extracted -mindepth 1 -maxdepth 1 -type d -ctime +7 \
+     \! -path "$live" -exec rm -r {} \;
+
+# clean up 'bundles': ditto
+find $HOME/bundles -mindepth 1 -maxdepth 1 -type d -ctime +7 \
+     \! -name "$live_bundle" -exec rm -r {} \;

scripts/copy-res.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+const loaderUtils = require("loader-utils");
+
 // copies the resources into the webapp directory.
 //
 
@@ -36,11 +38,13 @@ const INCLUDE_LANGS = [
     {'value': 'pt_BR', 'label': 'Português do Brasil'},
     {'value': 'ru', 'label': 'Русский'},
     {'value': 'sk', 'label': 'Slovenčina'},
+    {'value': 'sq', 'label': 'Shqip'},
     {'value': 'sr', 'label': 'српски'},
     {'value': 'sv', 'label': 'Svenska'},
     {'value': 'te', 'label': 'తెలుగు'},
     {'value': 'th', 'label': 'ไทย'},
     {'value': 'tr', 'label': 'Türk'},
+    {'value': 'vls', 'label': 'West-Vlaams'},
     {'value': 'zh_Hans', 'label': '简体中文'}, // simplified chinese
     {'value': 'zh_Hant', 'label': '繁體中文'}, // traditional chinese
 ];
@@ -51,23 +55,14 @@ const INCLUDE_LANGS = [
 const COPY_LIST = [
     ["res/manifest.json", "webapp"],
     ["res/welcome.html", "webapp"],
-    ["res/home-status.html", "webapp"],
     ["res/welcome/**", "webapp/welcome"],
     ["res/themes/**", "webapp/themes"],
     ["res/vector-icons/**", "webapp/vector-icons"],
     ["node_modules/matrix-react-sdk/res/media/**", "webapp/media"],
-    ["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
-    ["node_modules/emojione/assets/png/*", "webapp/emojione/png/"],
     ["node_modules/olm/olm_legacy.js", "webapp", { directwatch: 1 }],
     ["./config.json", "webapp", { directwatch: 1 }],
 ];
 
-INCLUDE_LANGS.forEach(function(l) {
-    COPY_LIST.push([
-        l.value, "webapp/i18n/", { lang: 1 },
-    ]);
-});
-
 const parseArgs = require('minimist');
 const Cpx = require('cpx');
 const chokidar = require('chokidar');
@@ -78,8 +73,8 @@ const argv = parseArgs(
     process.argv.slice(2), {}
 );
 
-var watch = argv.w;
-var verbose = argv.v;
+const watch = argv.w;
+const verbose = argv.v;
 
 function errCheck(err) {
     if (err) {
@@ -137,39 +132,11 @@ function next(i, err) {
                 .on('change', copy)
                 .on('ready', cb)
                 .on('error', errCheck);
-        } else if (opts.lang) {
-            const reactSdkFile = 'node_modules/matrix-react-sdk/src/i18n/strings/' + source + '.json';
-            const riotWebFile = 'src/i18n/strings/' + source + '.json';
-
-            // XXX: Use a debounce because for some reason if we read the language
-            // file immediately after the FS event is received, the file contents
-            // appears empty. Possibly https://github.com/nodejs/node/issues/6112
-            let makeLangDebouncer;
-            const makeLang = () => {
-                if (makeLangDebouncer) {
-                    clearTimeout(makeLangDebouncer);
-                }
-                makeLangDebouncer = setTimeout(() => {
-                    genLangFile(source, dest);
-                }, 500);
-            };
-
-            [reactSdkFile, riotWebFile].forEach(function(f) {
-                chokidar.watch(f)
-                    .on('add', makeLang)
-                    .on('change', makeLang)
-                    //.on('ready', cb)  We'd have to do this when both files are ready
-                    .on('error', errCheck);
-            });
-            next(i + 1, err);
         } else {
             cpx.on('watch-ready', cb);
             cpx.on("watch-error", cb);
             cpx.watch();
         }
-    } else if (opts.lang) {
-        genLangFile(source, dest);
-        next(i + 1, err);
     } else {
         cpx.copy(cb);
     }
@@ -196,21 +163,28 @@ function genLangFile(lang, dest) {
 
     translations = weblateToCounterpart(translations);
 
-    fs.writeFileSync(dest + lang + '.json', JSON.stringify(translations, null, 4));
+    const json = JSON.stringify(translations, null, 4);
+    const jsonBuffer = Buffer.from(json);
+    const digest = loaderUtils.getHashDigest(jsonBuffer, null, null, 7);
+    const filename = `${lang}.${digest}.json`;
+
+    fs.writeFileSync(dest + filename, json);
     if (verbose) {
-        console.log("Generated language file: " + lang);
+        console.log("Generated language file: " + filename);
     }
+
+    return filename;
 }
 
-function genLangList() {
+function genLangList(langFileMap) {
     const languages = {};
     INCLUDE_LANGS.forEach(function(lang) {
         const normalizedLanguage = lang.value.toLowerCase().replace("_", "-");
         const languageParts = normalizedLanguage.split('-');
         if (languageParts.length == 2 && languageParts[0] == languageParts[1]) {
-            languages[languageParts[0]] = {'fileName': lang.value + '.json', 'label': lang.label};
+            languages[languageParts[0]] = {'fileName': langFileMap[lang.value], 'label': lang.label};
         } else {
-            languages[normalizedLanguage] = {'fileName': lang.value + '.json', 'label': lang.label};
+            languages[normalizedLanguage] = {'fileName': langFileMap[lang.value], 'label': lang.label};
         }
     });
     fs.writeFile('webapp/i18n/languages.json', JSON.stringify(languages, null, 4), function(err) {
@@ -258,5 +232,50 @@ function weblateToCounterpart(inTrs) {
     return outTrs;
 }
 
-genLangList();
+/**
+watch the input files for a given language,
+regenerate the file, adding its content-hashed filename to langFileMap
+and regenerating languages.json with the new filename
+*/
+function watchLanguage(lang, dest, langFileMap) {
+    const reactSdkFile = 'node_modules/matrix-react-sdk/src/i18n/strings/' + lang + '.json';
+    const riotWebFile = 'src/i18n/strings/' + lang + '.json';
+
+    // XXX: Use a debounce because for some reason if we read the language
+    // file immediately after the FS event is received, the file contents
+    // appears empty. Possibly https://github.com/nodejs/node/issues/6112
+    let makeLangDebouncer;
+    const makeLang = () => {
+        if (makeLangDebouncer) {
+            clearTimeout(makeLangDebouncer);
+        }
+        makeLangDebouncer = setTimeout(() => {
+            const filename = genLangFile(lang, dest);
+            langFileMap[lang]=filename;
+            genLangList(langFileMap);
+        }, 500);
+    };
+
+    [reactSdkFile, riotWebFile].forEach(function(f) {
+        chokidar.watch(f)
+            .on('add', makeLang)
+            .on('change', makeLang)
+            .on('error', errCheck);
+    });
+}
+
+// language resources
+const I18N_DEST = "webapp/i18n/";
+const I18N_FILENAME_MAP = INCLUDE_LANGS.reduce((m, l) => {
+    const filename = genLangFile(l.value, I18N_DEST);
+    m[l.value] = filename;
+    return m;
+}, {});
+genLangList(I18N_FILENAME_MAP);
+
+if (watch) {
+    INCLUDE_LANGS.forEach(l => watchLanguage(l.value, I18N_DEST, I18N_FILENAME_MAP));
+}
+
+// non-language resources
 next(0);

scripts/deploy.py

@@ -166,7 +166,7 @@ if __name__ == "__main__":
         )
     )
     parser.add_argument(
-        "--include", nargs='*', default='./config*.json', help=(
+        "--include", nargs='*', default=['./config*.json'], help=(
             "Symlink these files into the root of the deployed tarball. \
              Useful for config files and home pages. Supports glob syntax. \
              (Default: '%(default)s')"

scripts/docker-link-repos.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+set -ex
+
+if [ $USE_CUSTOM_SDKS == false ]
+then
+    echo "skipping react-sdk and js-sdk installs: USE_CUSTOM_SDKS is false"
+    exit 0
+fi
+
+echo "Linking js-sdk"
+git clone $JS_SDK_REPO js-sdk
+cd js-sdk
+git checkout $JS_SDK_BRANCH
+yarn link
+yarn --network-timeout=100000 install
+cd ../
+
+echo "Linking react-sdk"
+git clone $REACT_SDK_REPO react-sdk
+cd react-sdk
+git checkout $REACT_SDK_BRANCH
+yarn link
+yarn link matrix-js-sdk
+yarn --network-timeout=100000 install
+cd ../
+
+echo "Setting up riot-web with react-sdk and js-sdk packages"
+yarn link matrix-js-sdk
+yarn link matrix-react-sdk

scripts/electron-package.sh

@@ -85,8 +85,8 @@ if [ -n "$conffile" ]; then
     pushd "$builddir"
 fi
 
-npm install
-npm run build:electron
+yarn install
+yarn build:electron
 
 popd
 
@@ -104,10 +104,12 @@ cp $distdir/*.dmg "$pubdir/install/macos/"
 
 # Windows installers go to the dist dir because they need signing
 mkdir -p "$pubdir/install/win32/ia32/"
-cp $distdir/win-ia32/*.exe "$projdir/electron_app/dist/unsigned/"
+mkdir -p "$projdir/electron_app/dist/unsigned/ia32/"
+cp $distdir/squirrel-windows-ia32/*.exe "$projdir/electron_app/dist/unsigned/ia32/"
 
 mkdir -p "$pubdir/install/win32/x64/"
-cp $distdir/win/*.exe "$projdir/electron_app/dist/unsigned/"
+mkdir -p "$projdir/electron_app/dist/unsigned/x64/"
+cp $distdir/squirrel-windows/*.exe "$projdir/electron_app/dist/unsigned/x64/"
 
 # Packages for auto-update
 mkdir -p "$pubdir/update/macos"
@@ -115,15 +117,19 @@ cp $distdir/*-mac.zip "$pubdir/update/macos/"
 echo "$vername" > "$pubdir/update/macos/latest"
 
 mkdir -p "$pubdir/update/win32/ia32/"
-cp $distdir/win-ia32/*.nupkg "$pubdir/update/win32/ia32/"
-cp $distdir/win-ia32/RELEASES "$pubdir/update/win32/ia32/"
+cp $distdir/squirrel-windows-ia32/*.nupkg "$pubdir/update/win32/ia32/"
+cp $distdir/squirrel-windows-ia32/RELEASES "$pubdir/update/win32/ia32/"
 
 mkdir -p "$pubdir/update/win32/x64/"
-cp $distdir/win/*.nupkg "$pubdir/update/win32/x64/"
-cp $distdir/win/RELEASES "$pubdir/update/win32/x64/"
+cp $distdir/squirrel-windows/*.nupkg "$pubdir/update/win32/x64/"
+cp $distdir/squirrel-windows/RELEASES "$pubdir/update/win32/x64/"
 
-# Move the debs to the main project dir's dist folder
-cp $distdir/*.deb "$projdir/electron_app/dist/"
+# Move the deb to the main project dir's dist folder
+# (just the 64 bit one - the 32 bit one still gets built because
+# it's one arch argument for all platforms and we still want 32 bit
+# windows, but 32 bit linux is unsupported as of electron 4 and no
+# longer appears to work).
+cp $distdir/*_amd64.deb "$projdir/electron_app/dist/"
 
 rm -rf "$builddir"
 

scripts/fetch-develop.deps.sh

@@ -6,7 +6,7 @@
 # the branch the current checkout is on, use that branch. Otherwise,
 # use develop.
 
-set -e
+set -ex
 
 GIT_CLONE_ARGS=("$@")
 [ -z "$defbranch" ] && defbranch="develop"
@@ -25,7 +25,7 @@ function clone() {
     if [ -n "$branch" ]
     then
         echo "Trying to use $org/$repo#$branch"
-        git clone https://github.com/$org/$repo.git $repo --branch $branch \
+        git clone git://github.com/$org/$repo.git $repo --branch $branch \
             "${GIT_CLONE_ARGS[@]}"
         return $?
     fi
@@ -33,30 +33,39 @@ function clone() {
 }
 
 function dodep() {
-    org=$1
-    repo=$2
-    rm -rf $repo
+    deforg=$1
+    defrepo=$2
+    rm -rf $defrepo
 
     # Try the PR author's branch in case it exists on the deps as well.
     # Try the target branch of the push or PR.
     # Use the default branch as the last resort.
-    if [[ "$TRAVIS" == true ]]; then
-        clone $org $repo $TRAVIS_PULL_REQUEST_BRANCH ||
-        clone $org $repo $TRAVIS_BRANCH ||
-        clone $org $repo $defbranch ||
+    if [[ "$BUILDKITE" == true ]]; then
+        # If BUILDKITE_BRANCH is set, it will contain either:
+        #   * "branch" when the author's branch and target branch are in the same repo
+        #   * "author:branch" when the author's branch is in their fork
+        # We can split on `:` into an array to check.
+        BUILDKITE_BRANCH_ARRAY=(${BUILDKITE_BRANCH//:/ })
+        if [[ "${#BUILDKITE_BRANCH_ARRAY[@]}" == "2" ]]; then
+            prAuthor=${BUILDKITE_BRANCH_ARRAY[0]}
+            prBranch=${BUILDKITE_BRANCH_ARRAY[1]}
+        else
+            prAuthor=$deforg
+            prBranch=$BUILDKITE_BRANCH
+        fi
+        clone $prAuthor $defrepo $prBranch ||
+        clone $deforg $defrepo $BUILDKITE_PULL_REQUEST_BASE_BRANCH ||
+        clone $deforg $defrepo $defbranch ||
         return $?
     else
-        clone $org $repo $ghprbSourceBranch ||
-        clone $org $repo $GIT_BRANCH ||
-        clone $org $repo `git rev-parse --abbrev-ref HEAD` ||
-        clone $org $repo $defbranch ||
+        clone $deforg $defrepo $ghprbSourceBranch ||
+        clone $deforg $defrepo $GIT_BRANCH ||
+        clone $deforg $defrepo `git rev-parse --abbrev-ref HEAD` ||
+        clone $deforg $defrepo $defbranch ||
         return $?
     fi
 
-    echo "$repo set to branch "`git -C "$repo" rev-parse --abbrev-ref HEAD`
-
-    mkdir -p node_modules
-    npm link "./$repo"  # This does an npm install for us
+    echo "$defrepo set to branch "`git -C "$defrepo" rev-parse --abbrev-ref HEAD`
 }
 
 ##############################
@@ -66,6 +75,13 @@ echo 'Setting up matrix-js-sdk'
 
 dodep matrix-org matrix-js-sdk
 
+pushd matrix-js-sdk
+yarn link
+yarn install
+popd
+
+yarn link matrix-js-sdk
+
 echo -en 'travis_fold:end:matrix-js-sdk\r'
 
 ##############################
@@ -75,23 +91,21 @@ echo 'Setting up matrix-react-sdk'
 
 dodep matrix-org matrix-react-sdk
 
-# replace the version of js-sdk that got pulled into react-sdk with a link
-# to our version. Make sure to do this *after* doing 'npm i' in react-sdk,
-# otherwise npm helpfully moves another-json from matrix-js-sdk/node_modules
-# into matrix-react-sdk/node_modules.
-#
-# (note this matches the instructions in the README.)
-cd matrix-react-sdk
-npm link ../matrix-js-sdk
-cd ../
+pushd matrix-react-sdk
+yarn link
+yarn link matrix-js-sdk
+yarn install
+popd
+
+yarn link matrix-react-sdk
 
 echo -en 'travis_fold:end:matrix-react-sdk\r'
 
 ##############################
 
-# Link the reskindex binary in place: if we used npm link,
-# npm would do this for us, but we don't because we'd have
-# to define the npm prefix somewhere so it could put the
+# Link the reskindex binary in place: if we used `yarn link`,
+# Yarn would do this for us, but we don't because we'd have
+# to define the Yarn binary prefix somewhere so it could put the
 # intermediate symlinks there. Instead, we do it ourselves.
 mkdir -p node_modules/.bin
 ln -sfv ../matrix-react-sdk/scripts/reskindex.js node_modules/.bin/reskindex

scripts/jenkins.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
-nvm use 10
-
-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
-
-# 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.
-#
-# disabled for now, to avoid the annoying scenario of a release doing something
-# different to /develop. Instead, add it to the 'npm install' list above.
-# -- rav 2016/02/03
-#tar -C olm -xz < olm/olm-*.tgz
-#rm -r node_modules/olm
-#cp -r olm/package node_modules/olm
-
-# run the mocha tests
-npm run test
-
-# run eslint
-npm run lintall -- -f checkstyle -o eslint.xml || true
-
-rm dist/riot-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist
-
-# Since the deps are fetched from git, we can rev-parse
-REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
-JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
-
-VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
-
-DIST_VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA scripts/package.sh -d

scripts/make-icons.sh

@@ -1,4 +1,10 @@
 #!/bin/bash
+#
+# Converts an svg logo into the various image resources required by
+# the various platforms deployments.
+#
+# On debian-based systems you need these deps:
+#   apt-get install xmlstarlet python3-cairosvg icnsutils
 
 if [ $# != 1 ]
 then
@@ -52,7 +58,23 @@ cp "$tmpdir/256.png" "$tmpdir/Riot.iconset/icon_256x256.png"
 cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_256x256@2x.png"
 cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_512x512.png"
 cp "$tmpdir/1024.png" "$tmpdir/Riot.iconset/icon_512x512@2x.png"
-iconutil -c icns -o electron_app/build/icon.icns "$tmpdir/Riot.iconset"
+
+if [ -x "$(command -v iconutil)" ]; then
+  # available on macos
+  iconutil -c icns -o electron_app/build/icon.icns "$tmpdir/Riot.iconset"
+elif [ -x "$(command -v png2icns)" ]; then
+  # available on linux
+  # png2icns is more finicky about its input than iconutil
+  # 1. it doesn't support a 64x64 (aka 32x32@2x)
+  # 2. it doesn't like duplicates (128x128@2x == 256x256)
+  rm "$tmpdir/Riot.iconset/icon_128x128@2x.png"
+  rm "$tmpdir/Riot.iconset/icon_256x256@2x.png"
+  rm "$tmpdir/Riot.iconset/icon_16x16@2x.png"
+  rm "$tmpdir/Riot.iconset/icon_32x32@2x.png"
+  png2icns electron_app/build/icon.icns "$tmpdir"/Riot.iconset/*png
+else
+  echo "WARNING: Unsupported platform. Skipping icns build"
+fi
 
 cp "$tmpdir/36.png" "res/vector-icons/android-chrome-36x36.png"
 cp "$tmpdir/48.png" "res/vector-icons/android-chrome-48x48.png"

scripts/package.sh

@@ -13,16 +13,19 @@ else
     version=`git describe --dirty --tags || echo unknown`
 fi
 
-npm run clean
-npm run build$dev
+yarn clean
+yarn build$dev
 
 # include the sample config in the tarball. Arguably this should be done by
-# `npm run build`, but it's just too painful.
+# `yarn build`, but it's just too painful.
 cp config.sample.json webapp/
 
 mkdir -p dist
 cp -r webapp riot-$version
 
+# Just in case you have a local config, remove it before packaging
+rm riot-$version/config.json || true
+
 # if $version looks like semver with leading v, strip it before writing to file
 if [[ ${version} =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then
     echo ${version:1} > riot-$version/version

scripts/redeploy.py

@@ -2,7 +2,8 @@
 #
 # auto-deploy script for https://riot.im/develop
 #
-# Listens for HTTP hits. When it gets one, downloads the artifact from jenkins
+# Listens for buildkite webhook pokes (https://buildkite.com/docs/apis/webhooks)
+# When it gets one, downloads the artifact from buildkite
 # and deploys it as the new version.
 #
 # Requires the following python packages:
@@ -16,6 +17,10 @@ import time
 import traceback
 from urlparse import urljoin
 import glob
+import re
+import shutil
+import threading
+from Queue import Queue
 
 from flask import Flask, jsonify, request, abort
 
@@ -23,10 +28,13 @@ from deploy import Deployer, DeployException
 
 app = Flask(__name__)
 
-arg_jenkins_url = None
 deployer = None
 arg_extract_path = None
 arg_symlink = None
+arg_webhook_token = None
+arg_api_token = None
+
+workQueue = Queue()
 
 def create_symlink(source, linkname):
     try:
@@ -39,81 +47,117 @@ def create_symlink(source, linkname):
         else:
             raise e
 
+def req_headers():
+    return {
+        "Authorization": "Bearer %s" % (arg_api_token,),
+    }
+
+# Buildkite considers a poke to have failed if it has to wait more than 10s for
+# data (any data, not just the initial response) and it normally takes longer than
+# that to download an artifact from buildkite. Apparently there is no way in flask
+# to finish the response and then keep doing stuff, so instead this has to involve
+# threading. Sigh.
+def worker_thread():
+    while True:
+        toDeploy = workQueue.get()
+        deploy_buildkite_artifact(*toDeploy)
+
 @app.route("/", methods=["POST"])
-def on_receive_jenkins_poke():
-    # {
-    #    "name": "VectorWebDevelop",
-    #    "build": {
-    #        "number": 8
-    #    }
-    # }
+def on_receive_buildkite_poke():
+    got_webhook_token = request.headers.get('X-Buildkite-Token')
+    if got_webhook_token != arg_webbook_token:
+        print("Denying request with incorrect webhook token: %s" % (got_webhook_token,))
+        abort(400, "Incorrect webhook token")
+        return
+
+    required_api_prefix = None
+    if arg_buildkite_org is not None:
+        required_api_prefix = 'https://api.buildkite.com/v2/organizations/%s' % (arg_buildkite_org,)
+
     incoming_json = request.get_json()
     if not incoming_json:
         abort(400, "No JSON provided!")
         return
     print("Incoming JSON: %s" % (incoming_json,))
 
-    job_name = incoming_json.get("name")
-    if not isinstance(job_name, basestring):
-        abort(400, "Bad job name: %s" % (job_name,))
+    event = incoming_json.get("event")
+    if event is None:
+        abort(400, "No 'event' specified")
         return
 
-    build_num = incoming_json.get("build", {}).get("number", 0)
-    if not build_num or build_num <= 0 or not isinstance(build_num, int):
-        abort(400, "Missing or bad build number")
+    if event == 'ping':
+        print("Got ping request - responding")
+        return jsonify({'response': 'pong!'})
+
+    if event != 'build.finished':
+        print("Rejecting '%s' event")
+        abort(400, "Unrecognised event")
         return
 
-    return fetch_jenkins_build(job_name, build_num)
-
-def fetch_jenkins_build(job_name, build_num):
-    artifact_url = urljoin(
-        arg_jenkins_url, "job/%s/%s/api/json" % (job_name, build_num)
-    )
-    artifact_response = requests.get(artifact_url).json()
-
-    # {
-    # "actions": [],
-    # "artifacts": [
-    #   {
-    #   "displayPath": "vector-043f6991a4ed-react-20f77d1224ef-js-0a7efe3e8bd5.tar.gz",
-    #   "fileName": "vector-043f6991a4ed-react-20f77d1224ef-js-0a7efe3e8bd5.tar.gz",
-    #   "relativePath": "vector-043f6991a4ed-react-20f77d1224ef-js-0a7efe3e8bd5.tar.gz"
-    #   }
-    # ],
-    # "building": false,
-    # "description": null,
-    # "displayName": "#11",
-    # "duration": 137976,
-    # "estimatedDuration": 132008,
-    # "executor": null,
-    # "fullDisplayName": "VectorWebDevelop #11",
-    # "id": "11",
-    # "keepLog": false,
-    # "number": 11,
-    # "queueId": 12254,
-    # "result": "SUCCESS",
-    # "timestamp": 1454432640079,
-    # "url": "http://matrix.org/jenkins/job/VectorWebDevelop/11/",
-    # "builtOn": "",
-    # "changeSet": {},
-    # "culprits": []
-    # }
-    if artifact_response.get("result") != "SUCCESS":
-        abort(404, "Not deploying. Build was not marked as SUCCESS.")
+    build_obj = incoming_json.get("build")
+    if build_obj is None:
+        abort(400, "No 'build' object")
         return
 
-    if len(artifact_response.get("artifacts", [])) != 1:
-        abort(404, "Not deploying. Build has an unexpected number of artifacts.")
+    build_url = build_obj.get('url')
+    if build_url is None:
+        abort(400, "build has no url")
         return
 
-    tar_gz_path = artifact_response["artifacts"][0]["relativePath"]
-    if not tar_gz_path.endswith(".tar.gz"):
-        abort(404, "Not deploying. Artifact is not a .tar.gz file")
+    if required_api_prefix is not None and not build_url.startswith(required_api_prefix):
+        print("Denying poke for build url with incorrect prefix: %s" % (build_url,))
+        abort(400, "Invalid build url")
         return
 
-    tar_gz_url = urljoin(
-        arg_jenkins_url, "job/%s/%s/artifact/%s" % (job_name, build_num, tar_gz_path)
-    )
+    build_num = build_obj.get('number')
+    if build_num is None:
+        abort(400, "build has no number")
+        return
+
+    pipeline_obj = incoming_json.get("pipeline")
+    if pipeline_obj is None:
+        abort(400, "No 'pipeline' object")
+        return
+
+    pipeline_name = pipeline_obj.get('name')
+    if pipeline_name is None:
+        abort(400, "pipeline has no name")
+        return
+
+    artifacts_url = build_url + "/artifacts"
+    artifacts_resp = requests.get(artifacts_url, headers=req_headers())
+    artifacts_resp.raise_for_status()
+    artifacts_array = artifacts_resp.json()
+    
+    artifact_to_deploy = None
+    for artifact in artifacts_array:
+        if re.match(r"dist/.*.tar.gz", artifact['path']):
+            artifact_to_deploy = artifact
+        if artifact_to_deploy is None:
+            print("No suitable artifacts found")
+            return jsonify({})
+
+    # double paranoia check: make sure the artifact is on the right org too
+    if required_api_prefix is not None and not artifact_to_deploy['url'].startswith(required_api_prefix):
+        print("Denying poke for build url with incorrect prefix: %s" % (artifact_to_deploy['url'],))
+        abort(400, "Refusing to deploy artifact from URL %s", artifact_to_deploy['url'])
+        return
+
+    # there's no point building up a queue of things to deploy, so if there are any pending jobs,
+    # remove them
+    while not workQueue.empty():
+        try:
+            workQueue.get(False)
+        except:
+            pass
+    workQueue.put([artifact_to_deploy, pipeline_name, build_num])
+
+    return jsonify({})
+
+def deploy_buildkite_artifact(artifact, pipeline_name, build_num):
+    artifact_response = requests.get(artifact['url'], headers=req_headers())
+    artifact_response.raise_for_status()
+    artifact_obj = artifact_response.json()
 
     # we extract into a directory based on the build number. This avoids the
     # problem of multiple builds building the same git version and thus having
@@ -122,18 +166,16 @@ def fetch_jenkins_build(job_name, build_num):
     #       a good deploy with a bad one
     #   (b) we'll be overwriting the live deployment, which means people might
     #       see half-written files.
-    build_dir = os.path.join(arg_extract_path, "%s-#%s" % (job_name, build_num))
+    build_dir = os.path.join(arg_extract_path, "%s-#%s" % (pipeline_name, build_num))
     try:
-        extracted_dir = deploy_tarball(tar_gz_url, build_dir)
+        extracted_dir = deploy_tarball(artifact_obj, build_dir)
     except DeployException as e:
         traceback.print_exc()
         abort(400, e.message)
 
     create_symlink(source=extracted_dir, linkname=arg_symlink)
 
-    return jsonify({})
-
-def deploy_tarball(tar_gz_url, build_dir):
+def deploy_tarball(artifact, build_dir):
     """Download a tarball from jenkins and unpack it
 
     Returns:
@@ -145,20 +187,25 @@ def deploy_tarball(tar_gz_url, build_dir):
         )
     os.mkdir(build_dir)
 
+    print("Fetching artifact %s -> %s..." % (artifact['download_url'], artifact['filename']))
+
+    # Download the tarball here as buildkite needs auth to do this
+    # we don't pgp-sign buildkite artifacts, relying on HTTPS and buildkite
+    # not being evil. If that's not good enough for you, don't use riot.im/develop.
+    resp = requests.get(artifact['download_url'], stream=True, headers=req_headers())
+    resp.raise_for_status()
+    with open(artifact['filename'], 'wb') as ofp:
+        shutil.copyfileobj(resp.raw, ofp)
+    print("...download complete. Deploying...")
+
     # we rely on the fact that flask only serves one request at a time to
     # ensure that we do not overwrite a tarball from a concurrent request.
 
-    return deployer.deploy(tar_gz_url, build_dir)
+    return deployer.deploy(artifact['filename'], build_dir)
 
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser("Runs a Vector redeployment server.")
-    parser.add_argument(
-        "-j", "--jenkins", dest="jenkins", default="https://matrix.org/jenkins/", help=(
-            "The base URL of the Jenkins web server. This will be hit to get the\
-            built artifacts (the .gz file) for redeploying."
-        )
-    )
     parser.add_argument(
         "-p", "--port", dest="port", default=4000, type=int, help=(
             "The port to listen on for requests from Jenkins."
@@ -204,13 +251,33 @@ if __name__ == "__main__":
         ),
     )
 
+    parser.add_argument(
+        "--webhook-token", dest="webhook_token", help=(
+            "Only accept pokes with this buildkite token."
+        ), required=True,
+    )
+
+    parser.add_argument(
+        "--api-token", dest="api_token", help=(
+            "API access token for buildkite. Require read_artifacts scope."
+        ), required=True,
+    )
+
+    # We require a matching webhook token, but because we take everything else
+    # about what to deploy from the poke body, we can be a little more paranoid
+    # and only accept builds / artifacts from a specific buildkite org
+    parser.add_argument(
+        "--org", dest="buildkite_org", help=(
+            "Lock down to this buildkite org"
+        )
+    )
+
     args = parser.parse_args()
-    if args.jenkins.endswith("/"): # important for urljoin
-        arg_jenkins_url = args.jenkins
-    else:
-        arg_jenkins_url = args.jenkins + "/"
     arg_extract_path = args.extract
     arg_symlink = args.symlink
+    arg_webbook_token = args.webhook_token
+    arg_api_token = args.api_token
+    arg_buildkite_org = args.buildkite_org
 
     if not os.path.isdir(arg_extract_path):
         os.mkdir(arg_extract_path)
@@ -222,25 +289,20 @@ if __name__ == "__main__":
     for include in args.include:
         deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })
 
-
-    # we don't pgp-sign jenkins artifacts; instead we rely on HTTPS access to
-    # the jenkins server (and the jenkins server not being compromised and/or
-    # github not serving it compromised source). If that's not good enough for
-    # you, don't use riot.im/develop.
-    deployer.verify_signature = False
-
     if args.tarball_uri is not None:
         build_dir = os.path.join(arg_extract_path, "test-%i" % (time.time()))
         deploy_tarball(args.tarball_uri, build_dir)
     else:
         print(
-            "Listening on port %s. Extracting to %s%s. Symlinking to %s. Jenkins URL: %s. Include files: %s" %
+            "Listening on port %s. Extracting to %s%s. Symlinking to %s. Include files: %s" %
             (args.port,
              arg_extract_path,
              " (clean after)" if deployer.should_clean else "",
              arg_symlink,
-             arg_jenkins_url,
              deployer.symlink_paths,
             )
         )
-        app.run(host="0.0.0.0", port=args.port, debug=True)
+        fred = threading.Thread(target=worker_thread)
+        fred.daemon = True
+        fred.start()
+        app.run(port=args.port, debug=False)

scripts/yarn-sub.js

@@ -9,13 +9,13 @@ if (!moduleName) {
 
 const argString = process.argv.length > 3 ? process.argv.slice(3).join(" ") : "";
 if (!argString) {
-    console.error("Expected an npm argument string to use");
+    console.error("Expected an yarn argument string to use");
     process.exit(1);
 }
 
 const modulePath = path.dirname(require.resolve(`${moduleName}/package.json`));
 
-child_process.execSync("npm " + argString, {
+child_process.execSync("yarn " + argString, {
     env: process.env,
     cwd: modulePath,
     stdio: ['inherit', 'inherit', 'inherit'],

src/components/views/auth/VectorAuthFooter.js

@@ -18,8 +18,9 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import SdkConfig from 'matrix-react-sdk/lib/SdkConfig';
+
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
-import SettingsStore from 'matrix-react-sdk/lib/settings/SettingsStore';
 
 module.exports = React.createClass({
     displayName: 'VectorAuthFooter',
@@ -28,15 +29,29 @@ 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 />;
+        const brandingConfig = SdkConfig.get().branding;
+        let links = [
+            {"text": "blog", "url": "https://medium.com/@RiotChat"},
+            {"text": "twitter", "url": "https://twitter.com/@RiotChat"},
+            {"text": "github", "url": "https://github.com/vector-im/riot-web"},
+        ];
+
+        if (brandingConfig && brandingConfig.authFooterLinks) {
+            links = brandingConfig.authFooterLinks;
+        }
+
+        const authFooterLinks = [];
+        for (const linkEntry of links) {
+            authFooterLinks.push(
+                <a href={linkEntry.url} key={linkEntry.text} target="_blank" rel="noopener">
+                    {linkEntry.text}
+                </a>,
+            );
+        }
 
         return (
             <div className="mx_AuthFooter">
-                <a href="https://medium.com/@RiotChat" target="_blank" rel="noopener">blog</a>
-                <a href="https://twitter.com/@RiotChat" target="_blank" rel="noopener">twitter</a>
-                <a href="https://github.com/vector-im/riot-web" target="_blank" rel="noopener">github</a>
+                {authFooterLinks}
                 <a href="https://matrix.org" target="_blank" rel="noopener">{ _t('powered by Matrix') }</a>
             </div>
         );

src/components/views/auth/VectorAuthHeaderLogo.js

@@ -19,23 +19,26 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import SdkConfig from 'matrix-react-sdk/lib/SdkConfig';
 
-const LOGO_URI = "themes/riot/img/logos/riot-im-logo-black-text.svg";
+export default class VectorAuthHeaderLogo extends React.PureComponent {
+    static replaces = 'AuthHeaderLogo'
 
-module.exports = React.createClass({
-    displayName: 'VectorAuthHeaderLogo',
-    statics: {
-        replaces: 'AuthHeaderLogo',
-    },
-    propTypes: {
+    static propTypes = {
         icon: PropTypes.string,
-    },
+    }
+
+    render() {
+        const brandingConfig = SdkConfig.get().branding;
+        let logoUrl = "themes/riot/img/logos/riot-im-logo-black-text.svg";
+        if (brandingConfig && brandingConfig.authHeaderLogoUrl) {
+            logoUrl = brandingConfig.authHeaderLogoUrl;
+        }
 
-    render: function() {
         return (
             <div className="mx_AuthHeaderLogo">
-                <img src={LOGO_URI} alt="Riot" />
+                <img src={logoUrl} alt="Riot" />
             </div>
         );
-    },
-});
+    }
+}

src/components/views/auth/VectorAuthPage.js

@@ -16,21 +16,24 @@ limitations under the License.
 
 'use strict';
 
-const React = require('react');
+import React from 'react';
 import sdk from 'matrix-react-sdk/lib/index';
+import SdkConfig from 'matrix-react-sdk/lib/SdkConfig';
 
-module.exports = React.createClass({
-    displayName: 'VectorAuthPage',
+export default class VectorAuthPage extends React.PureComponent {
+    static replaces = 'AuthPage'
 
-    statics: {
-        replaces: 'AuthPage',
-    },
-
-    render: function() {
+    render() {
         const AuthFooter = sdk.getComponent('auth.AuthFooter');
 
+        const brandingConfig = SdkConfig.get().branding;
+        let backgroundUrl = "themes/riot/img/backgrounds/valley.jpg";
+        if (brandingConfig && brandingConfig.welcomeBackgroundUrl) {
+            backgroundUrl = brandingConfig.welcomeBackgroundUrl;
+        }
+
         const pageStyle = {
-            background: 'center/cover fixed url(themes/riot/img/backgrounds/valley.jpg)',
+            background: `center/cover fixed url(${backgroundUrl})`,
         };
 
         const modalStyle = {
@@ -66,5 +69,5 @@ module.exports = React.createClass({
                 <AuthFooter />
             </div>
         );
-    },
-});
+    }
+}

src/i18n/strings/ar.json

@@ -5,7 +5,7 @@
     "Riot Desktop on %(platformName)s": "الواجهة المكتبية لرايوت على %(platformName)s",
     "Unknown device": "جهاز مجهول",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s عبر %(browserName)s على %(osName)s",
-    "You need to be using HTTPS to place a screen-sharing call.": "تحتاج الى استخدام الاتصال الآمن ( HTTPS) للسماح بمشاركة الشاشة",
+    "You need to be using HTTPS to place a screen-sharing call.": "تحتاج الى استخدام الاتصال الآمن (HTTPS) للسماح بمشاركة الشاشة.",
     "Co-ordination for Riot translators": "التنسيق لمترجمين Riot",
     "powered by Matrix": "مشغل بواسطة Matrix",
     "Welcome to Riot.im": "مرحبا بك في Riot.im",
@@ -28,5 +28,10 @@
     "Running Matrix services": "تشغيل خدمات Matrix",
     "Community-run support for Synapse": "الدعم المجتمعي لـ Synapse",
     "Admin support for Dendrite": "الدعم الاداري لـDendrite",
-    "Announcements about Synapse releases": "إعلانات حول إصدارات Synaps"
+    "Announcements about Synapse releases": "إعلانات حول إصدارات Synaps",
+    "Create Account": "انشاء حساب",
+    "Need help?": "بحاجة إلى مساعدة؟",
+    "Explore rooms": "استكشف غرف المحادثات",
+    "Room Directory": "دليل غرف المحادثات",
+    "Sign In": "التسجيل"
 }

src/i18n/strings/bg.json

@@ -9,7 +9,7 @@
     "Dismiss": "Затвори",
     "powered by Matrix": "базирано на Matrix",
     "Welcome to Riot.im": "Добре дошли в Riot.im",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Децентрализиран, шифрован чат и колаборация базирани на [matrix]",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Децентрализиран, шифрован чат и съвместна работа, базирани на [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!": "В Matrix съществуват много стаи, свързани към вече съществуващи мрежи (Slack, IRC, Gitter и т.н.) или независими такива. Разгледайте директорията!",
     "Chat with Riot Bot": "Чати с Riot Bot",
@@ -37,5 +37,14 @@
     "Dev chat for the Dendrite dev team": "Чат за разработващия екип на Dendrite",
     "Co-ordination for Riot translators": "Координация за преводачи на Riot",
     "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.": "Може да настроите и собствен сървър за самоличност, но така няма да можете да каните потребители по имейл адрес или да бъдете поканени посредством вашия имейл адрес.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Може да използвате настройките за собствен сървър за да влезете в друг Matrix сървър, чрез указване на адреса му. Това Ви позволява да използвате Riot със съществуващ Matrix акаунт принадлежащ към друг сървър."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Може да използвате настройките за собствен сървър за да влезете в друг Matrix сървър, чрез указване на адреса му. Това ви позволява да използвате Riot със съществуващ Matrix акаунт, принадлежащ към друг сървър.",
+    "Sign In": "Вписване",
+    "Create Account": "Създай акаунт",
+    "Need help?": "Нужда от помощ?",
+    "Explore rooms": "Открий стаи",
+    "Room Directory": "Директория със стаи",
+    "Unexpected error preparing the app. See console for details.": "Неочаквана грешка при подготвянето на приложението. Вижте конзолата за подробности.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Невалидна конфигурация: може да е указано само едно от: default_server_config, default_server_name, или default_hs_url.",
+    "Invalid configuration: no default server specified.": "Невалидна конфигурация: не е указан сървър по подразбиране.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Тази инсталация на Riot изглежда няма валидна конфигурация за сървър. Ако сте администраторът, моля поправете грешката по-долу"
 }

src/i18n/strings/ca.json

@@ -35,5 +35,13 @@
     "Contributing code to Matrix and Riot": "Contribuir codi a Matrix i Riot",
     "Dev chat for the Riot/Web dev team": "Xat de l'equip de desenvolupadors Riot/Web",
     "Dev chat for the Dendrite dev team": "Xat de l'equip Dendrite per a desenvolupadors",
-    "Co-ordination for Riot translators": "Coordinació dels traductors del Riot"
+    "Co-ordination for Riot translators": "Coordinació dels traductors del Riot",
+    "Create Account": "Crea un compte",
+    "Need help?": "Necessiteu ajuda?",
+    "Explore rooms": "Exploreu les sales",
+    "Room Directory": "Directori de sales",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Podeu emprar les opcions personalitzades del servidor per iniciar la sessió en altres servidors de Matrix especificant un URL de servidor personal diferent. Això us permet emprar el Riot amb un compte de Matrix existent en un servidor personal diferent.",
+    "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.": "També podeu establir un servidor d'identitat personalitzat, però no podreu convidar usuaris o ser convidats vosaltres mateixos per adreça de correu electrònic.",
+    "Sign In": "Inicia la sessió",
+    "Invalid configuration: no default server specified.": "Configuració no vàlida: no s'ha especificat cap servidor per defecte."
 }