v1.2.2

Prepare changelog for v1.2.2
v1.2.2
2025-12-11 01:40:42 +00:00 · 2019-06-19 16:00:42 +01:00 · 2019-06-19 16:00:42 +01:00 · 2019-06-19 15:59:10 +01:00 · 2019-06-19 15:55:02 +01:00 · 2019-06-18 16:02:21 +01:00
36 changed files with 655 additions and 206 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+patreon: matrixdotorg
+liberapay: matrixdotorg
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /node_modules
 /electron_app/node_modules
 /electron_app/dist
+/electron_app/pub
 /packages/
 /webapp
 /.npmrc
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,54 @@
+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)
--- a/2
+++ b/2
@@ -23,7 +23,7 @@ RUN cp /src/config.sample.json /src/webapp/config.json


 # App
-FROM nginx:latest
+FROM nginx:alpine

 COPY --from=builder /src/webapp /app

--- a/README.md
+++ b/README.md
@@ -109,25 +109,33 @@ You can configure the app by copying `config.sample.json` to

 For a good example, see https://riot.im/develop/config.json.

-1. `default_server_name` sets the default server name to use for authentication.
-   This will trigger Riot to ask
-   `https://<server_name>/.well-known/matrix/client` for the homeserver and
-   identity server URLs to use. This is the recommended approach for setting a
-   default server. However, it is also possible to use the following to directly
-   configure each of the URLs:
-   * `default_hs_url` sets the default homeserver URL.
-   * `default_is_url` sets 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 the future, identity servers will be decentralised.
-   * Riot will report an error if you accidentally configure both `default_server_name` _and_ `default_hs_url` since it's unclear which should take priority.
+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:
@@ -173,6 +181,9 @@ For a good example, see https://riot.im/develop/config.json.
    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
@@ -188,7 +199,7 @@ 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
+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.

@@ -196,13 +207,13 @@ To build it yourself, follow the instructions below.

 1. Follow the instructions in 'Building From Source' above, but run
   `yarn build` instead of `yarn dist` (since we don't need the tarball).
-2. Install electron and run it:
+2. Install Electron and run it:

   ```bash
   yarn electron
   ```

-To build packages, use electron-builder. This is configured to output:
+To build packages, use `electron-builder`. This is configured to output:
 * `dmg` + `zip` for macOS
 * `exe` + `nupkg` for Windows
 * `deb` for Linux
@@ -214,22 +225,20 @@ for dependencies required for building packages for various platforms.

 The only platform that can build packages for all three platforms is macOS:
 ```bash
-brew install wine --without-x11
 brew install mono
-brew install gnu-tar
 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:
 * @asdf:matrix.org points out that you can use nativefier and it just works(tm)
--- a/config.sample.json
+++ b/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,6 +18,8 @@
    "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",
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "src/electron-main.js",
-  "version": "1.2.1",
+  "version": "1.2.2",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "electron_app/src/electron-main.js",
-  "version": "1.2.1",
+  "version": "1.2.2",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "repository": {
@@ -73,8 +73,8 @@
    "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
    "gfm.css": "^1.1.2",
    "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "2.0.0",
-    "matrix-react-sdk": "1.2.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",
@@ -153,7 +153,7 @@
  },
  "build": {
    "appId": "im.riot.app",
-    "electronVersion": "4.2.2",
+    "electronVersion": "4.2.4",
    "files": [
      "node_modules/**",
      "src/**",
--- a/res/welcome.html
+++ b/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">
@@ -169,9 +178,9 @@ h1::after {
        <!-- 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: Convert to config option if possible. -->
+             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">
+        <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">
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -38,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
 ];
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -9,7 +9,7 @@
    "Dismiss": "Затвори",
    "powered by Matrix": "базирано на Matrix",
    "Welcome to Riot.im": "Добре дошли в Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентрализиран, шифрован чат и колаборация базирани на [matrix]",
+    "Decentralised, encrypted chat &amp; 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,10 +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 акаунт принадлежащ към друг сървър.",
-    "Sign In": "Вход",
+    "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": "Директория със стаи"
+    "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 изглежда няма валидна конфигурация за сървър. Ако сте администраторът, моля поправете грешката по-долу"
 }
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -42,5 +42,6 @@
    "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ó"
+    "Sign In": "Inicia la sessió",
+    "Invalid configuration: no default server specified.": "Configuració no vàlida: no s'ha especificat cap servidor per defecte."
 }
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -37,10 +37,14 @@
    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Die benutzerdefinierten Server-Einstellungen kannst du verwenden, um dich auf anderen Matrix-Servern anzumelden, indem du eine abweichende Heimserver-URL eingibst.<br/>Somit ist es möglich, Riot mit einem bereits bestehendem Matrix-Benutzerkonto auf einem anderen Heimserver zu verwenden.<br/><br/>Außerdem kannst du einen benutzerdefinierten Identitätsserver eingeben. Allerdings kannst du in diesem Fall Benutzer nicht mehr per E-Mail-Adresse einladen und auch selbst nicht mehr per E-Mail-Adresse eingeladen werden.",
    "Co-ordination for Riot translators": "Koordination für Riot-Übersetzer",
    "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.": "Du kannst die erweiterte Serveroption nutzen um dich an einem anderen Matrixserver anzumelden, indem du eine andere Heimserver-URL angibst. Dies erlaubt dir, Riot mit einem existierenden Matrix-Konto auf einem anderen Heimserver zu nutzen.",
-    "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.": "Du kannst auch einen anderen Identitätsserver einstellen, allerdings kannst du dann andere Benutzer nicht mehr per E-Mail-Adresse einladen, ebenso wirst du selbst nicht mehr per E-Mail-Adresse eingeladen werden können.",
+    "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.": "Sie können auch einen benutzerdefinierten Identitätsserver festlegen, aber Sie können keine Benutzer per E-Mail-Adresse einladen oder selbst per E-Mail-Adresse eingeladen werden.",
    "Sign In": "Anmelden",
    "Create Account": "Konto erstellen",
    "Need help?": "Brauchst du Hilfe?",
    "Explore rooms": "Räume erkunden",
-    "Room Directory": "Raumverzeichnis"
+    "Room Directory": "Raumverzeichnis",
+    "Unexpected error preparing the app. See console for details.": "Unerwarteter Fehler bei der Vorbereitung der App. Siehe Konsole für Details.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ungültige Konfiguration: Es kann nur eine der Optionen default_server_config, default_server_name oder default_hs_url angegeben werden.",
+    "Invalid configuration: no default server specified.": "Ungültige Konfiguration: Es wurde kein Standardserver angegeben.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Diese Installation von Riot scheint eine ungültige Serverkonfiguration zu haben. Wenn Sie der Administrator sind, korrigieren Sie bitte den folgenden Fehler"
 }
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1,4 +1,8 @@
 {
+    "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.",
+    "Your Riot is misconfigured": "Your Riot is misconfigured",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
+    "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.",
    "Riot Desktop on %(platformName)s": "Riot Desktop on %(platformName)s",
    "Unknown device": "Unknown device",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s on %(osName)s",
@@ -15,7 +19,5 @@
    "Need help?": "Need help?",
    "Chat with Riot Bot": "Chat with Riot Bot",
    "Explore rooms": "Explore rooms",
-    "Room Directory": "Room Directory",
-    "Search the room directory": "Search the room directory",
-    "Get started with some tips from Riot Bot!": "Get started with some tips from Riot Bot!"
+    "Room Directory": "Room Directory"
 }
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -42,5 +42,9 @@
    "Need help?": "Ĉu vi bezonas helpon?",
    "Explore rooms": "Esplori ĉambrojn",
    "Room Directory": "Ĉambra dosierujo",
-    "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.": "Vi povas uzi proprajn servilajn elekteblojn por saluti aliajn servilojn de Matrix, donante alian hejmeservilan URL-on. Tio povigos vin uzi programon Riot kun jama konto de Matrix en alia hejmservilo."
+    "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.": "Vi povas uzi proprajn servilajn elekteblojn por saluti aliajn servilojn de Matrix, donante alian hejmeservilan URL-on. Tio povigos vin uzi programon Riot kun jama konto de Matrix en alia hejmservilo.",
+    "Unexpected error preparing the app. See console for details.": "Neatendida eraro okazis dum preparad de la aplikaĵo. Detalojn trovu en konzolo.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Nevalida agordo: vi povas specifi nur unu elekteblon el « default_server_config », « default_server_name », aŭ « default_hs_url ».",
+    "Invalid configuration: no default server specified.": "Nevalida agordo: neniu implicita servilo estas specifita.",
+    "Your Riot is misconfigured": "Via kliento Riot estas misagordita"
 }
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -42,5 +42,8 @@
    "Create Account": "Sortu kontua",
    "Need help?": "Laguntza behar?",
    "Explore rooms": "Arakatu gelak",
-    "Room Directory": "Gelen direktorioa"
+    "Room Directory": "Gelen direktorioa",
+    "Unexpected error preparing the app. See console for details.": "Ustekabeko errorea aplikazioa prestatzean. Ikusi xehetasunak kontsolan.",
+    "Your Riot is misconfigured": "Zure Riot gaizki konfiguratuta dago",
+    "Invalid configuration: no default server specified.": "Konfigurazio baliogabea: Ez da lehenetsitako zerbitzaririk zehaztu."
 }
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -42,5 +42,10 @@
    "Create Account": "Créer un compte",
    "Need help?": "Besoin d'aide ?",
    "Explore rooms": "Explorer les salons",
-    "Room Directory": "Répertoire de salons"
+    "Room Directory": "Répertoire de salons",
+    "Unexpected error preparing the app. See console for details.": "Une erreur inattendue est survenue pendant la préparation de l’application. Consultez la console pour avoir des détails.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuration invalide : il ne faut spécifier qu’un des trois champs entre default_server_config, default_server_name et default_hs_url.",
+    "Invalid configuration: no default server specified.": "Configuration invalide : aucun serveur par défaut spécifié.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Cette installation de Riot semble avoir une configuration de serveur non valide. Si vous êtes l’administrateur, corrigez l’erreur ci-dessous",
+    "Your Riot is misconfigured": "Votre Riot est mal configuré"
 }
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -42,5 +42,10 @@
    "Create Account": "Fiók készítés",
    "Need help?": "Segíthetünk?",
    "Explore rooms": "Szobák felfedezése",
-    "Room Directory": "Szoba lista"
+    "Room Directory": "Szoba lista",
+    "Unexpected error preparing the app. See console for details.": "Váratlan hiba történt az alkalmazás előkészítésénél. A részletekért nézd meg a konzolt.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Érvénytelen konfiguráció: csak egyet lehet megadni a default_server_config, default_server_name és default_hs_url közül.",
+    "Invalid configuration: no default server specified.": "Érvénytelen konfiguráció: nincs megadva alapértelmezett szerver.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "A telepített Riotnak úgy tűnik hibás a szerver beállítása. Ha te vagy az adminisztrátor, kérlek javítsd az alábbi hibát",
+    "Your Riot is misconfigured": "A Riotod hibásan van beállítva"
 }
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -42,5 +42,9 @@
    "Create Account": "Crea account",
    "Need help?": "Serve aiuto?",
    "Explore rooms": "Esplora stanze",
-    "Room Directory": "Elenco stanze"
+    "Room Directory": "Elenco stanze",
+    "Unexpected error preparing the app. See console for details.": "Errore inaspettato preparando l'app. Vedi la console per i dettagli.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configurazione non valida: specificare solo uno di default_server_config, default_server_name, o default_hs_url.",
+    "Invalid configuration: no default server specified.": "Configurazione non valida: nessun server predefinito specificato.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Questa installazione di Riot sembra avere una configurazione server non valida. Se sei l'amministratore, correggi l'errore sottostante"
 }
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -41,5 +41,9 @@
    "Create Account": "Izveidot kontu",
    "Need help?": "Nepieciešama palīdzība?",
    "Explore rooms": "Atklāt istabas",
-    "Room Directory": "Istabu Katalogs"
+    "Room Directory": "Istabu Katalogs",
+    "Unexpected error preparing the app. See console for details.": "Negaidīta kļūda, sagatavojot lietotni. Sīkāku informāciju skatiet konsolē.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Šai Riot instalācijai ir nekorekta servera konfigurācija. Ja esat administrators, lūdzu, izlabojiet tālāk norādīto kļūdu",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Nederīga konfigurācija: var norādīt tikai vienu no default_server_config, default_server_name, vai default_hs_url.",
+    "Invalid configuration: no default server specified.": "Nekorekta konfigurācija: nav norādīts noklusējuma serveris."
 }
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -41,6 +41,11 @@
    "Sign In": "Aanmelden",
    "Create Account": "Account aanmaken",
    "Need help?": "Hulp nodig?",
-    "Explore rooms": "Kamers ontdekken",
-    "Room Directory": "Gesprekscatalogus"
+    "Explore rooms": "Gesprekken ontdekken",
+    "Room Directory": "Gesprekscatalogus",
+    "Unexpected error preparing the app. See console for details.": "Er is een onverwachte fout opgetreden bij het voorbereiden van de app. Bekijk de console voor details.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ongeldige configuratie: kan slechts één van default_server_config, default_server_name, of default_hs_url opgeven.",
+    "Invalid configuration: no default server specified.": "Ongeldige configuratie: geen standaardserver opgegeven.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "De serverconfiguratie van deze Riot-instantie lijkt ongeldig. Als u de beheerder bent, gelieve dan de fout hieronder te corrigeren",
+    "Your Riot is misconfigured": "Uw Riot is verkeerd geconfigureerd"
 }
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -38,9 +38,14 @@
    "Co-ordination for Riot translators": "Координационный чат для переводчиков Riot",
    "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 серверы, указав другой URL.\nЭто позволит использовать Riot с учетной записью Matrix, существующей на другом сервере.",
    "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.": "Также можно изменить сервер идентификации, но без возможности приглашать (или быть приглашённым) по адресу электронной почты.",
-    "Sign In": "Вход",
+    "Sign In": "Войти в систему",
    "Create Account": "Создать аккаунт",
    "Need help?": "Помочь?",
    "Room Directory": "Каталог комнат",
-    "Explore rooms": "Исследовать комнаты"
+    "Explore rooms": "Исследовать комнаты",
+    "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, кажется, имеет неверную конфигурацию сервера. Если вы являетесь администратором, пожалуйста, исправьте ошибку ниже",
+    "Your Riot is misconfigured": "Твой Riot неправильно настроен"
 }
--- a/src/i18n/strings/sco.json
+++ b/src/i18n/strings/sco.json
@@ -0,0 +1,3 @@
+{
+    "Unexpected error preparing the app. See console for details.": "Unexpectit error came up gittin the app set up. See the console? Mair details ur thare."
+}
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -42,5 +42,10 @@
    "Create Account": "Krijoni Llogari",
    "Need help?": "Ju duhet ndihmë?",
    "Explore rooms": "Eksploroni dhoma",
-    "Room Directory": "Listë Dhomash"
+    "Room Directory": "Listë Dhomash",
+    "Unexpected error preparing the app. See console for details.": "Gabim i papritur gjatë përgatitjes së aplikacionit. Për hollësi, shihni konsolën.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Formësim i pavlefshëm: mund të caktohet vetëm një prej default_server_config, default_server_name, ose default_hs_url.",
+    "Invalid configuration: no default server specified.": "Formësim i pavlefshëm: s’është caktuar shërbyes parazgjedhje.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Ky instalim i Riot-it duket se ka një formësim të pavlefshëm për shërbyesin. Nëse jeni një përgjegjës, ju lutemi, ndreqni gabimin më poshtë",
+    "Your Riot is misconfigured": "Riot-i juaj është i keqformësuar"
 }
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -37,10 +37,13 @@
    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Ви можете використовувати параметри користувача сервера для входа на другі сервера Matrix, вказав другий URL-адресу домашнього сервера. <br/>Це дозволяє використовувати Riot з обліковим записом Matrix який існує на другому домашньому сервері.<br/><br/>Окрім цього, можливо встановити ідентифікаційний сервер користувача, але ви не зможете запросити других користувачів та бути запрошенному  використовуючи адресу електронної пошти.",
    "Co-ordination for Riot translators": "Координаційний чат для перекладачів Riot",
    "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 сервери, вказавши інший URL. Це дозволить використовувати Riot з наявним обліковим записом Matrix на іншому сервері.",
-    "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 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.": "Ви також можете встановити власний сервер ідентифікації, але Ви не зможете запрошувати користувачів (або бути запрошеним самому) за адресою електронної пошти.",
    "Need help?": "Допомогти?",
    "Sign In": "Вхід",
    "Create Account": "Створити аккаунт",
    "Explore rooms": "Дослідити кімнати",
-    "Room Directory": "Каталог кімнат"
+    "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.": "Невірна конфігурація: не вказано сервер за замовчуванням."
 }
--- a/src/i18n/strings/vls.json
+++ b/src/i18n/strings/vls.json
@@ -0,0 +1,24 @@
+{
+    "Unexpected error preparing the app. See console for details.": "’t Es een onverwachte fout ipgetreedn by ’t voorbereiden van den app. Bekykt de console vo details.",
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "De serverconfiguroatie van deze Riot-instantie lykt oungeldig. A je gy den beheerder zyt, gelieve ton de foute hierounder te corrigeern",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Oungeldige configuroatie: kun slechts één van default_server_config, default_server_name, of default_hs_url ipgeevn.",
+    "Invalid configuration: no default server specified.": "Oungeldige configuroatie: geen standoardserver ipgegeevn.",
+    "Riot Desktop on %(platformName)s": "Riot Desktop ip %(platformName)s",
+    "Unknown device": "Ounbekend toestel",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s ip %(osName)s",
+    "You need to be using HTTPS to place a screen-sharing call.": "Je moet HTTPS gebruukn vo een iproep me schermdeeln te kunn startn.",
+    "powered by Matrix": "meuglik gemakt deur Matrix",
+    "Custom Server Options": "Angepaste serverinstelliengn",
+    "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.": "Je kut d’angepaste serverinstelliengn gebruukn vo jen an te melden by andere Matrix-servers, deur een andere thuusserver-URL in te geevn. Dit laat je toe van Riot te gebruukn met e bestoande Matrix-account by een andere thuusserver.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Je kut ook een angepaste identiteitsserver instelln, ma je goa geen gebruukers kunn uutnodign via e-mail, of zelve via e-mail uutgenodigd wirden.",
+    "Dismiss": "Afwyzn",
+    "Welcome to Riot.im": "Welgekommn by Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Gedecentraliseerd en versleuteld chattn &amp; soamenwerkn meuglijk gemakt deur [matrix]",
+    "Sign In": "Anmeldn",
+    "Create Account": "Account anmoakn",
+    "Need help?": "Hulp nodig?",
+    "Chat with Riot Bot": "Chattn me Riot-robot",
+    "Explore rooms": "Gesprekkn ountdekkn",
+    "Room Directory": "Gesprekscatalogus",
+    "Your Riot is misconfigured": "Je Riot is verkeerd geconfigureerd gewist"
+}
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -42,5 +42,10 @@
    "Create Account": "建立帳號",
    "Need help?": "需要協助？",
    "Explore rooms": "探索聊天室",
-    "Room Directory": "聊天室目錄"
+    "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 安裝似乎有無效的伺服器設定。如果您是管理員，請在下方更正錯誤",
+    "Your Riot is misconfigured": "您的 Riot 沒有設定好"
 }
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
-Copyright 2018 New Vector Ltd
+Copyright 2018, 2019 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.
@@ -45,6 +45,10 @@ import VectorConferenceHandler from 'matrix-react-sdk/lib/VectorConferenceHandle
 import Promise from 'bluebird';
 import request from 'browser-request';
 import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
+import {_t, _td, newTranslatableError} from 'matrix-react-sdk/lib/languageHandler';
+import AutoDiscoveryUtils from 'matrix-react-sdk/lib/utils/AutoDiscoveryUtils';
+import {AutoDiscovery} from "matrix-js-sdk/lib/autodiscovery";
+import * as Lifecycle from "matrix-react-sdk/lib/Lifecycle";

 import url from 'url';

@@ -341,22 +345,38 @@ async function loadApp() {
        const platform = PlatformPeg.get();
        platform.startUpdater();

-        const MatrixChat = sdk.getComponent('structures.MatrixChat');
-        window.matrixChat = ReactDOM.render(
-            <MatrixChat
-                onNewScreen={onNewScreen}
-                makeRegistrationUrl={makeRegistrationUrl}
-                ConferenceHandler={VectorConferenceHandler}
-                config={configJson}
-                realQueryParams={params}
-                startingFragmentQueryParams={fragparts.params}
-                enableGuest={!configJson.disable_guests}
-                onTokenLoginCompleted={onTokenLoginCompleted}
-                initialScreenAfterLogin={getScreenFromLocation(window.location)}
-                defaultDeviceDisplayName={platform.getDefaultDeviceDisplayName()}
-            />,
-            document.getElementById('matrixchat'),
-        );
+        // Don't bother loading the app until the config is verified
+        verifyServerConfig().then((newConfig) => {
+            const MatrixChat = sdk.getComponent('structures.MatrixChat');
+            window.matrixChat = ReactDOM.render(
+                <MatrixChat
+                    onNewScreen={onNewScreen}
+                    makeRegistrationUrl={makeRegistrationUrl}
+                    ConferenceHandler={VectorConferenceHandler}
+                    config={newConfig}
+                    realQueryParams={params}
+                    startingFragmentQueryParams={fragparts.params}
+                    enableGuest={!configJson.disable_guests}
+                    onTokenLoginCompleted={onTokenLoginCompleted}
+                    initialScreenAfterLogin={getScreenFromLocation(window.location)}
+                    defaultDeviceDisplayName={platform.getDefaultDeviceDisplayName()}
+                />,
+                document.getElementById('matrixchat'),
+            );
+        }).catch(err => {
+            console.error(err);
+
+            let errorMessage = err.translatedMessage
+                || _t("Unexpected error preparing the app. See console for details.");
+            errorMessage = <span>{errorMessage}</span>;
+
+            // Like the compatibility page, AWOOOOOGA at the user
+            const GenericErrorPage = sdk.getComponent("structures.GenericErrorPage");
+            window.matrixChat = ReactDOM.render(
+                <GenericErrorPage message={errorMessage} title={_t("Your Riot is misconfigured")} />,
+                document.getElementById('matrixchat'),
+            );
+        });
    } else {
        console.error("Browser is missing required features.");
        // take to a different landing page to AWOOOOOGA at the user
@@ -428,4 +448,99 @@ async function loadLanguage() {
    }
 }

+async function verifyServerConfig() {
+    let validatedConfig;
+    try {
+        console.log("Verifying homeserver configuration");
+
+        // Note: the query string may include is_url and hs_url - we only respect these in the
+        // context of email validation. Because we don't respect them otherwise, we do not need
+        // to parse or consider them here.
+
+        // Note: Although we throw all 3 possible configuration options through a .well-known-style
+        // verification, we do not care if the servers are online at this point. We do moderately
+        // care if they are syntactically correct though, so we shove them through the .well-known
+        // validators for that purpose.
+
+        const config = SdkConfig.get();
+        let wkConfig = config['default_server_config']; // overwritten later under some conditions
+        const serverName = config['default_server_name'];
+        const hsUrl = config['default_hs_url'];
+        const isUrl = config['default_is_url'];
+
+        const incompatibleOptions = [wkConfig, serverName, hsUrl].filter(i => !!i);
+        if (incompatibleOptions.length > 1) {
+            // noinspection ExceptionCaughtLocallyJS
+            throw newTranslatableError(_td(
+                "Invalid configuration: can only specify one of default_server_config, default_server_name, " +
+                "or default_hs_url.",
+            ));
+        }
+        if (incompatibleOptions.length < 1) {
+            // noinspection ExceptionCaughtLocallyJS
+            throw newTranslatableError(_td("Invalid configuration: no default server specified."));
+        }
+
+        if (hsUrl) {
+            console.log("Config uses a default_hs_url - constructing a default_server_config using this information");
+            console.warn(
+                "DEPRECATED CONFIG OPTION: In the future, default_hs_url will not be accepted. Please use " +
+                "default_server_config instead.",
+            );
+
+            wkConfig = {
+                "m.homeserver": {
+                    "base_url": hsUrl,
+                },
+            };
+            if (isUrl) {
+                wkConfig["m.identity_server"] = {
+                    "base_url": isUrl,
+                };
+            }
+        }
+
+        let discoveryResult = null;
+        if (wkConfig) {
+            console.log("Config uses a default_server_config - validating object");
+            discoveryResult = await AutoDiscovery.fromDiscoveryConfig(wkConfig);
+        }
+
+        if (serverName) {
+            console.log("Config uses a default_server_name - doing .well-known lookup");
+            console.warn(
+                "DEPRECATED CONFIG OPTION: In the future, default_server_name will not be accepted. Please " +
+                "use default_server_config instead.",
+            );
+            discoveryResult = await AutoDiscovery.findClientConfig(serverName);
+        }
+
+        validatedConfig = AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, discoveryResult, true);
+    } catch (e) {
+        const {hsUrl, isUrl, userId} = Lifecycle.getLocalStorageSessionVars();
+        if (hsUrl && userId) {
+            console.error(e);
+            console.warn("A session was found - suppressing config error and using the session's homeserver");
+
+            console.log("Using pre-existing hsUrl and isUrl: ", {hsUrl, isUrl});
+            validatedConfig = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl, true);
+        } else {
+            // the user is not logged in, so scream
+            throw e;
+        }
+    }
+
+
+    validatedConfig.isDefault = true;
+
+    // Just in case we ever have to debug this
+    console.log("Using homeserver config:", validatedConfig);
+
+    // Add the newly built config to the actual config for use by the app
+    console.log("Updating SdkConfig with validated discovery information");
+    SdkConfig.add({"validated_server_config": validatedConfig});
+
+    return SdkConfig.get();
+}
+
 loadApp();
--- a/src/vector/mobile_guide/index.html
+++ b/src/vector/mobile_guide/index.html
@@ -4,6 +4,11 @@

 <style type="text/css">

+/* By default, hide the custom IS stuff - enabled in JS */
+#custom_is, #is_url {
+    display: none;
+}
+
 body {
    background: #c5e0f7;
    background: -moz-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
@@ -109,6 +114,14 @@ body {
    margin: 20px;
 }

+.mx_HomePage_errorContainer {
+    display: none; /* shown in JS if needed */
+    margin: 20px;
+    border: 1px solid red;
+    background-color: #ffb9b9;
+    padding: 5px;
+}
+
 .mx_HomePage_container h1,
 .mx_HomePage_container h2,
 .mx_HomePage_container h3,
@@ -152,6 +165,10 @@ body {

 <body>

+  <div class="mx_HomePage_errorContainer">
+    <!-- populated by JS if needed -->
+  </div>
+
  <div class="mx_HomePage_container">
      <div class="mx_HomePage_col mx_HomePage_header">
          <a href="https://riot.im">
@@ -365,7 +382,9 @@ body {
              <p>Launch the app, and enable <strong>Use custom server options (advanced)</strong>.</p>
              <p class="mx_Spacer">In the homeserver field, enter:</p>
              <p><strong id="hs_url"></strong></p>
-              <p class="mx_Spacer"><em>Note: You shouldn&apos;t need to modify the identity server field, which by default is set to https://vector.im.</em></p>
+              <p class="mx_Spacer" id="default_is"><em>Note: You shouldn&apos;t need to modify the identity server field, which by default is set to https://vector.im.</em></p>
+              <p class="mx_Spacer" id="custom_is">In the identity server field, enter:</p>
+              <p><strong id="is_url"></strong></p>
          </div>
        </div>
      </div>
--- a/src/vector/mobile_guide/index.js
+++ b/src/vector/mobile_guide/index.js
@@ -6,19 +6,102 @@ function onBackToRiotClick() {
    window.location.href = '../';
 }

+// NEVER pass user-controlled content to this function! Hardcoded strings only please.
+function renderConfigError(message) {
+    const contactMsg = "If this is unexpected, please contact your system administrator " +
+        "or technical support representative.";
+    message = `<h2>Error loading Riot</h2><p>${message}</p><p>${contactMsg}</p>`;
+
+    const toHide = document.getElementsByClassName("mx_HomePage_container");
+    const errorContainers = document.getElementsByClassName("mx_HomePage_errorContainer");
+
+    for (const e of toHide) {
+        // We have to clear the content because .style.display='none'; doesn't work
+        // due to an !important in the CSS.
+        e.innerHTML = '';
+    }
+    for (const e of errorContainers) {
+        e.style.display = 'block';
+        e.innerHTML = message;
+    }
+}
+
 async function initPage() {
    document.getElementById('back_to_riot_button').onclick = onBackToRiotClick;

-    const config = await getVectorConfig('..');
-    let hsUrl;
-    if (config && config['default_hs_url']) {
-        hsUrl = config['default_hs_url'];
+    let config = await getVectorConfig('..');
+
+    // We manually parse the config similar to how validateServerConfig works because
+    // calling that function pulls in roughly 4mb of JS we don't use.
+
+    const wkConfig = config['default_server_config']; // overwritten later under some conditions
+    const serverName = config['default_server_name'];
+    const defaultHsUrl = config['default_hs_url'];
+    const defaultIsUrl = config['default_is_url'];
+
+    const incompatibleOptions = [wkConfig, serverName, defaultHsUrl].filter(i => !!i);
+    if (incompatibleOptions.length > 1) {
+        return renderConfigError(
+            "Invalid configuration: can only specify one of default_server_config, default_server_name, " +
+            "or default_hs_url.",
+        );
    }
+    if (incompatibleOptions.length < 1) {
+        return renderConfigError("Invalid configuration: no default server specified.");
+    }
+
+    let hsUrl = '';
+    let isUrl = '';
+
+    if (wkConfig && wkConfig['m.homeserver']) {
+        hsUrl = wkConfig['m.homeserver']['base_url'];
+
+        if (wkConfig['m.identity_server']) {
+            isUrl = wkConfig['m.identity_server']['base_url'];
+        }
+    }
+
+    if (serverName) {
+        // We also do our own minimal .well-known validation to avoid pulling in the js-sdk
+        try {
+            const result = await fetch(`https://${serverName}/.well-known/matrix/client`);
+            const wkConfig = await result.json();
+            if (wkConfig && wkConfig['m.homeserver']) {
+                hsUrl = wkConfig['m.homeserver']['base_url'];
+
+                if (wkConfig['m.identity_server']) {
+                    isUrl = wkConfig['m.identity_server']['base_url'];
+                }
+            }
+        } catch (e) {
+            console.error(e);
+            return renderConfigError("Unable to fetch homeserver configuration");
+        }
+    }
+
+    if (defaultHsUrl) {
+        hsUrl = defaultHsUrl;
+        isUrl = defaultIsUrl;
+    }
+
+    if (!hsUrl) {
+        return renderConfigError("Unable to locate homeserver");
+    }
+
    if (hsUrl && !hsUrl.endsWith('/')) hsUrl += '/';
-    if (hsUrl && hsUrl !== 'https://matrix.org/') {
+    if (isUrl && !isUrl.endsWith('/')) isUrl += '/';
+
+    if (hsUrl !== 'https://matrix.org/') {
        document.getElementById('step2_container').style.display = 'block';
-        document.getElementById('hs_url').innerHTML = hsUrl;
+        document.getElementById('hs_url').innerText = hsUrl;
        document.getElementById('step_login_header').innerHTML= 'Step 3: Register or Log in';
+
+        if (isUrl && isUrl !== "https://vector.im/") {
+            document.getElementById('default_is').style.display = 'none';
+            document.getElementById('custom_is').style.display = 'block';
+            document.getElementById('is_url').style.display = 'block';
+            document.getElementById('is_url').innerText = isUrl;
+        }
    }
 }

--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -141,14 +141,12 @@ export default class ElectronPlatform extends VectorBasePlatform {
        }

        // Notifications in Electron use the HTML5 notification API
-        const notification = new global.Notification(
-            title,
-            {
-                body: msg,
-                icon: avatarUrl,
-                silent: true, // we play our own sounds
-            },
-        );
+        const notifBody = {
+            body: msg,
+            silent: true, // we play our own sounds
+        };
+        if (avatarUrl) notifBody['icon'] = avatarUrl;
+        const notification = new global.Notification(title, notifBody);

        notification.onclick = () => {
            dis.dispatch({
--- a/src/vector/platform/WebPlatform.js
+++ b/src/vector/platform/WebPlatform.js
@@ -76,15 +76,13 @@ export default class WebPlatform extends VectorBasePlatform {
    }

    displayNotification(title: string, msg: string, avatarUrl: string, room: Object) {
-        const notification = new global.Notification(
-            title,
-            {
-                body: msg,
-                icon: avatarUrl,
-                tag: "vector",
-                silent: true, // we play our own sounds
-            },
-        );
+        const notifBody = {
+            body: msg,
+            tag: "vector",
+            silent: true, // we play our own sounds
+        };
+        if (avatarUrl) notifBody['icon'] = avatarUrl;
+        const notification = new global.Notification(title, notifBody);

        notification.onclick = function() {
            dis.dispatch({
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -37,6 +37,8 @@ const ReactDOM = require('react-dom');
 const ReactTestUtils = require('react-addons-test-utils');
 const expect = require('expect');
 import Promise from 'bluebird';
+import {makeType} from "matrix-react-sdk/lib/utils/TypeUtils";
+import {ValidatedServerConfig} from "matrix-react-sdk/lib/utils/AutoDiscoveryUtils";

 const test_utils = require('../test-utils');
 const MockHttpBackend = require('matrix-mock-request');
@@ -96,8 +98,20 @@ describe('joining a room', function() {

            PlatformPeg.set(new WebPlatform());

+            const config = {
+                validated_server_config: makeType(ValidatedServerConfig, {
+                    hsUrl: HS_URL,
+                    hsName: "TEST_ENVIRONMENT",
+                    hsNameIsDifferent: false, // yes, we lie
+                    isUrl: IS_URL,
+                    identityEnabled: true,
+                }),
+            };
+
            const mc = (
-                <MatrixChat config={{}}
+                <MatrixChat
+                    config={config}
+                    serverConfig={config.validated_server_config}
                    makeRegistrationUrl={()=>{throw new Error("unimplemented");}}
                    initialScreenAfterLogin={{
                        screen: 'directory',
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -39,6 +39,8 @@ import dis from 'matrix-react-sdk/lib/dispatcher';
 import * as test_utils from '../test-utils';
 import MockHttpBackend from 'matrix-mock-request';
 import {parseQs, parseQsFromFragment} from '../../src/vector/url_utils';
+import {makeType} from "matrix-react-sdk/lib/utils/TypeUtils";
+import {ValidatedServerConfig} from "matrix-react-sdk/lib/utils/AutoDiscoveryUtils";

 const DEFAULT_HS_URL='http://my_server';
 const DEFAULT_IS_URL='http://my_is';
@@ -146,6 +148,13 @@ describe('loading:', function() {
        const config = Object.assign({
            default_hs_url: DEFAULT_HS_URL,
            default_is_url: DEFAULT_IS_URL,
+            validated_server_config: makeType(ValidatedServerConfig, {
+                hsUrl: DEFAULT_HS_URL,
+                hsName: "TEST_ENVIRONMENT",
+                hsNameIsDifferent: false, // yes, we lie
+                isUrl: DEFAULT_IS_URL,
+                identityEnabled: true,
+            }),
            embeddedPages: {
                homeUrl: 'data:text/html;charset=utf-8;base64,PGh0bWw+PC9odG1sPg==',
            },
@@ -160,6 +169,7 @@ describe('loading:', function() {
                <MatrixChat
                    onNewScreen={onNewScreen}
                    config={config}
+                    serverConfig={config.validated_server_config}
                    realQueryParams={params}
                    startingFragmentQueryParams={fragParts.params}
                    enableGuest={true}
@@ -230,6 +240,10 @@ describe('loading:', function() {
                uriFragment: "#/room/!room:id",
            });

+            // Pass the liveliness checks
+            httpBackend.when("GET", "/versions").respond(200, {versions: ["r0.4.0"]});
+            httpBackend.when("GET", "/api/v1").respond(200, {});
+
            Promise.delay(1).then(() => {
                // at this point, we're trying to do a guest registration;
                // we expect a spinner
@@ -267,6 +281,10 @@ describe('loading:', function() {
                uriFragment: "#/login",
            });

+            // Pass the liveliness checks
+            httpBackend.when("GET", "/versions").respond(200, {versions: ["r0.4.0"]});
+            httpBackend.when("GET", "/api/v1").respond(200, {});
+
            return awaitLoginComponent(matrixChat).then(() => {
                // we expect a single <Login> component
                ReactTestUtils.findRenderedComponentWithType(
@@ -275,8 +293,13 @@ describe('loading:', function() {
                // the only outstanding request should be a GET /login
                // (in particular there should be no /register request for
                // guest registration).
+                const allowedRequests = [
+                    "/_matrix/client/r0/login",
+                    "/versions",
+                    "/api/v1",
+                ];
                for (const req of httpBackend.requests) {
-                    if (req.method === 'GET' && req.path.endsWith('/_matrix/client/r0/login')) {
+                    if (req.method === 'GET' && allowedRequests.find(p => req.path.endsWith(p))) {
                        continue;
                    }

@@ -377,6 +400,10 @@ describe('loading:', function() {
            });

            it('shows a login view', function() {
+                // Pass the liveliness checks
+                httpBackend.when("GET", "/versions").respond(200, {versions: ["r0.4.0"]});
+                httpBackend.when("GET", "/api/v1").respond(200, {});
+
                // we expect a single <Login> component
                ReactTestUtils.findRenderedComponentWithType(
                    matrixChat, sdk.getComponent('structures.auth.Login'),
@@ -385,8 +412,13 @@ describe('loading:', function() {
                // the only outstanding request should be a GET /login
                // (in particular there should be no /register request for
                // guest registration, nor /sync, etc).
+                const allowedRequests = [
+                    "/_matrix/client/r0/login",
+                    "/versions",
+                    "/api/v1",
+                ];
                for (const req of httpBackend.requests) {
-                    if (req.method === 'GET' && req.path.endsWith('/_matrix/client/r0/login')) {
+                    if (req.method === 'GET' && allowedRequests.find(p => req.path.endsWith(p))) {
                        continue;
                    }

@@ -395,6 +427,10 @@ describe('loading:', function() {
            });

            it('shows the homepage after login', function() {
+                // Pass the liveliness checks
+                httpBackend.when("GET", "/versions").respond(200, {versions: ["r0.4.0"]});
+                httpBackend.when("GET", "/api/v1").respond(200, {});
+
                return completeLogin(matrixChat).then(() => {
                    // we should see a home page, even though we previously had
                    // a stored mx_last_room_id
@@ -616,11 +652,21 @@ describe('loading:', function() {

    // check that we have a Login component, send a 'user:pass' login,
    // and await the HTTP requests.
-    function completeLogin(matrixChat) {
+    async function completeLogin(matrixChat) {
        // we expect a single <Login> component
        const login = ReactTestUtils.findRenderedComponentWithType(
            matrixChat, sdk.getComponent('structures.auth.Login'));

+        // When we switch to the login component, it'll hit the login endpoint
+        // for proof of life and to get flows. We'll only give it one option.
+        httpBackend.when('GET', '/login')
+            .respond(200, {"flows": [{"type": "m.login.password"}]});
+        httpBackend.flush(); // We already would have tried the GET /login request
+
+        // Give the component some time to finish processing the login flows before
+        // continuing.
+        await Promise.delay(100);
+
        httpBackend.when('POST', '/login').check(function(req) {
            expect(req.data.type).toEqual('m.login.password');
            expect(req.data.identifier.type).toEqual('m.id.user');
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -76,7 +76,7 @@ module.exports = {
                // lifetime for assets while still delivering changes quickly.
                oneOf: [
                    {
-                        // Images referenced in CSS files
+                        // Assets referenced in CSS files
                        issuer: /\.(scss|css)$/,
                        loader: 'file-loader',
                        options: {
@@ -92,11 +92,15 @@ module.exports = {
                        },
                    },
                    {
-                        // Images referenced in HTML and JS files
+                        // Assets referenced in HTML and JS files
                        loader: 'file-loader',
                        options: {
                            name: '[name].[hash:7].[ext]',
                            outputPath: getImgOutputPath,
+                            publicPath: function(url, resourcePath) {
+                                const outputPath = getImgOutputPath(url, resourcePath);
+                                return toPublicPath(outputPath);
+                            },
                        },
                    },
                ],
--- a/yarn.lock
+++ b/yarn.lock
@@ -441,44 +441,39 @@ anymatch@^2.0.0:
    micromatch "^3.1.4"
    normalize-path "^2.1.1"

-app-builder-bin@2.6.4:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.4.tgz#011cd9e7e144d52b43fffa15aff8039804d3078a"
-  integrity sha512-wC9HYqiC1XqpunT/9y2VuF90KbarnIHL90Tv8BD3TITTgbVIdRTXAsvWvmaR/ImvAX0+l5Z3jZtXjdJ7Pw3bLQ==
-
 app-builder-bin@2.6.6:
  version "2.6.6"
  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.6.tgz#904b0576a510047d03f63c8a02c38eef47871180"
  integrity sha512-G0Ee6xkbxV+fvM/7xXWIgSDjWAD4E/d/aNbxerq/TVsCyBIau/0VPmrEqBMyZv0NbTwLDW5aF/yHG+0ZEY77kA==

-app-builder-lib@20.39.0, app-builder-lib@~20.39.0:
-  version "20.39.0"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.39.0.tgz#197faba9cd7c32005d3882e6add051c4e182fdc3"
-  integrity sha512-lkxGyBrQwueYb3ViqHt5WjyzVVBQqXMXc7TF+JqkuuUWp5DF7SXAYZYd+rsR3gmCbdNxw4SPIEmWmm+I9LK2gw==
+app-builder-lib@20.40.2, app-builder-lib@~20.40.0:
+  version "20.40.2"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.40.2.tgz#b0f0c82ed6a59bf660d861531b063a99d3e2b442"
+  integrity sha512-SAbfua8+L3pFbQp3QFpKV0PzHJPJqepROeX/FPrfdL02zxlw+BVOe6KfC3+UV6XUombWvVPG+SwG956vfIx/Cw==
  dependencies:
    "7zip-bin" "~4.1.0"
-    app-builder-bin "2.6.4"
+    app-builder-bin "2.6.6"
    async-exit-hook "^2.0.1"
    bluebird-lst "^1.0.7"
-    builder-util "9.7.0"
-    builder-util-runtime "8.2.0"
+    builder-util "9.7.1"
+    builder-util-runtime "8.2.1"
    chromium-pickle-js "^0.2.0"
    debug "^4.1.1"
    ejs "^2.6.1"
    electron-osx-sign "0.4.11"
-    electron-publish "20.39.0"
+    electron-publish "20.40.0"
    fs-extra-p "^7.0.1"
    hosted-git-info "^2.7.1"
    is-ci "^2.0.0"
    isbinaryfile "^4.0.0"
-    js-yaml "^3.12.1"
+    js-yaml "^3.13.0"
    lazy-val "^1.0.4"
    minimatch "^3.0.4"
    normalize-package-data "^2.5.0"
    plist "^3.0.1"
    read-config-file "3.2.2"
    sanitize-filename "^1.6.1"
-    semver "^5.6.0"
+    semver "^6.0.0"
    temp-file "^3.3.2"

 aproba@^1.0.3, aproba@^1.1.1:
@@ -1607,13 +1602,13 @@ blob@0.0.5:
  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==

 bluebird-lst@^1.0.6, bluebird-lst@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.7.tgz#f0babade9ef1dce3989b603f3796ff3b16b90d50"
-  integrity sha512-5ix04IbXVIZ6nSRM4aZnwQfk40Td0D57WAl8LfhnICF6XwT4efCZYh0veOHvfDmgpbqE4ju5L5XEAMIcAe13Kw==
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.8.tgz#61b572e8b3eb57e0fff676a0e54566d93597e6a4"
+  integrity sha512-InUDOaBaIjIobOa3O4YRAbFgff907uTJZXW0m0rhk3zhVZ4GvsmdCLEAKC1CTWTtUWCM8iWTTfFX9N/xQR/etw==
  dependencies:
-    bluebird "^3.5.3"
+    bluebird "^3.5.4"

-bluebird@^3.3.0, bluebird@^3.5.0, bluebird@^3.5.2, bluebird@^3.5.3:
+bluebird@^3.3.0, bluebird@^3.5.0, bluebird@^3.5.2, bluebird@^3.5.3, bluebird@^3.5.4:
  version "3.5.4"
  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
  integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==
@@ -1879,17 +1874,7 @@ buffer@^5.1.0:
    base64-js "^1.0.2"
    ieee754 "^1.1.4"

-builder-util-runtime@8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.2.0.tgz#e64c311b4f3643c8ccd8b8e5ba5bfb10801a6826"
-  integrity sha512-2Q3YrxANTrDs2NjSG5mbNGLPuUhPnSNYF9w5i4jWfHcNfQ3TgRrGXq4UfnkCiZVX8Axp4eAOSscaLLScKp/XLg==
-  dependencies:
-    bluebird-lst "^1.0.7"
-    debug "^4.1.1"
-    fs-extra-p "^7.0.1"
-    sax "^1.2.4"
-
-builder-util-runtime@^8.2.0, builder-util-runtime@^8.2.1:
+builder-util-runtime@8.2.1:
  version "8.2.1"
  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.2.1.tgz#2d16be6cb040b3654d84b76487256158e60b6e3b"
  integrity sha512-2TkeTcI9bDlK5azRZSJJNxhAgW1DK+JY3jHK0UWPxgJcan4GZSVDNNO3sXntNxrp+JAdPHMF14rzNd/G53lvqw==
@@ -1899,25 +1884,17 @@ builder-util-runtime@^8.2.0, builder-util-runtime@^8.2.1:
    fs-extra-p "^7.0.1"
    sax "^1.2.4"

-builder-util@9.7.0:
-  version "9.7.0"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.7.0.tgz#7aabec1136bf646023f2ebe231a26e82bb9d42cf"
-  integrity sha512-QA2RxbaSKvaFVNGcYsjmlkTn03tcdPxgIxHCOgw38G7NK91QWc76RBY9+T1sU8BLVEZJ4qNRWx+pd5rG9tTi+Q==
+builder-util-runtime@^8.2.1:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.2.2.tgz#2b4b5c86cfb8b55b5a19ab90f1a39bdd6ac6f33e"
+  integrity sha512-Z0NKlpa5VQBMVXAcZH9n4dx+CY5Ckyv7a0Yr/is1h5hwCWaJbQ2JN9PGT7g6YzE5gM3FyrgGDB4DTyJlLcRKNw==
  dependencies:
-    "7zip-bin" "~4.1.0"
-    app-builder-bin "2.6.4"
    bluebird-lst "^1.0.7"
-    builder-util-runtime "^8.2.0"
-    chalk "^2.4.2"
    debug "^4.1.1"
    fs-extra-p "^7.0.1"
-    is-ci "^2.0.0"
-    js-yaml "^3.12.1"
-    source-map-support "^0.5.10"
-    stat-mode "^0.2.2"
-    temp-file "^3.3.2"
+    sax "^1.2.4"

-builder-util@~9.7.0, builder-util@~9.7.1:
+builder-util@9.7.1, builder-util@~9.7.1:
  version "9.7.1"
  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.7.1.tgz#31234b48ac574eb1cd4b4eaa982c0480571eae7a"
  integrity sha512-txpzYIeuHFjrOQWPTJDvhJYisIVGJdSG9ppccE+y7agT0YNhBlVHGnd8+HgFTajYE34xzB5zf1/zxiiDqSKSpA==
@@ -2186,6 +2163,15 @@ cliui@^4.0.0:
    strip-ansi "^4.0.0"
    wrap-ansi "^2.0.0"

+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
 code-point-at@^1.0.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -2877,17 +2863,17 @@ direction@^0.1.5:
  resolved "https://registry.yarnpkg.com/direction/-/direction-0.1.5.tgz#ce5d797f97e26f8be7beff53f7dc40e1c1a9ec4c"
  integrity sha1-zl15f5fib4vnvv9T99xA4cGp7Ew=

-dmg-builder@6.6.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.6.0.tgz#301ae1239d3328864ae1419c1ff744b599a208d3"
-  integrity sha512-voodd3qdpdRiaciFZTfrFq/e82UPmUqSJq6R3Wc2Ql6XqXYLQcKo1h9rSZiivwls8PqE4Mk1IHTIOwmvJaq+MA==
+dmg-builder@6.6.1:
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.6.1.tgz#d1761e36e624ebe3f6c57a8c4d728b95b51fb255"
+  integrity sha512-aIbpQG3es+gHTFtsBQE4fmSYVM60yewxJZsN6FhkAmAmNaoO45bEQNJZsRX0YE49+imiSC92mJmFAEP6iKE0Tg==
  dependencies:
-    app-builder-lib "~20.39.0"
+    app-builder-lib "~20.40.0"
    bluebird-lst "^1.0.7"
-    builder-util "~9.7.0"
+    builder-util "~9.7.1"
    fs-extra-p "^7.0.1"
    iconv-lite "^0.4.24"
-    js-yaml "^3.12.1"
+    js-yaml "^3.13.0"
    parse-color "^1.0.0"
    sanitize-filename "^1.6.1"

@@ -3061,23 +3047,23 @@ electron-builder-squirrel-windows@^20.38.5:
    "7zip-bin" "~4.0.2"

 electron-builder@^20.38.5:
-  version "20.39.0"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.39.0.tgz#ab2f5b556f36dea3947eb43ef312a955ba7f9d16"
-  integrity sha512-50SNZ/G+iE9MpTwxzeHt1Cqg8jZKeFLuJ9wubR4e/8VIzAe0ERUmwAQw+77UrlwXZD/PKKoYblc0Sr08Vm4exg==
+  version "20.40.2"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.40.2.tgz#434751bbb57be17513eb501848a52d2573a307bb"
+  integrity sha512-hnnBzyLXna+WpmT4MIoWVdRli43q09yqKOgzPJj0KrOoJZ7TIoY1aYSPvSg8VL5rSuTgdAWGL4rYd9zcq3YXMQ==
  dependencies:
-    app-builder-lib "20.39.0"
+    app-builder-lib "20.40.2"
    bluebird-lst "^1.0.7"
-    builder-util "9.7.0"
-    builder-util-runtime "8.2.0"
+    builder-util "9.7.1"
+    builder-util-runtime "8.2.1"
    chalk "^2.4.2"
-    dmg-builder "6.6.0"
+    dmg-builder "6.6.1"
    fs-extra-p "^7.0.1"
    is-ci "^2.0.0"
    lazy-val "^1.0.4"
    read-config-file "3.2.2"
    sanitize-filename "^1.6.1"
    update-notifier "^2.5.0"
-    yargs "^13.2.1"
+    yargs "^13.2.2"

 electron-devtools-installer@^2.2.4:
  version "2.2.4"
@@ -3101,18 +3087,18 @@ electron-osx-sign@0.4.11:
    minimist "^1.2.0"
    plist "^3.0.1"

-electron-publish@20.39.0:
-  version "20.39.0"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.39.0.tgz#a945d871b469b4160933d4e027612710b653f006"
-  integrity sha512-PWrGUru994CSmtsA56GnjyLB3EnIS3zyEmrW0hDXtwuctZLGMnrxjK/7WEORYkgTQ/GufD5b/8T05Q2Kr42nqQ==
+electron-publish@20.40.0:
+  version "20.40.0"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.40.0.tgz#156eacd9b8bab563a3f8723e9b45214915a9681d"
+  integrity sha512-mkjtsIgftRszuT/8do8TszmddokDnu254OyTeL8nE780o/A8t68oXHZzvlTJ4AQ8uBOYrA87JDO/BFCWjnVArA==
  dependencies:
    bluebird-lst "^1.0.7"
-    builder-util "~9.7.0"
-    builder-util-runtime "^8.2.0"
+    builder-util "~9.7.1"
+    builder-util-runtime "^8.2.1"
    chalk "^2.4.2"
    fs-extra-p "^7.0.1"
    lazy-val "^1.0.4"
-    mime "^2.4.0"
+    mime "^2.4.1"

 electron-to-chromium@^1.2.7:
  version "1.3.130"
@@ -5742,10 +5728,10 @@ math-random@^1.0.1:
  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==

-matrix-js-sdk@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.0.0.tgz#1bbca0170c190a42eeda739f52f2995b446225ee"
-  integrity sha512-2/NV9hepV8QnX3xl1oaS7VS9tqsBKqCh9/pp+dAYFMA1A5PJACMFjE2M1KnW3JvHH+uDvag4fa7rraMwwGOK+A==
+matrix-js-sdk@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.0.1.tgz#e9691c7fc142793aa8cd79e92d45698bcc5da8c4"
+  integrity sha512-+yj9fBdIE65v1+46TL/eLQGohtNZGBEtOD1n3nTAVBMogyVb2bpUWnqTli0ghiOCG9MKq7tWi+G4bDBTABxuxA==
  dependencies:
    another-json "^0.2.0"
    babel-runtime "^6.26.0"
@@ -5766,10 +5752,10 @@ matrix-mock-request@^1.2.3:
    bluebird "^3.5.0"
    expect "^1.20.2"

-matrix-react-sdk@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.1.tgz#18eb0fc54f4c12a6f2ab15f0920c891d12d55981"
-  integrity sha512-5uiwOsVTJ6uwWKzlK1Q7o95L8s+gmm5wpAXywCduCYODjINLb3d66rToLxYCsznd/qO4aAUvLT3xPSXt97ha9Q==
+matrix-react-sdk@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.2.tgz#09e9eae3ec3b9ef324934b69275066c667fa8a1b"
+  integrity sha512-K7cBzturO5+4jWWnqtuqfqHrZXuq6ckyWY/UxbNbCdsvRsO4UZz7tGBy9QSEMKhiHkqkgCaOWfSjgFgjFmCrjQ==
  dependencies:
    babel-plugin-syntax-dynamic-import "^6.18.0"
    babel-runtime "^6.26.0"
@@ -5796,7 +5782,7 @@ matrix-react-sdk@1.2.1:
    linkifyjs "^2.1.6"
    lodash "^4.13.1"
    lolex "2.3.2"
-    matrix-js-sdk "2.0.0"
+    matrix-js-sdk "2.0.1"
    optimist "^0.6.1"
    pako "^1.0.5"
    png-chunks-extract "^1.0.0"
@@ -5953,11 +5939,16 @@ mime@1.4.1:
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==

-mime@^2.3.1, mime@^2.4.0:
+mime@^2.3.1:
  version "2.4.2"
  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.2.tgz#ce5229a5e99ffc313abac806b482c10e7ba6ac78"
  integrity sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==

+mime@^2.4.1:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.3.tgz#229687331e86f68924e6cb59e1cdd937f18275fe"
+  integrity sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==
+
 mimic-fn@^1.0.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -7663,13 +7654,20 @@ resolve-url@^0.2.1:
  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=

-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.1:
  version "1.10.1"
  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.1.tgz#664842ac960795bbe758221cdccda61fb64b5f18"
  integrity sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==
  dependencies:
    path-parse "^1.0.6"

+resolve@^1.10.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232"
+  integrity sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==
+  dependencies:
+    path-parse "^1.0.6"
+
 restore-cursor@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -7824,9 +7822,9 @@ semver-diff@^2.0.0:
  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==

 semver@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
-  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.0.tgz#e95dc415d45ecf03f2f9f83b264a6b11f49c0cca"
+  integrity sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==

 send@0.16.2:
  version "0.16.2"
@@ -8178,7 +8176,7 @@ source-map-support@^0.4.15:
  dependencies:
    source-map "^0.5.6"

-source-map-support@^0.5.10, source-map-support@^0.5.11, source-map-support@~0.5.10:
+source-map-support@^0.5.11, source-map-support@~0.5.10:
  version "0.5.12"
  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
@@ -8302,11 +8300,6 @@ ssri@^6.0.1:
  dependencies:
    figgy-pudding "^3.5.1"

-stat-mode@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
-  integrity sha1-5sgLYjEj19gM8TLOU480YokHJQI=
-
 stat-mode@^0.3.0:
  version "0.3.0"
  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.3.0.tgz#69283b081f851582b328d2a4ace5f591ce52f54b"
@@ -8394,7 +8387,7 @@ string-width@^1.0.1:
    is-fullwidth-code-point "^2.0.0"
    strip-ansi "^4.0.0"

-string-width@^3.0.0:
+string-width@^3.0.0, string-width@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
@@ -8436,7 +8429,7 @@ strip-ansi@^4.0.0:
  dependencies:
    ansi-regex "^3.0.0"

-strip-ansi@^5.1.0:
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
  version "5.2.0"
  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -9249,6 +9242,15 @@ wrap-ansi@^2.0.0:
    string-width "^1.0.1"
    strip-ansi "^3.0.1"

+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
 wrappy@1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -9327,10 +9329,10 @@ yargs-parser@^11.1.1:
    camelcase "^5.0.0"
    decamelize "^1.2.0"

-yargs-parser@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
-  integrity sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==
+yargs-parser@^13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f"
+  integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==
  dependencies:
    camelcase "^5.0.0"
    decamelize "^1.2.0"
@@ -9353,12 +9355,12 @@ yargs@12.0.5, yargs@^12.0.1, yargs@^12.0.5:
    y18n "^3.2.1 || ^4.0.0"
    yargs-parser "^11.1.1"

-yargs@^13.2.1:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
-  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
+yargs@^13.2.1, yargs@^13.2.2:
+  version "13.2.4"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
+  integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
  dependencies:
-    cliui "^4.0.0"
+    cliui "^5.0.0"
    find-up "^3.0.0"
    get-caller-file "^2.0.1"
    os-locale "^3.1.0"
@@ -9368,7 +9370,7 @@ yargs@^13.2.1:
    string-width "^3.0.0"
    which-module "^2.0.0"
    y18n "^4.0.0"
-    yargs-parser "^13.0.0"
+    yargs-parser "^13.1.0"

 yeast@0.1.2:
  version "0.1.2"
Author	SHA1	Message	Date
RiotRobot	672cf1a46e	v1.2.2	2019-06-19 16:00:42 +01:00
RiotRobot	5f7ee3f4ee	Prepare changelog for v1.2.2	2019-06-19 16:00:42 +01:00
RiotRobot	80262314f3	v1.2.2	2019-06-19 15:59:10 +01:00
RiotRobot	48b6f8c954	Released js-sdk & react-sdk	2019-06-19 15:55:02 +01:00
RiotRobot	db77d91500	v1.2.2-rc.2	2019-06-18 16:02:21 +01:00
RiotRobot	290a99ba85	Prepare changelog for v1.2.2-rc.2	2019-06-18 16:02:21 +01:00
RiotRobot	a86f1e8a90	v1.2.2-rc.2	2019-06-18 15:58:36 +01:00
RiotRobot	589aa19246	js-sdk & react-sdk rc.2	2019-06-18 15:57:30 +01:00
RiotRobot	9af5aea687	v1.2.2-rc.1	2019-06-12 12:12:17 +01:00
RiotRobot	a413621efc	Prepare changelog for v1.2.2-rc.1	2019-06-12 12:12:16 +01:00
RiotRobot	b751383702	v1.2.2-rc.1	2019-06-12 12:11:12 +01:00
RiotRobot	974da9947c	js-sdk & react-sdk rc.1	2019-06-12 12:10:37 +01:00
David Baker	8458aa7978	Merge pull request #10012 from RiotTranslateBot/weblate-riot-web-riot-web Update from Weblate	2019-06-11 14:06:29 +01:00
David Baker	dfb7c163a0	electron 4.2.4	2019-06-11 14:03:05 +01:00
Walter	504133fa1b	Translated using Weblate (Russian) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/	2019-06-11 12:06:04 +00:00
Tirifto	7a8f2cf8cd	Translated using Weblate (Esperanto) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/	2019-06-11 12:06:04 +00:00
Osoitz	9554a39a77	Translated using Weblate (Basque) Currently translated at 95.2% (20 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/	2019-06-11 12:06:04 +00:00
Besnik Bleta	bea7eff017	Translated using Weblate (Albanian) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sq/	2019-06-09 11:06:01 +00:00
Weblate	3f6aef16eb	Merge branch 'origin/develop' into Weblate.	2019-06-07 19:43:22 +00:00
Nathan Follens	662d21d1aa	Translated using Weblate (West Flemish) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/vls/	2019-06-07 19:43:22 +00:00
Szimszon	10b2156b12	Translated using Weblate (Hungarian) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/	2019-06-07 19:43:22 +00:00
Kévin C	96870367cf	Translated using Weblate (French) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/	2019-06-07 19:43:22 +00:00
Nathan Follens	f414030e87	Translated using Weblate (Dutch) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/	2019-06-07 19:43:22 +00:00
Jeff Huang	4d6534bfe7	Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/	2019-06-07 19:43:22 +00:00
J. Ryan Stinnett	a00bceaff7	Merge pull request #9982 from vector-im/jryans/funding Add funding details for GitHub sponsor button	2019-06-07 20:43:18 +01:00
Weblate	5ef2f185ad	Merge branch 'origin/develop' into Weblate.	2019-06-07 13:43:56 +00:00
Travis Ralston	f5e5ad9670	Merge pull request #9960 from vector-im/travis/fail-fast-but-not-too-fast Do not fail on server liveliness checks during startup	2019-06-07 07:43:51 -06:00
J. Ryan Stinnett	1d316044a7	Add funding details for GitHub sponsor button	2019-06-07 11:44:26 +01:00
Edgars Voroboks	d3dc6f42d1	Translated using Weblate (Latvian) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lv/	2019-06-06 07:19:38 +00:00
Mani Farone	9ca7d1bf56	Translated using Weblate (Bulgarian) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/	2019-06-06 07:19:38 +00:00
Slavi Pantaleev	f40226459b	Translated using Weblate (Bulgarian) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/	2019-06-06 07:19:38 +00:00
Travis Ralston	490595cb35	Use new copy for big red box	2019-06-05 11:32:33 -06:00
Travis Ralston	c68a621a71	Fix tests for liveliness checks	2019-06-05 09:53:22 -06:00
Travis Ralston	8ec1c1c29a	Merge pull request #9957 from vector-im/travis/no-button-guest Hide guest functions on the welcome page if not logged in	2019-06-05 07:24:09 -06:00
Travis Ralston	42be1d633c	Do not fail on server liveliness checks during startup Also warn about deprecated config option usage. See https://github.com/vector-im/riot-web/issues/9828	2019-06-04 23:44:33 -06:00
Travis Ralston	608efaaae3	Hide guest functions on the welcome page if not logged in Fixes https://github.com/vector-im/riot-web/issues/9546	2019-06-04 16:04:49 -06:00
J. Ryan Stinnett	428960aff2	Merge pull request #9953 from vector-im/jryans/add-langs-2019-06 Add Albanian and West Flemish languages	2019-06-04 18:04:43 +01:00
J. Ryan Stinnett	aaceaf097c	Add Albanian language	2019-06-04 17:45:59 +01:00
J. Ryan Stinnett	1c42ee1a30	Add West Flemish language	2019-06-04 17:43:28 +01:00
J. Ryan Stinnett	352e5918b6	Merge pull request #9951 from RiotTranslateBot/weblate-riot-web-riot-web Update from Weblate	2019-06-04 17:32:18 +01:00
Nathan Follens	858229aaf8	Translated using Weblate (West Flemish) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/vls/	2019-06-04 16:31:07 +00:00
Nathan Follens	7c3d3319c1	Translated using Weblate (West Flemish) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/vls/	2019-06-04 14:19:36 +00:00
Marco Cafolla	30307a8ae2	Translated using Weblate (Scots) Currently translated at 4.8% (1 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sco/	2019-06-04 14:19:36 +00:00
Walter	a7d06eee2d	Translated using Weblate (Russian) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/	2019-06-04 14:19:35 +00:00
random	10affe0d9c	Translated using Weblate (Italian) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/	2019-06-04 14:19:35 +00:00
Walter	6549ce57e6	Translated using Weblate (German) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/	2019-06-04 14:19:35 +00:00
Nathan Follens	dd636c1654	Translated using Weblate (Dutch) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/	2019-06-04 14:19:35 +00:00
Jeff Huang	4c43f7d102	Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/	2019-06-04 14:19:35 +00:00
Besnik Bleta	6ea8c95c8c	Translated using Weblate (Albanian) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sq/	2019-06-04 14:19:35 +00:00
Nathan Follens	5cf6cef49d	Added translation using Weblate (West Flemish)	2019-06-03 10:22:59 +00:00
Marco Cafolla	786e9bafc8	Added translation using Weblate (Scots)	2019-06-02 00:25:01 +00:00
Weblate	51f92b1eb4	Merge branch 'origin/develop' into Weblate.	2019-06-01 18:11:30 +00:00
Szimszon	261bbea934	Translated using Weblate (Hungarian) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/	2019-06-01 18:11:30 +00:00
Kévin C	a4b5c233b7	Translated using Weblate (French) Currently translated at 100.0% (21 of 21 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/	2019-06-01 18:11:30 +00:00
Travis Ralston	29eeb1eaf3	Merge pull request #9927 from vector-im/travis/default-country-code Add docs for defaultCountryCode	2019-06-01 12:11:26 -06:00
Travis Ralston	cafae31827	Add docs for defaultCountryCode	2019-05-31 21:23:58 -06:00
Weblate	a38e5bde3a	Merge branch 'origin/develop' into Weblate.	2019-05-31 17:03:43 +00:00
Travis Ralston	1459bfe7be	Merge pull request #9892 from vector-im/travis/check-login-for-config Use the user's pre-existing HS when config validation fails	2019-05-31 11:03:38 -06:00
Travis Ralston	81ec75f81d	Change warning message	2019-05-31 10:44:20 -06:00
Weblate	86515e6814	Merge branch 'origin/develop' into Weblate.	2019-05-31 11:02:14 +00:00
RiotRobot	ada47d476c	Merge branch 'master' into develop	2019-05-31 12:02:00 +01:00
Weblate	b62c1277e5	Merge branch 'origin/develop' into Weblate.	2019-05-31 08:57:05 +00:00
Jeff Huang	688d73b143	Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (20 of 20 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/	2019-05-31 08:57:05 +00:00
J. Ryan Stinnett	f4192e4f9d	Merge pull request #9909 from vector-im/matthew/low_bandwidth Low bandwidth mode	2019-05-31 09:56:59 +01:00
Travis Ralston	c5461b4509	Don't try and render null avatars in desktop notifications as much fun as http://localhost:8080/null is to see	2019-05-30 20:04:16 -06:00
Travis Ralston	98f2d865b9	Add 'showLabsSettings' flag to docs+sample config	2019-05-30 20:03:42 -06:00
IevgenVovk	bba3fc01c9	Translated using Weblate (Ukrainian) Currently translated at 100.0% (20 of 20 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/	2019-05-30 20:19:28 +00:00
Walter	ed065fa43d	Translated using Weblate (German) Currently translated at 100.0% (20 of 20 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/	2019-05-30 20:19:28 +00:00
Travis Ralston	52c3ff02ae	appease the linter	2019-05-29 12:12:12 -06:00
Travis Ralston	48a634bff4	Use the user's pre-existing HS when config validation fails Only applies if the user appears to be logged in. If the user is not logged in, we scream loudly. This is a temporary measure for https://github.com/vector-im/riot-web/issues/9828 Fixes https://github.com/vector-im/riot-web/issues/9835	2019-05-29 12:07:31 -06:00
Weblate	bf7d059472	Merge branch 'origin/develop' into Weblate.	2019-05-29 15:27:56 +00:00
Walter	3e5bd82434	Translated using Weblate (Russian) Currently translated at 100.0% (20 of 20 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/	2019-05-29 15:27:56 +00:00
RiotRobot	fcf8e246cf	Merge branch 'master' into develop	2019-05-29 16:27:46 +01:00
Weblate	306479a77f	Merge branch 'origin/develop' into Weblate.	2019-05-28 17:25:42 +00:00
Nathan Follens	bc264ceaaf	Translated using Weblate (Dutch) Currently translated at 100.0% (20 of 20 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/	2019-05-28 17:25:42 +00:00
J. Ryan Stinnett	53d8341886	Merge pull request #9869 from vector-im/jryans/twemoji-windows Fix Twemoji loading on Windows dev machines	2019-05-28 18:25:38 +01:00
J. Ryan Stinnett	95d36c1f29	Fix Twemoji loading on Windows dev machines This corrects our path handling on Windows development machines for paths referenced in JS and HTML files. Both images and fonts (like Twemoji) were afflicted (with Windows-style backslash path delimiters), but browsers seems to tolerate them in the `src` attribute of images, so we didn't notice that variant before.	2019-05-28 14:31:42 +01:00
Weblate	ba14b27e9a	Merge branch 'origin/develop' into Weblate.	2019-05-27 17:41:23 +00:00
Walter	d5dc7334a1	Translated using Weblate (Russian) Currently translated at 100.0% (20 of 20 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/	2019-05-27 17:41:22 +00:00
Travis Ralston	982416b3f7	Merge pull request #9848 from spantaleev/make-docker-image-smaller Base Docker image on nginx:alpine, not the larger nginx:latest	2019-05-27 11:41:18 -06:00
Besnik Bleta	a11ae18577	Translated using Weblate (Albanian) Currently translated at 100.0% (20 of 20 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sq/	2019-05-27 12:19:23 +00:00
Slavi Pantaleev	4e63e3b0de	Base Docker image on nginx:alpine, not the larger nginx:latest `nginx:latest` is based on Debian Stretch and is listed as being 45MB, while `nginx:alpine` is based on Alpine 3.9 and is just 7MB. Basing the riot-web Docker image on `nginx:alpine` should make it 38MB smaller compared to the current situation. The nginx version seems to be "latest mainline" on both (currently 1.15.12), judging by each Dockerfile: - `e5123eea0d/mainline/stretch/Dockerfile` - `e5123eea0d/mainline/alpine/Dockerfile`	2019-05-27 11:57:37 +03:00
random	7ea1193015	Translated using Weblate (Italian) Currently translated at 100.0% (20 of 20 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/	2019-05-26 07:19:22 +00:00
Szimszon	5b69e7268e	Translated using Weblate (Hungarian) Currently translated at 100.0% (20 of 20 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/	2019-05-26 07:19:22 +00:00
Kévin C	1e61918d1c	Translated using Weblate (French) Currently translated at 100.0% (20 of 20 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/	2019-05-26 07:19:22 +00:00
Tirifto	ee67cf7d49	Translated using Weblate (Esperanto) Currently translated at 100.0% (20 of 20 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/	2019-05-26 07:19:22 +00:00
wonx	58f20b4fe5	Translated using Weblate (Catalan) Currently translated at 90.0% (18 of 20 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/	2019-05-26 07:19:22 +00:00
Mani Farone	9525989560	Translated using Weblate (Bulgarian) Currently translated at 100.0% (20 of 20 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/	2019-05-26 07:19:22 +00:00
Slavi Pantaleev	c600f328a1	Translated using Weblate (Bulgarian) Currently translated at 100.0% (20 of 20 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/	2019-05-26 07:19:22 +00:00
J. Ryan Stinnett	28ffca1f84	Ignore /electron_app/pub	2019-05-24 11:34:03 +01:00
J. Ryan Stinnett	e129db4978	Upgrade electron-builder	2019-05-24 11:29:02 +01:00
J. Ryan Stinnett	734d8a8151	Clarify Electron steps	2019-05-24 11:28:12 +01:00
Travis Ralston	afdaca0515	Merge pull request #9779 from vector-im/travis/feature/wellknown2 Validate homeserver configuration prior to loading the app	2019-05-23 10:56:19 -06:00
Travis Ralston	26d8056755	Merge branch 'develop' into travis/feature/wellknown2	2019-05-22 23:06:09 -06:00
Travis Ralston	b772bc75a9	Update copyright	2019-05-22 22:57:39 -06:00
Travis Ralston	fa9d2a81a3	Merge branch 'develop' into travis/feature/wellknown2	2019-05-20 19:48:54 -06:00
Travis Ralston	7a65dc96cd	Merge pull request #9726 from vector-im/travis/wk/mobileguide Show resolved homeserver configuration on the mobile guide	2019-05-17 11:01:42 -06:00
Travis Ralston	1ac5df3cd0	Merge branch 'develop' into travis/feature/wellknown2	2019-05-16 12:58:09 -06:00
Travis Ralston	39d1293350	Merge pull request #9721 from vector-im/travis/wk/fallback_hs Flag the validated config as the default config	2019-05-16 12:47:01 -06:00
Travis Ralston	51f56719c0	Merge pull request #9719 from vector-im/travis/wk/clarify_is_hs_url Clarify comment on is_url and hs_url handling	2019-05-16 08:41:34 -06:00
Travis Ralston	22cc33eb15	Do a simple .well-known lookup for default_server_name for mobile guide	2019-05-14 17:57:04 -06:00
Travis Ralston	559416dcae	Show most homeserver options on the mobile guide This doesn't cover default_server_name because that pulls in a questionable amount of JS. See https://github.com/vector-im/riot-web/issues/9290	2019-05-14 17:00:06 -06:00
Travis Ralston	68a7550080	Flag the validated config as the default config For use in the rest of the app. See https://github.com/vector-im/riot-web/issues/9290	2019-05-14 13:12:34 -06:00
Travis Ralston	7f5589c01b	Clarify comment on is_url and hs_url handling We don't actually need to do anything because the app transparently handles this. See https://github.com/vector-im/riot-web/issues/9290	2019-05-14 12:53:13 -06:00
Travis Ralston	886828caa8	Merge pull request #9496 from vector-im/travis/guests/block-ui Validate default homeserver config before loading the app	2019-05-10 11:20:33 -06:00
Travis Ralston	fc5c93ab5f	Fix unit tests for new login Supply a server config to the component and adjust the wait logic to be less of a race. The Login component will noop onPasswordLogin if it is "busy", and it is busy when it requests the login flows.	2019-05-03 16:27:41 -06:00
Travis Ralston	a5092dc763	Fix tests to use new server config options	2019-05-03 11:06:32 -06:00
Travis Ralston	bf97fd67b4	Handle cases of no default server	2019-05-03 11:06:32 -06:00
Travis Ralston	45caa8baab	Add a couple notes	2019-05-03 11:06:32 -06:00
Travis Ralston	ab6ba0e0d8	Add some clarity to the config options	2019-05-03 11:06:32 -06:00
Travis Ralston	e7bf643d8b	Don't repackage the ValidatedDiscoveryConfig It's usable as-is, and we can add things to it when we need to (ie: integrations).	2019-05-03 11:06:32 -06:00
Travis Ralston	c8caf6797d	Move bulk of discovery processing to react-sdk	2019-05-03 11:06:32 -06:00
Travis Ralston	51941eae49	Add note to self	2019-05-03 11:06:32 -06:00
Travis Ralston	5445632026	Use new js-sdk properties for getting discovery errors Requires https://github.com/matrix-org/matrix-js-sdk/pull/899	2019-05-03 11:06:32 -06:00
Travis Ralston	f08491cee8	Validate default homeserver config before loading the app Implements the process described here: https://github.com/vector-im/riot-web/issues/9290#issuecomment-481966910 The expectation is that later layers (like the react-sdk) will make use of the `validated_discovery_config` option instead of interpreting the config themselves. We intentionally block the UI from loading here to avoid races between discovery and the app loading.	2019-05-03 11:06:32 -06:00