Update brand to new name

Move app config files to new name
Merge remote-tracking branch 'origin/develop' into element
2020-07-13 18:43:02 +01:00 · 2020-07-13 18:34:46 +01:00 · 2020-07-13 13:37:40 +01:00 · 2020-07-13 13:35:50 +01:00 · 2020-07-13 10:44:51 +00:00 · 2020-07-13 11:33:18 +01:00
118 changed files with 324 additions and 173 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,35 @@
+Changes in [1.6.8](https://github.com/vector-im/riot-web/releases/tag/v1.6.8) (2020-07-03)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.8-rc.1...v1.6.8)
+
+ * Upgrade to JS SDK 7.1.0 and React SDK 2.9.0
+
+Changes in [1.6.8-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.6.8-rc.1) (2020-07-01)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.7...v1.6.8-rc.1)
+
+ * Upgrade to JS SDK 7.1.0-rc.1 and React SDK 2.9.0-rc.1
+ * Update from Weblate
+   [\#14282](https://github.com/vector-im/riot-web/pull/14282)
+ * Show a download completed toast in electron
+   [\#14248](https://github.com/vector-im/riot-web/pull/14248)
+ * Add the new spinner feature labs flag
+   [\#14213](https://github.com/vector-im/riot-web/pull/14213)
+ * Fix loading-test for SSO plaf changes
+   [\#14212](https://github.com/vector-im/riot-web/pull/14212)
+ * Fix spelling on startup error page
+   [\#14199](https://github.com/vector-im/riot-web/pull/14199)
+ * Document fonts in custom theme
+   [\#14175](https://github.com/vector-im/riot-web/pull/14175)
+ * Update from Weblate
+   [\#14129](https://github.com/vector-im/riot-web/pull/14129)
+ * ElectronPlatform: Implement the isRoomIndexed method.
+   [\#13957](https://github.com/vector-im/riot-web/pull/13957)
+ * ElectronPlatform: Add support to set and get the index user version.
+   [\#14080](https://github.com/vector-im/riot-web/pull/14080)
+ * Mark the new room list as ready for general testing
+   [\#14102](https://github.com/vector-im/riot-web/pull/14102)
+
 Changes in [1.6.7](https://github.com/vector-im/riot-web/releases/tag/v1.6.7) (2020-06-29)
 ==========================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.6...v1.6.7)
--- a/config.sample.json
+++ b/config.sample.json
@@ -26,12 +26,12 @@
    "defaultCountryCode": "GB",
    "showLabsSettings": false,
    "features": {
+        "feature_new_spinner": "labs",
        "feature_font_scaling": "labs",
        "feature_pinning": "labs",
        "feature_custom_status": "labs",
        "feature_custom_tags": "labs",
-        "feature_state_counters": "labs",
-        "feature_irc_ui": "labs"
+        "feature_state_counters": "labs"
    },
    "default_federate": true,
    "default_theme": "light",
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -7,6 +7,10 @@ to `Settings->Labs`. This list is non-exhaustive and subject to change, chat in
 **Be warned! Labs features are not finalised, they may be fragile, they may change, they may be
 dropped. Ask in the room if you are unclear about any details here.**

+## New spinner design (`feature_new_spinner`)
+
+Replaces the old spinner image with a new, svg-based one featuring a sleeker design.
+
 ## Font scaling (`feature_font_scaling`)

 Enables font scaling options for accessibility. To alter the scale check the
@@ -96,14 +100,8 @@ theme definition.

 For some sample themes, check out [aaronraimist/riot-web-themes](https://github.com/aaronraimist/riot-web-themes).

-## New room list (`feature_new_room_list`) (in development)
+## New room list (`feature_new_room_list`)

 A complete rewrite of the room list is underway to increase performance, stability,
-and general usability. This is expected to take a while to complete and as such might
-be missing critical features - please use at your own risk, though do report bugs!
-
-## IRC message layout (`feature_irc_ui`)
-
-Adds an option to change the message layout to an IRC style ` timestamp | avatar
-| name | message `
+and general usability. This is still rapidly changing, but feel free to give it a test.

--- a/docs/theming.md
+++ b/docs/theming.md
@@ -41,6 +41,16 @@ eg. in config.json:
            {
                "name": "Electric Blue",
                "is_dark": false,
+                "fonts": {
+                    "faces": [
+                        {
+                            "font-family": "Inter",
+                            "src": [{"url": "/fonts/Inter.ttf", "format": "ttf"}]
+                        }
+                    ],
+                    "general": "Inter, sans",
+                    "monospace": "'Courier New'"
+                },
                "colors": {
                    "accent-color": "#3596fc",
                    "primary-color": "#368bd6",
@@ -84,3 +94,5 @@ eg. in config.json:
 `username-colors` is expected to contain 8 colors. `avatar-background-colors` is expected to contain 3 colors. Both values are optional and have fallbacks from the built-in theme.

 These are exposed as `--username-colors_0`, ... and `--avatar-background-colors_0`, ... respectively in CSS.
+
+All properties in `fonts` are optional, and will default to the standard Riot fonts.
--- a/element.io/README
+++ b/element.io/README
@@ -1,11 +1,12 @@
 This directory contains the config files and deployment scripts for the official
-riot.im distribution of Riot Web at https://riot.im.
+element.io distribution of Element Web.

 You probably do not want to build with this config unless you're building the
-official riot.im distribution, but these files may be useful if you want to
+official element.io distribution, but these files may be useful if you want to
 inspect the configuration used there.

-Riot Desktop uses a separate config (see https://github.com/vector-im/riot-desktop/tree/develop/riot.im).
+Element Desktop uses a separate config (see
+https://github.com/vector-im/riot-desktop/tree/develop/element.io).

 Deployment scripts (such as app/deploy.py) are meant to be run on the web server
-hosting the Riot installation.
+hosting the Element installation.
--- a/element.io/app/config.json
+++ b/element.io/app/config.json
@@ -1,6 +1,6 @@
 {
    "default_server_name": "matrix.org",
-    "brand": "Riot",
+    "brand": "Element",
    "integrations_ui_url": "https://scalar.vector.im/",
    "integrations_rest_url": "https://scalar.vector.im/api",
    "integrations_widgets_urls": [
--- a/element.io/app/deploy.py
+++ b/element.io/app/deploy.py
--- a/element.io/develop/config.json
+++ b/element.io/develop/config.json
@@ -1,6 +1,6 @@
 {
    "default_server_name": "matrix.org",
-    "brand": "Riot",
+    "brand": "Element",
    "integrations_ui_url": "https://scalar-staging.vector.im/",
    "integrations_rest_url": "https://scalar-staging.vector.im/api",
    "integrations_widgets_urls": [
@@ -13,6 +13,7 @@
    "hosting_signup_link": "https://modular.im/services/matrix-hosting-riot?utm_source=riot-web&utm_medium=web",
    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
    "features": {
+        "feature_new_spinner": "labs",
        "feature_font_scaling": "labs",
        "feature_pinning": "labs",
        "feature_custom_status": "labs",
@@ -24,8 +25,7 @@
        "feature_bridge_state": "labs",
        "feature_presence_in_room_list": "labs",
        "feature_custom_themes": "labs",
-        "feature_new_room_list": "labs",
-        "feature_irc_ui": "labs"
+        "feature_new_room_list": "labs"
    },
    "piwik": {
        "url": "https://piwik.riot.im/",
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "riot-web",
  "productName": "Riot",
-  "version": "1.6.7",
+  "version": "1.6.8",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "repository": {
@@ -60,8 +60,8 @@
    "browser-request": "^0.3.3",
    "gfm.css": "^1.1.2",
    "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "7.0.0",
-    "matrix-react-sdk": "2.8.1",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
    "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
    "postcss-easings": "^2.0.0",
    "prop-types": "^15.7.2",
--- a/res/manifest.json
+++ b/res/manifest.json
@@ -6,67 +6,67 @@
    "start_url": "index.html",
    "icons": [
        {
-            "src": "/vector-icons/20587a91-30e9-d583-2b9b-5c4c2aca967f.webPlatform.png",
+            "src": "/vector-icons/44.png",
            "sizes": "44x44",
            "type": "image/png"
        },
        {
-            "src": "/vector-icons/20522817-fde7-6a88-54a9-496b1c8aee53.webPlatform.png",
+            "src": "/vector-icons/1240x600.png",
            "sizes": "1240x600",
            "type": "image/png"
        },
        {
-            "src": "/vector-icons/4168a7e5-9d94-e9a3-4e60-45a58cc8ee4e.webPlatform.png",
+            "src": "/vector-icons/300.png",
            "sizes": "300x300",
            "type": "image/png"
        },
        {
-            "src": "/vector-icons/dd73cdd3-17c4-9b33-81b8-4789b7a4a250.webPlatform.png",
+            "src": "/vector-icons/150.png",
            "sizes": "150x150",
            "type": "image/png"
        },
        {
-            "src": "/vector-icons/8f19f71b-ab84-4fe7-1866-8ee9fb1362da.webPlatform.png",
+            "src": "/vector-icons/88.png",
            "sizes": "88x88",
            "type": "image/png"
        },
        {
-            "src": "/vector-icons/89ac632f-d735-868d-4b9b-cfe32121294c.webPlatform.png",
+            "src": "/vector-icons/24.png",
            "sizes": "24x24",
            "type": "image/png"
        },
        {
-            "src": "/vector-icons/5c925eef-dd2e-aa16-b6d4-13c90b81af1f.webPlatform.png",
+            "src": "/vector-icons/50.png",
            "sizes": "50x50",
            "type": "image/png"
        },
        {
-            "src": "/vector-icons/b3624ff1-eaf4-1082-4923-949bc8eb40ef.webPlatform.png",
+            "src": "/vector-icons/620x300.png",
            "sizes": "620x300",
            "type": "image/png"
        },
        {
-            "src": "/vector-icons/32aa4ec4-8b3f-d7b8-e2df-a49ba887199a.webPlatform.png",
+            "src": "/vector-icons/1024.png",
            "sizes": "1024x1024",
            "type": "image/png"
        },
        {
-            "src": "/vector-icons/a2e91e68-aa4e-45e7-e5e6-951e1d314675.webPlatform.png",
+            "src": "/vector-icons/180.png",
            "sizes": "180x180",
            "type": "image/png"
        },
        {
-            "src": "/vector-icons/627721aa-5331-ded6-b4a5-0bb4799985ee.webPlatform.png",
+            "src": "/vector-icons/152.png",
            "sizes": "152x152",
            "type": "image/png"
        },
        {
-            "src": "/vector-icons/4f4b5190-3b9c-9173-3118-442179ae62d4.webPlatform.png",
+            "src": "/vector-icons/120.png",
            "sizes": "120x120",
            "type": "image/png"
        },
        {
-            "src": "/vector-icons/552c9d70-ff13-2235-8ef9-00db0d2fda0c.webPlatform.png",
+            "src": "/vector-icons/76.png",
            "sizes": "76x76",
            "type": "image/png"
        }
--- a/res/themes/element/img/backgrounds/valley.jpg
+++ b/res/themes/element/img/backgrounds/valley.jpg
--- a/res/themes/element/img/download/apple.svg
+++ b/res/themes/element/img/download/apple.svg
--- a/res/themes/element/img/download/fdroid.svg
+++ b/res/themes/element/img/download/fdroid.svg
--- a/res/themes/element/img/download/google.svg
+++ b/res/themes/element/img/download/google.svg
--- a/res/themes/element/img/logos/element-logo.svg
+++ b/res/themes/element/img/logos/element-logo.svg
@@ -0,0 +1,6 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M414 204C414 180.804 432.804 162 456 162C610.64 162 736 287.36 736 442C736 465.196 717.196 484 694 484C670.804 484 652 465.196 652 442C652 333.752 564.248 246 456 246C432.804 246 414 227.196 414 204Z" fill="#0DBD8B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M610 820C610 843.196 591.196 862 568 862C413.36 862 288 736.64 288 582C288 558.804 306.804 540 330 540C353.196 540 372 558.804 372 582C372 690.248 459.752 778 568 778C591.196 778 610 796.804 610 820Z" fill="#0DBD8B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M204 610C180.804 610 162 591.196 162 568C162 413.36 287.36 288 442 288C465.196 288 484 306.804 484 330C484 353.196 465.196 372 442 372C333.752 372 246 459.752 246 568C246 591.196 227.196 610 204 610Z" fill="#0DBD8B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M820 414C843.196 414 862 432.804 862 456C862 610.64 736.64 736 582 736C558.804 736 540 717.196 540 694C540 670.804 558.804 652 582 652C690.248 652 778 564.248 778 456C778 432.804 796.804 414 820 414Z" fill="#0DBD8B"/>
+</svg>
--- a/res/themes/element/img/logos/opengraph.png
+++ b/res/themes/element/img/logos/opengraph.png
--- a/res/themes/riot/img/logos/opengraph.png
+++ b/res/themes/riot/img/logos/opengraph.png
--- a/res/themes/riot/img/logos/riot-im-logo-black-text.png
+++ b/res/themes/riot/img/logos/riot-im-logo-black-text.png
--- a/res/themes/riot/img/logos/riot-im-logo-black-text.svg
+++ b/res/themes/riot/img/logos/riot-im-logo-black-text.svg
--- a/res/themes/riot/img/logos/riot-im-logo.png
+++ b/res/themes/riot/img/logos/riot-im-logo.png
--- a/res/themes/riot/img/logos/riot-im-logo.svg
+++ b/res/themes/riot/img/logos/riot-im-logo.svg
--- a/res/themes/riot/img/logos/riot-logo.svg
+++ b/res/themes/riot/img/logos/riot-logo.svg
@@ -1,6 +0,0 @@
-<svg width="42" height="50" viewBox="0 0 42 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1.04021 42.174C1.04021 45.944 4.27657 49 8.26822 49C12.2603 49 15.4962 45.944 15.4962 42.174V35.2587L22.8119 35.2518C23.2234 35.2518 23.6386 35.2385 24.0415 35.2122C33.5209 34.6096 40.9465 27.1046 40.9465 18.1261C40.9465 8.68273 32.8114 1 22.8119 1H8.26822C4.27657 1 1.04021 4.05637 1.04021 7.82645V27.7141C1.01327 27.9548 0.999582 28.1987 1.00001 28.4459C1.00001 28.6887 1.01412 28.9286 1.04021 29.1645V42.174ZM15.4963 21.6066V14.6525H22.812C24.8405 14.6525 26.4901 16.2103 26.4901 18.1261C26.4901 19.9469 24.9881 21.4692 23.0665 21.5916C22.9822 21.5969 22.8975 21.5993 22.8047 21.5993L15.4963 21.6066Z" fill="#A2DDEF"/>
-<path d="M15.4963 14.6525V14.0405H14.8844V14.6525H15.4963ZM15.4963 21.6066H14.8844V22.2191L15.4969 22.2185L15.4963 21.6066ZM22.8047 21.5993V20.9874H22.8041L22.8047 21.5993ZM23.0665 21.5916L23.1045 22.2024L23.1053 22.2023L23.0665 21.5916ZM1.04021 29.1645H1.65214V29.1308L1.64843 29.0972L1.04021 29.1645ZM1.00001 28.4459H1.61194L1.61193 28.4449L1.00001 28.4459ZM1.04021 27.7141L1.64834 27.7821L1.65214 27.7482V27.7141H1.04021ZM24.0415 35.2122L24.0027 34.6015L24.0017 34.6016L24.0415 35.2122ZM22.8119 35.2518V34.6399H22.8113L22.8119 35.2518ZM15.4962 35.2587L15.4957 34.6467L14.8843 34.6473V35.2587H15.4962ZM14.8844 14.6525V21.6066H16.1082V14.6525H14.8844ZM15.4969 22.2185L22.8053 22.2112L22.8041 20.9874L15.4957 20.9946L15.4969 22.2185ZM22.8047 22.2112C22.9085 22.2112 23.006 22.2085 23.1045 22.2024L23.0284 20.9809C22.9584 20.9852 22.8865 20.9874 22.8047 20.9874V22.2112ZM23.1053 22.2023C25.3203 22.0612 27.1021 20.2979 27.1021 18.1261H25.8782C25.8782 19.5959 24.6559 20.8772 23.0276 20.9809L23.1053 22.2023ZM27.1021 18.1261C27.1021 15.8399 25.145 14.0405 22.812 14.0405V15.2644C24.536 15.2644 25.8782 16.5808 25.8782 18.1261H27.1021ZM22.812 14.0405H15.4963V15.2644H22.812V14.0405ZM8.26822 48.3881C4.58104 48.3881 1.65214 45.5735 1.65214 42.174H0.428288C0.428288 46.3145 3.97209 49.6119 8.26822 49.6119V48.3881ZM1.65214 42.174V29.1645H0.428288V42.174H1.65214ZM1.64843 29.0972C1.62467 28.8824 1.61193 28.665 1.61193 28.4459H0.388085C0.388085 28.7124 0.403576 28.9748 0.431997 29.2318L1.64843 29.0972ZM1.61193 28.4449C1.61155 28.221 1.62394 28.0001 1.64834 27.7821L0.432085 27.646C0.402599 27.9094 0.387617 28.1765 0.388085 28.447L1.61193 28.4449ZM1.65214 27.7141V7.82645H0.428288V27.7141H1.65214ZM1.65214 7.82645C1.65214 4.42682 4.58109 1.61193 8.26822 1.61193V0.388075C3.97204 0.388075 0.428288 3.68592 0.428288 7.82645H1.65214ZM8.26822 1.61193H22.8119V0.388075H8.26822V1.61193ZM22.8119 1.61193C32.5069 1.61193 40.3346 9.05321 40.3346 18.1261H41.5584C41.5584 8.31226 33.1159 0.388075 22.8119 0.388075V1.61193ZM40.3346 18.1261C40.3346 26.7525 33.1898 34.0175 24.0027 34.6015L24.0804 35.8229C33.8521 35.2017 41.5584 27.4566 41.5584 18.1261H40.3346ZM24.0017 34.6016C23.6124 34.6269 23.2104 34.6399 22.8119 34.6399V35.8637C23.2363 35.8637 23.6649 35.85 24.0813 35.8228L24.0017 34.6016ZM22.8113 34.6399L15.4957 34.6467L15.4968 35.8706L22.8125 35.8637L22.8113 34.6399ZM14.8843 35.2587V42.174H16.1082V35.2587H14.8843ZM14.8843 42.174C14.8843 45.5736 11.9558 48.3881 8.26822 48.3881V49.6119C12.5648 49.6119 16.1082 46.3145 16.1082 42.174H14.8843Z" fill="#368BD6"/>
-<path d="M8.26823 42.174V7.82642H22.8119C28.8351 7.82642 33.7181 12.4378 33.7181 18.1261C33.7181 23.5784 29.232 28.0412 23.5561 28.4019C23.3098 28.4176 23.0621 28.4257 22.8119 28.4257L8.22803 28.4395" stroke="#368BD6" stroke-width="1.22385" stroke-linecap="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15.4227 9.0113C15.758 7.21673 15.3325 5.4048 14.2243 3.91155C11.9366 0.828522 7.41753 0.0768486 4.15037 2.23574C2.56747 3.28105 1.51106 4.84579 1.17575 6.64116C0.84001 8.43653 1.26557 10.2481 2.37372 11.7413C4.66146 14.8243 9.18092 15.576 12.4481 13.4171C14.0306 12.3714 15.087 10.8071 15.4227 9.0113ZM27.852 46.0868C29.2587 47.9824 31.4998 48.9962 33.7777 48.9962C35.21 48.9962 36.6569 48.5951 37.9195 47.7594C41.1883 45.5965 41.9817 41.3397 39.6905 38.2522L29.4751 24.4846C27.1843 21.3972 22.6769 20.6475 19.408 22.8121C16.1392 24.975 15.3458 29.2318 17.6365 32.3192L27.852 46.0868Z" fill="#368BD6"/>
-</svg>
--- a/res/vector-icons/1024.png
+++ b/res/vector-icons/1024.png
--- a/res/vector-icons/120.png
+++ b/res/vector-icons/120.png
--- a/res/vector-icons/1240x600.png
+++ b/res/vector-icons/1240x600.png
--- a/res/vector-icons/150.png
+++ b/res/vector-icons/150.png
--- a/res/vector-icons/152.png
+++ b/res/vector-icons/152.png
--- a/res/vector-icons/180.png
+++ b/res/vector-icons/180.png
--- a/res/vector-icons/20522817-fde7-6a88-54a9-496b1c8aee53.webPlatform.png
+++ b/res/vector-icons/20522817-fde7-6a88-54a9-496b1c8aee53.webPlatform.png
--- a/res/vector-icons/20587a91-30e9-d583-2b9b-5c4c2aca967f.webPlatform.png
+++ b/res/vector-icons/20587a91-30e9-d583-2b9b-5c4c2aca967f.webPlatform.png
--- a/res/vector-icons/24.png
+++ b/res/vector-icons/24.png
--- a/res/vector-icons/300.png
+++ b/res/vector-icons/300.png
--- a/res/vector-icons/32aa4ec4-8b3f-d7b8-e2df-a49ba887199a.webPlatform.png
+++ b/res/vector-icons/32aa4ec4-8b3f-d7b8-e2df-a49ba887199a.webPlatform.png
--- a/res/vector-icons/4168a7e5-9d94-e9a3-4e60-45a58cc8ee4e.webPlatform.png
+++ b/res/vector-icons/4168a7e5-9d94-e9a3-4e60-45a58cc8ee4e.webPlatform.png
--- a/res/vector-icons/44.png
+++ b/res/vector-icons/44.png
--- a/res/vector-icons/4f4b5190-3b9c-9173-3118-442179ae62d4.webPlatform.png
+++ b/res/vector-icons/4f4b5190-3b9c-9173-3118-442179ae62d4.webPlatform.png
--- a/res/vector-icons/50.png
+++ b/res/vector-icons/50.png
--- a/res/vector-icons/552c9d70-ff13-2235-8ef9-00db0d2fda0c.webPlatform.png
+++ b/res/vector-icons/552c9d70-ff13-2235-8ef9-00db0d2fda0c.webPlatform.png
--- a/res/vector-icons/5c925eef-dd2e-aa16-b6d4-13c90b81af1f.webPlatform.png
+++ b/res/vector-icons/5c925eef-dd2e-aa16-b6d4-13c90b81af1f.webPlatform.png
--- a/res/vector-icons/620x300.png
+++ b/res/vector-icons/620x300.png
--- a/res/vector-icons/627721aa-5331-ded6-b4a5-0bb4799985ee.webPlatform.png
+++ b/res/vector-icons/627721aa-5331-ded6-b4a5-0bb4799985ee.webPlatform.png
--- a/res/vector-icons/76.png
+++ b/res/vector-icons/76.png
--- a/res/vector-icons/88.png
+++ b/res/vector-icons/88.png
--- a/res/vector-icons/89ac632f-d735-868d-4b9b-cfe32121294c.webPlatform.png
+++ b/res/vector-icons/89ac632f-d735-868d-4b9b-cfe32121294c.webPlatform.png
--- a/res/vector-icons/8f19f71b-ab84-4fe7-1866-8ee9fb1362da.webPlatform.png
+++ b/res/vector-icons/8f19f71b-ab84-4fe7-1866-8ee9fb1362da.webPlatform.png
--- a/res/vector-icons/a2e91e68-aa4e-45e7-e5e6-951e1d314675.webPlatform.png
+++ b/res/vector-icons/a2e91e68-aa4e-45e7-e5e6-951e1d314675.webPlatform.png
--- a/res/vector-icons/android-chrome-144x144.png
+++ b/res/vector-icons/android-chrome-144x144.png
--- a/res/vector-icons/android-chrome-192x192.png
+++ b/res/vector-icons/android-chrome-192x192.png
--- a/res/vector-icons/android-chrome-36x36.png
+++ b/res/vector-icons/android-chrome-36x36.png
--- a/res/vector-icons/android-chrome-48x48.png
+++ b/res/vector-icons/android-chrome-48x48.png
--- a/res/vector-icons/android-chrome-72x72.png
+++ b/res/vector-icons/android-chrome-72x72.png
--- a/res/vector-icons/android-chrome-96x96.png
+++ b/res/vector-icons/android-chrome-96x96.png
--- a/res/vector-icons/apple-touch-icon-114.png
+++ b/res/vector-icons/apple-touch-icon-114.png
--- a/res/vector-icons/apple-touch-icon-114x114.png
+++ b/res/vector-icons/apple-touch-icon-114x114.png
--- a/res/vector-icons/apple-touch-icon-120.png
+++ b/res/vector-icons/apple-touch-icon-120.png
--- a/res/vector-icons/apple-touch-icon-120x120.png
+++ b/res/vector-icons/apple-touch-icon-120x120.png
--- a/res/vector-icons/apple-touch-icon-144.png
+++ b/res/vector-icons/apple-touch-icon-144.png
--- a/res/vector-icons/apple-touch-icon-144x144.png
+++ b/res/vector-icons/apple-touch-icon-144x144.png
--- a/res/vector-icons/apple-touch-icon-152.png
+++ b/res/vector-icons/apple-touch-icon-152.png
--- a/res/vector-icons/apple-touch-icon-152x152.png
+++ b/res/vector-icons/apple-touch-icon-152x152.png
--- a/res/vector-icons/apple-touch-icon-180.png
+++ b/res/vector-icons/apple-touch-icon-180.png
--- a/res/vector-icons/apple-touch-icon-180x180.png
+++ b/res/vector-icons/apple-touch-icon-180x180.png
--- a/res/vector-icons/apple-touch-icon-57.png
+++ b/res/vector-icons/apple-touch-icon-57.png
--- a/res/vector-icons/apple-touch-icon-57x57.png
+++ b/res/vector-icons/apple-touch-icon-57x57.png
--- a/res/vector-icons/apple-touch-icon-60.png
+++ b/res/vector-icons/apple-touch-icon-60.png
--- a/res/vector-icons/apple-touch-icon-60x60.png
+++ b/res/vector-icons/apple-touch-icon-60x60.png
--- a/res/vector-icons/apple-touch-icon-72.png
+++ b/res/vector-icons/apple-touch-icon-72.png
--- a/res/vector-icons/apple-touch-icon-72x72.png
+++ b/res/vector-icons/apple-touch-icon-72x72.png
--- a/res/vector-icons/apple-touch-icon-76.png
+++ b/res/vector-icons/apple-touch-icon-76.png
--- a/res/vector-icons/apple-touch-icon-76x76.png
+++ b/res/vector-icons/apple-touch-icon-76x76.png
--- a/res/vector-icons/apple-touch-icon-precomposed.png
+++ b/res/vector-icons/apple-touch-icon-precomposed.png
--- a/res/vector-icons/apple-touch-icon.png
+++ b/res/vector-icons/apple-touch-icon.png
--- a/res/vector-icons/b3624ff1-eaf4-1082-4923-949bc8eb40ef.webPlatform.png
+++ b/res/vector-icons/b3624ff1-eaf4-1082-4923-949bc8eb40ef.webPlatform.png
--- a/res/vector-icons/browserconfig.xml
+++ b/res/vector-icons/browserconfig.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-  <msapplication>
-    <tile>
-      <square70x70logo src="/vector-icons/mstile-70x70.png"/>
-      <square150x150logo src="/vector-icons/mstile-150x150.png"/>
-      <square310x310logo src="/vector-icons/mstile-310x310.png"/>
-      <wide310x150logo src="/vector-icons/mstile-310x150.png"/>
-      <TileColor>#da532c</TileColor>
-    </tile>
-  </msapplication>
-</browserconfig>
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square70x70logo src="/vector-icons/mstile-70.png"/>
+      <square150x150logo src="/vector-icons/mstile-150.png"/>
+      <square310x310logo src="/vector-icons/mstile-310.png"/>
+      <wide310x150logo src="/vector-icons/mstile-310x150.png"/>
+      <TileColor>#da532c</TileColor>
+    </tile>
+  </msapplication>
+</browserconfig>
--- a/res/vector-icons/dd73cdd3-17c4-9b33-81b8-4789b7a4a250.webPlatform.png
+++ b/res/vector-icons/dd73cdd3-17c4-9b33-81b8-4789b7a4a250.webPlatform.png
--- a/res/vector-icons/favicon-16x16.png
+++ b/res/vector-icons/favicon-16x16.png
--- a/res/vector-icons/favicon-32x32.png
+++ b/res/vector-icons/favicon-32x32.png
--- a/res/vector-icons/favicon-96x96.png
+++ b/res/vector-icons/favicon-96x96.png
--- a/res/vector-icons/favicon.ico
+++ b/res/vector-icons/favicon.ico
--- a/res/vector-icons/mstile-144x144.png
+++ b/res/vector-icons/mstile-144x144.png
--- a/res/vector-icons/mstile-150.png
+++ b/res/vector-icons/mstile-150.png
--- a/res/vector-icons/mstile-150x150.png
+++ b/res/vector-icons/mstile-150x150.png
--- a/res/vector-icons/mstile-300x150.png
+++ b/res/vector-icons/mstile-300x150.png
--- a/res/vector-icons/mstile-310.png
+++ b/res/vector-icons/mstile-310.png
--- a/res/vector-icons/mstile-310x150.png
+++ b/res/vector-icons/mstile-310x150.png
--- a/res/vector-icons/mstile-310x310.png
+++ b/res/vector-icons/mstile-310x310.png
--- a/res/vector-icons/mstile-70.png
+++ b/res/vector-icons/mstile-70.png
--- a/res/vector-icons/mstile-70x70.png
+++ b/res/vector-icons/mstile-70x70.png
--- a/res/welcome/images/logo.svg
+++ b/res/welcome/images/logo.svg
--- a/src/async-components/structures/CompatibilityView.tsx
+++ b/src/async-components/structures/CompatibilityView.tsx
@@ -30,7 +30,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
        <div className="mx_ErrorView_container">
            <div className="mx_HomePage_header">
                <span className="mx_HomePage_logo">
-                    <img height="42" src="themes/riot/img/logos/riot-logo.svg" alt="Riot" />
+                    <img height="42" src="themes/element/img/logos/element-logo.svg" alt="Element" />
                </span>
                <h1>{ _t("Unsupported browser") }</h1>
            </div>
@@ -72,20 +72,20 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
            <div className="mx_HomePage_col">
                <div className="mx_HomePage_row">
                    <div>
-                        <h2 id="step2_heading">Use Riot on mobile</h2>
+                        <h2 id="step2_heading">Use Element on mobile</h2>
                        <p><strong>iOS</strong> (iPhone or iPad)</p>
                        <a href="https://itunes.apple.com/app/riot-im/id1083446067?mt=8" target="_blank"
                           className="mx_ClearDecoration">
-                            <img height="48" src="themes/riot/img/download/apple.svg" alt="Apple App Store" />
+                            <img height="48" src="themes/element/img/download/apple.svg" alt="Apple App Store" />
                        </a>
                        <p className="mx_Spacer"><strong>Android</strong></p>
                        <a href="https://play.google.com/store/apps/details?id=im.vector.app" target="_blank"
                           className="mx_ClearDecoration">
-                            <img height="48" src="themes/riot/img/download/google.svg" alt="Google Play Store" />
+                            <img height="48" src="themes/element/img/download/google.svg" alt="Google Play Store" />
                        </a>
                        <a href="https://f-droid.org/repository/browse/?fdid=im.vector.alpha" target="_blank"
                           className="mx_ClearDecoration">
-                            <img height="48" src="themes/riot/img/download/fdroid.svg" alt="F-Droid" />
+                            <img height="48" src="themes/element/img/download/fdroid.svg" alt="F-Droid" />
                        </a>
                    </div>
                </div>
--- a/src/async-components/structures/ErrorView.tsx
+++ b/src/async-components/structures/ErrorView.tsx
@@ -32,7 +32,7 @@ const ErrorView: React.FC<IProps> = ({title, messages}) => {
        <div className="mx_ErrorView_container">
            <div className="mx_HomePage_header">
                <span className="mx_HomePage_logo">
-                    <img height="42" src="themes/riot/img/logos/riot-logo.svg" alt="Riot" />
+                    <img height="42" src="themes/element/img/logos/element-logo.svg" alt="Element" />
                </span>
                <h1>{ _t("Failed to start") }</h1>
            </div>
--- a/src/components/views/auth/VectorAuthHeaderLogo.js
+++ b/src/components/views/auth/VectorAuthHeaderLogo.js
@@ -30,14 +30,14 @@ export default class VectorAuthHeaderLogo extends React.PureComponent {

    render() {
        const brandingConfig = SdkConfig.get().branding;
-        let logoUrl = "themes/riot/img/logos/riot-im-logo-black-text.svg";
+        let logoUrl = "themes/element/img/logos/element-logo.svg";
        if (brandingConfig && brandingConfig.authHeaderLogoUrl) {
            logoUrl = brandingConfig.authHeaderLogoUrl;
        }

        return (
            <div className="mx_AuthHeaderLogo">
-                <img src={logoUrl} alt="Riot" />
+                <img src={logoUrl} alt="Element" />
            </div>
        );
    }
--- a/src/components/views/auth/VectorAuthPage.js
+++ b/src/components/views/auth/VectorAuthPage.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
+Copyright 2019, 2020 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.
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-'use strict';
-
 import React from 'react';
 import * as sdk from 'matrix-react-sdk/src/index';
 import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
@@ -23,21 +21,31 @@ import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
 export default class VectorAuthPage extends React.PureComponent {
    static replaces = 'AuthPage'

-    render() {
-        const AuthFooter = sdk.getComponent('auth.AuthFooter');
+    static welcomeBackgroundUrl;
+
+    // cache the url as a static to prevent it changing without refreshing
+    static getWelcomeBackgroundUrl() {
+        if (VectorAuthPage.welcomeBackgroundUrl) return VectorAuthPage.welcomeBackgroundUrl;

        const brandingConfig = SdkConfig.get().branding;
-        let backgroundUrl = "themes/riot/img/backgrounds/valley.jpg";
+        VectorAuthPage.welcomeBackgroundUrl = "themes/element/img/backgrounds/valley.jpg";
        if (brandingConfig && brandingConfig.welcomeBackgroundUrl) {
            if (Array.isArray(brandingConfig.welcomeBackgroundUrl)) {
-                backgroundUrl = brandingConfig.welcomeBackgroundUrl[Math.floor(Math.random() * brandingConfig.welcomeBackgroundUrl.length)];
+                const index = Math.floor(Math.random() * brandingConfig.welcomeBackgroundUrl.length);
+                VectorAuthPage.welcomeBackgroundUrl = brandingConfig.welcomeBackgroundUrl[index];
            } else {
-                backgroundUrl = brandingConfig.welcomeBackgroundUrl;
+                VectorAuthPage.welcomeBackgroundUrl = brandingConfig.welcomeBackgroundUrl;
            }
        }

+        return VectorAuthPage.welcomeBackgroundUrl;
+    }
+
+    render() {
+        const AuthFooter = sdk.getComponent('auth.AuthFooter');
+
        const pageStyle = {
-            background: `center/cover fixed url(${backgroundUrl})`,
+            background: `center/cover fixed url(${VectorAuthPage.getWelcomeBackgroundUrl()})`,
        };

        const modalStyle = {
@@ -65,7 +73,7 @@ export default class VectorAuthPage extends React.PureComponent {
        return (
            <div className="mx_AuthPage" style={pageStyle}>
                <div className="mx_AuthPage_modal" style={modalStyle}>
-                    <div className="mx_AuthPage_modalBlur" style={blurStyle}></div>
+                    <div className="mx_AuthPage_modalBlur" style={blurStyle} />
                    <div className="mx_AuthPage_modalContent" style={modalContentStyle}>
                        { this.props.children }
                    </div>
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -8,6 +8,9 @@
    "Invalid JSON": "Invalid JSON",
    "Unable to load config file: please refresh the page to try again.": "Unable to load config file: please refresh the page to try again.",
    "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.",
+    "Download Completed": "Download Completed",
+    "Open": "Open",
+    "Dismiss": "Dismiss",
    "Open user settings": "Open user settings",
    "Previous/next recently visited room or community": "Previous/next recently visited room or community",
    "Riot Desktop (%(platformName)s)": "Riot Desktop (%(platformName)s)",
@@ -18,7 +21,6 @@
    "powered by Matrix": "powered by Matrix",
    "Custom Server Options": "Custom Server Options",
    "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.": "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.",
-    "Dismiss": "Dismiss",
    "Unsupported browser": "Unsupported browser",
    "Your browser can't run Riot": "Your browser can't run Riot",
    "Riot uses advanced browser features which aren't supported by your current browser.": "Riot uses advanced browser features which aren't supported by your current browser.",
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -36,5 +36,7 @@
    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Vi povas daŭre uzadi vian nunan foliumilon, sed iuj (eĉ ĉiuj) funkcioj eble ne funkcios, kaj la aspekto de la aplikaĵo eble ne estos ĝusta.",
    "I understand the risks and wish to continue": "Mi komprenas la riskon kaj volas pluiĝi",
    "Go to Riot.im": "Iri al Riot.im",
-    "Failed to start": "Malsukcesis starti"
+    "Failed to start": "Malsukcesis starti",
+    "Download Completed": "Elŝuto finiĝis",
+    "Open": "Malfermi"
 }
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -9,14 +9,14 @@
    "Welcome to Riot.im": "Bienvenido a Riot.im",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas y colaboración con el poder de [matrix]",
    "Chat with Riot Bot": "Hablar con Riot Bot",
-    "Sign In": "Registrarse",
+    "Sign In": "Iniciar sesión",
    "Create Account": "Crear cuenta",
    "Need help?": "Necesitas ayuda?",
    "Explore rooms": "Explorar salas",
    "Room Directory": "Directorio de salas",
    "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.": "Puedes usar las opciones personalizadas del servidor para iniciar sesión en otros servidores Matrix, especificando la dirección URL del servidor. Esto te permite usar una cuenta Matrix en un servidor diferente.",
    "Unexpected error preparing the app. See console for details.": "Error inesperado preparando la aplicación. Vea la consola para más detalles.",
-    "Your Riot is misconfigured": "Tu Riot está mal configurado",
+    "Your Riot is misconfigured": "Tu Riot tiene un error de configuración",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuración errónea: sólo puede especificar uno de default_server_config, default_server_name, o default_hs_url.",
    "Invalid configuration: no default server specified.": "Configuración errónea: no se ha especificado servidor.",
    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Tu configuración de Riot contiene JSON inválido. Por favor corrige el error y recarga la página.",
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -36,5 +36,7 @@
    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Sa võid jätkata praeguse brauseri kasutamist, kuid mõned või kõik funktsionaalsused ei pruugi toimida ning rakenduse välimus võib vigane olla.",
    "I understand the risks and wish to continue": "Ma mõistan riske ja soovin jätkata",
    "Go to Riot.im": "Mine Riot.im lehele",
-    "Failed to start": "Käivitamine ei õnnestunud"
+    "Failed to start": "Käivitamine ei õnnestunud",
+    "Download Completed": "Allalaadimine on lõpetatud",
+    "Open": "Ava"
 }
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -26,7 +26,7 @@
    "Unable to load config file: please refresh the page to try again.": "Asetustiedostoa ei voi ladata. Yritä uudelleen lataamalla sivu uudelleen.",
    "Open user settings": "Avaa käyttäjäasetukset",
    "Previous/next recently visited room or community": "Edellinen/seuraava hiljattain vierailtu huone tai yhteisö",
-    "Riot Desktop (%(platformName)s)": "Riot Desktop (%(platformName)s)",
+    "Riot Desktop (%(platformName)s)": "Riotin työpöytäversio (%(platformName)s)",
    "Go to your browser to complete Sign In": "Tee kirjautuminen loppuun selaimessasi",
    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Selainta ei tueta",
@@ -35,5 +35,8 @@
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Asenna <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> tai <safariLink>Safari</safariLink>, jotta kaikki toimii parhaiten.",
    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Voit käyttää edelleen nykyistä selaintasi, mutta jotkut tai kaikki ominaisuudet eivät ehkä toimi ja sovelluksen ulkoasu voi olla virheellinen.",
    "I understand the risks and wish to continue": "Ymmärrän riskit ja haluan jatkaa",
-    "Failed to start": "Käynnistys ei onnistunut"
+    "Failed to start": "Käynnistys ei onnistunut",
+    "Download Completed": "Lataus valmis",
+    "Open": "Avaa",
+    "Go to Riot.im": "Mene osoitteeseen riot.im"
 }
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -36,5 +36,7 @@
    "I understand the risks and wish to continue": "Je comprends les risques et souhaite continuer",
    "Go to Riot.im": "Aller vers Riot.im",
    "Failed to start": "Échec au démarrage",
-    "Riot Desktop (%(platformName)s)": "Riot pour bureau (%(platformName)s)"
+    "Riot Desktop (%(platformName)s)": "Riot pour bureau (%(platformName)s)",
+    "Download Completed": "Téléchargement terminé",
+    "Open": "Ouvrir"
 }
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -24,7 +24,7 @@
    "Invalid configuration: no default server specified.": "Configuración non válida: non se indicou servidor por omisión.",
    "Missing indexeddb worker script!": "Falta o script indexeddb!",
    "Unable to load config file: please refresh the page to try again.": "Non se cargou o ficheiro de configuración: actualiza a páxina para reintentalo.",
-    "Open user settings": "Abrir axustes do usuario",
+    "Open user settings": "Abrir axustes da usuaria",
    "Previous/next recently visited room or community": "Anterior/seguinte sala ou comunidade recentes",
    "Riot Desktop (%(platformName)s)": "Riot Desktop (%(platformName)s)",
    "Go to your browser to complete Sign In": "Abre o navegador para realizar a Conexión",
@@ -36,5 +36,7 @@
    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Podes continuar co teu navegador, pero algunhas características poderían non funcionar e o aspecto da aplicación podería non ser o correcto.",
    "I understand the risks and wish to continue": "Entendo os riscos e desexo continuar",
    "Go to Riot.im": "Ir a Riot.im",
-    "Failed to start": "Fallou o inicio"
+    "Failed to start": "Fallou o inicio",
+    "Download Completed": "Descarga realizada",
+    "Open": "Abrir"
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
J. Ryan Stinnett	e3e2bd1e7b	Update brand to new name	2020-07-13 18:43:02 +01:00
J. Ryan Stinnett	e737fccd5a	Move app config files to new name	2020-07-13 18:34:46 +01:00
J. Ryan Stinnett	c135c819b7	Merge remote-tracking branch 'origin/develop' into element	2020-07-13 13:37:40 +01:00
J. Ryan Stinnett	c5f2965c52	Merge pull request #14434 from RiotTranslateBot/weblate-riot-web-riot-web Update from Weblate	2020-07-13 13:35:50 +01:00
David Baker	5c74cbd694	Merge branch 'dbkr/logos' into 'element' Change Logos See merge request new-vector/element/element-web/element-web!1	2020-07-13 10:44:51 +00:00
David Baker	6bfa9bc1da	Actual open graph image and not just a green rectangle	2020-07-13 11:33:18 +01:00
David Baker	55e7aa6a22	Replace Riot logo with element logo and hopefully clean up some of dead wood icons while we're at it	2020-07-10 20:02:11 +01:00
David Baker	d0f81b26ad	Change logos excluding vector-icons	2020-07-10 19:09:52 +01:00
David Baker	b7ed883d96	Start by renaming the dir	2020-07-10 18:35:17 +01:00
Bruno Windels	b5d0047f39	Merge branch 'develop' into element	2020-07-09 17:59:47 +02:00
Weblate	d05dd3ed71	Merge branch 'origin/develop' into Weblate.	2020-07-09 15:20:53 +00:00
Jorik Schellekens	dbd62fb213	Merge pull request #14350 from vector-im/joriks/delabs-layout Release the irc layout from labs	2020-07-09 16:20:47 +01:00
Bruno Windels	bc57e6fd70	dark theme	2020-07-09 14:47:42 +02:00
Bruno Windels	2da0527c28	Merge branch 'develop' into element	2020-07-08 15:34:26 +02:00
Weblate	42c6b689ff	Merge branch 'origin/develop' into Weblate.	2020-07-08 12:23:42 +00:00
Samu Voutilainen	747f379055	Translated using Weblate (Finnish) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/	2020-07-08 12:23:42 +00:00
Michael Telatynski	5909725623	Merge pull request #14368 from vector-im/t3chguy/fix/14364 Fix welcomeBackgroundUrl array causing background to change during use	2020-07-08 13:23:35 +01:00
ok-what	85a9e90f21	Translated using Weblate (Finnish) Currently translated at 97.1% (34 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/	2020-07-08 04:34:03 +00:00
Michael Telatynski	826cb1d308	Fix welcomeBackgroundUrl array causing background to change during use Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-07-07 17:58:11 +01:00
Bruno Windels	202bbf6a24	Merge branch 'develop' into element	2020-07-07 13:22:39 +02:00
Weblate	71b90f6dac	Merge branch 'origin/develop' into Weblate.	2020-07-06 17:54:13 +00:00
Rintan	cdbaa7f749	Translated using Weblate (Japanese) Currently translated at 97.1% (34 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/	2020-07-06 17:54:13 +00:00
random	d9e3af067a	Translated using Weblate (Italian) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/	2020-07-06 17:54:13 +00:00
Priit Jõerüüt	eaf6ad598e	Translated using Weblate (Estonian) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/et/	2020-07-06 17:54:13 +00:00
Michael Telatynski	da3739b15f	Merge pull request #14299 from vector-im/t3chguy/ts123 Be more explicit about type when calling platform startUpdater	2020-07-06 18:54:06 +01:00
Jorik Schellekens	e95036405b	Release the irc layout to the wild	2020-07-06 15:22:57 +01:00
Bruno Windels	ac4770597d	Update develop	2020-07-06 09:27:29 +02:00
W. O. Wutzke	ef7182eb43	Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/	2020-07-04 22:44:38 +00:00
thomasesr	d8da805bac	Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/	2020-07-04 22:44:38 +00:00
W. O. Wutzke	fd0205d17e	Translated using Weblate (Portuguese (Brazil)) Currently translated at 85.7% (30 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/	2020-07-04 22:41:21 +00:00
thomasesr	f38148fe37	Translated using Weblate (Portuguese (Brazil)) Currently translated at 85.7% (30 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/	2020-07-04 22:41:21 +00:00
Tirifto	f72d683c0b	Translated using Weblate (Esperanto) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/	2020-07-04 16:26:45 +00:00
Weblate	42fd1113a9	Merge branch 'origin/develop' into Weblate.	2020-07-03 12:37:41 +00:00
RiotRobot	449ac2e5e4	Reset matrix-react-sdk back to develop branch	2020-07-03 13:37:33 +01:00
RiotRobot	ebe1d7c336	Reset matrix-js-sdk back to develop branch	2020-07-03 13:37:22 +01:00
Weblate	a704451551	Merge branch 'origin/develop' into Weblate.	2020-07-03 12:37:04 +00:00
RiotRobot	1f543994d4	v1.6.8	2020-07-03 13:33:15 +01:00
RiotRobot	8e81ee071f	Prepare changelog for v1.6.8	2020-07-03 13:33:14 +01:00
RiotRobot	7815810cf8	Upgrade matrix-react-sdk to 2.9.0	2020-07-03 13:31:26 +01:00
RiotRobot	14fc25e635	Upgrade matrix-js-sdk to 7.1.0	2020-07-03 13:30:52 +01:00
[Redacted]	3879f92cf5	Translated using Weblate (Slovak) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/	2020-07-02 22:26:49 +00:00
Microtus62	f4ee7eed93	Translated using Weblate (Slovak) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/	2020-07-02 22:26:49 +00:00
Michael Telatynski	eac86b6053	Be more explicit about type when calling platform startUpdater Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-07-02 23:16:03 +01:00
RiotRobot	1726615b8a	v1.6.8-rc.1	2020-07-01 14:43:57 +01:00
RiotRobot	82f599714f	Prepare changelog for v1.6.8-rc.1	2020-07-01 14:43:56 +01:00
RiotRobot	a14cff6539	Upgrade matrix-react-sdk to 2.9.0-rc.1	2020-07-01 14:37:15 +01:00
RiotRobot	003a2942fe	Upgrade matrix-js-sdk to 7.1.0-rc.1	2020-07-01 14:34:47 +01:00
J. Ryan Stinnett	63a2caa091	Merge pull request #14282 from RiotTranslateBot/weblate-riot-web-riot-web Update from Weblate	2020-07-01 14:05:54 +01:00
Szimszon	0dc9cdadf9	Translated using Weblate (Hungarian) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/	2020-07-01 13:03:51 +00:00
XoseM	2c0fef92ef	Translated using Weblate (Galician) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/	2020-07-01 13:03:50 +00:00
Kévin C	f58c59553f	Translated using Weblate (French) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/	2020-07-01 13:03:50 +00:00
Jeff Huang	935914e572	Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/	2020-07-01 13:03:50 +00:00
Besnik Bleta	58c8ac05b9	Translated using Weblate (Albanian) Currently translated at 100.0% (35 of 35 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sq/	2020-07-01 13:03:49 +00:00
Weblate	4bbfdaa818	Merge branch 'origin/develop' into Weblate.	2020-06-30 19:28:49 +00:00
Michael Telatynski	e0ab2bb96e	Merge pull request #14248 from vector-im/t3chguy/download_toast Show a download completed toast in electron	2020-06-30 20:28:40 +01:00
Bruno Windels	6da70bdfbd	create unique device names	2020-06-30 17:29:31 +02:00
Bruno Windels	8e3d1407c0	dont leak domain for now	2020-06-30 17:06:10 +02:00
Bruno Windels	c9c402310a	element theme webpack config	2020-06-30 13:28:24 +02:00
Weblate	0b63f04b4b	Merge branch 'origin/develop' into Weblate.	2020-06-29 15:24:47 +00:00
ButterflyOfFire	d6cb83eb7a	Translated using Weblate (Kabyle) Currently translated at 100.0% (33 of 33 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/kab/	2020-06-29 15:24:47 +00:00
RiotRobot	af349a7ac5	Reset matrix-react-sdk back to develop branch	2020-06-29 16:23:35 +01:00
RiotRobot	d4fa099877	Reset matrix-js-sdk back to develop branch	2020-06-29 16:23:22 +01:00
RiotRobot	98f1536d45	Merge branch 'master' into develop	2020-06-29 16:22:44 +01:00
Michael Telatynski	7a7abc74d9	i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-06-29 15:59:37 +01:00
Michael Telatynski	87527d7b16	Show expiring toast on completed downloads Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-06-29 11:41:18 +01:00
Erik Lindström	6413c3c2fa	Translated using Weblate (Swedish) Currently translated at 100.0% (33 of 33 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/	2020-06-27 20:26:34 +00:00
pebles	4b49fb49ad	Translated using Weblate (Spanish) Currently translated at 100.0% (33 of 33 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/	2020-06-27 20:26:34 +00:00
aWeinzierl	9d39a3aea7	Translated using Weblate (Spanish) Currently translated at 100.0% (33 of 33 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/	2020-06-27 20:26:34 +00:00
XoseM	628409d75e	Translated using Weblate (Galician) Currently translated at 100.0% (33 of 33 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/	2020-06-27 20:26:34 +00:00
Michael Telatynski	69f72e330a	Merge pull request #14213 from vector-im/anoa/new_spinner Add the new spinner feature labs flag	2020-06-26 11:05:56 +01:00
Andrew Morgan	993155d56a	Add the new spinner feature	2020-06-26 11:02:55 +01:00
Michael Telatynski	3500bbe53d	Merge pull request #14212 from vector-im/t3chguy/hf1 Fix loading-test for SSO plaf changes	2020-06-26 09:09:41 +01:00
Michael Telatynski	06852436e6	Fix loading-test for SSO plaf changes Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-06-25 23:59:08 +01:00
J. Ryan Stinnett	c8c99d7ded	Merge pull request #14199 from vector-im/jryans/fix-load-spelling Fix spelling on startup error page	2020-06-25 13:53:54 +01:00
J. Ryan Stinnett	92eb687a75	Fix spelling on startup error page	2020-06-25 12:16:32 +01:00
Bruno Windels	76c93c8bf7	Merge pull request #14175 from vector-im/bwindels/custom-theme-font Document fonts in custom theme	2020-06-24 13:23:21 +00:00
Bruno Windels	fe0ed2b4f3	Update docs/theming.md Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>	2020-06-24 13:15:59 +00:00
Bruno Windels	2ce448943b	add documentation for fonts in custom theme	2020-06-24 14:55:57 +02:00
RiotRobot	2000f420bd	Reset matrix-react-sdk back to develop branch	2020-06-23 15:31:49 +01:00
RiotRobot	979ce51208	Reset matrix-js-sdk back to develop branch	2020-06-23 15:31:35 +01:00
RiotRobot	9be380fdaf	Merge branch 'master' into develop	2020-06-23 15:30:51 +01:00
David Baker	f3ef2aba2b	Merge pull request #14129 from RiotTranslateBot/weblate-riot-web-riot-web Update from Weblate	2020-06-22 09:49:15 +01:00
ziriSut	429bd17906	Translated using Weblate (Kabyle) Currently translated at 100.0% (33 of 33 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/kab/	2020-06-22 08:39:08 +00:00
take100yen	01881f5ef4	Translated using Weblate (Japanese) Currently translated at 69.7% (23 of 33 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/	2020-06-22 08:39:07 +00:00
Slimane Selyan AMIRI	42bbf4c517	Translated using Weblate (Kabyle) Currently translated at 36.4% (12 of 33 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/kab/	2020-06-20 20:52:49 +00:00
Weblate	931ca6e3bd	Merge branch 'origin/develop' into Weblate.	2020-06-19 08:51:03 +00:00
Damir Jelić	cfee2a43fb	Merge branch 'poljar/eventindex-user-version' into develop	2020-06-19 09:53:43 +02:00
Damir Jelić	1b1608c56d	Merge remote-tracking branch 'origin/poljar/eventindex-newly-encrypted-room' into develop	2020-06-19 09:53:34 +02:00
Weblate	7fef41f3a7	Merge branch 'origin/develop' into Weblate.	2020-06-18 21:59:39 +00:00
Travis Ralston	5e834a50a9	Merge pull request #14102 from vector-im/travis/room-list/mvp Mark the new room list as ready for general testing	2020-06-18 15:59:33 -06:00
Travis Ralston	cbf35a6060	Mark the new room list as ready for general testing	2020-06-18 15:46:04 -06:00
Lmath Alpha	a128961d03	Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (33 of 33 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/	2020-06-18 17:02:36 +00:00
Damir Jelić	55c1f01f4c	ElectronPlatform: Add support to set and get the index user version.	2020-06-17 17:18:44 +02:00
Damir Jelić	a968389c85	ElectronPlatform: Implement the isRoomIndexed method.	2020-06-08 16:41:55 +02:00