diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a742a16..81073c98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,75 @@
+Changes in [1.5.3](https://github.com/vector-im/riot-web/releases/tag/v1.5.3) (2019-11-06)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.2...v1.5.3)
+
+ * Remove the 'auto hide menu bar' option on Mac
+ [\#11326](https://github.com/vector-im/riot-web/pull/11326)
+ * Expose feature_user_info_panel on riot.im/develop
+ [\#11304](https://github.com/vector-im/riot-web/pull/11304)
+ * Upgrade electron-notarize
+ [\#11312](https://github.com/vector-im/riot-web/pull/11312)
+ * Fix close window behaviour on Macos
+ [\#11309](https://github.com/vector-im/riot-web/pull/11309)
+ * Merge: Add dependency to eslint-plugin-react-hooks as react-sdk did
+ [\#11307](https://github.com/vector-im/riot-web/pull/11307)
+ * Add dependency to eslint-plugin-react-hooks as react-sdk did
+ [\#11306](https://github.com/vector-im/riot-web/pull/11306)
+ * Update from Weblate
+ [\#11300](https://github.com/vector-im/riot-web/pull/11300)
+
+Changes in [1.5.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.2) (2019-11-04)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1...v1.5.2)
+
+ * Fix close window behaviour on Macos
+ [\#11311](https://github.com/vector-im/riot-web/pull/11311)
+
+Changes in [1.5.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.1) (2019-11-04)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1-rc.2...v1.5.1)
+
+ * No changes since rc.2
+
+Changes in [1.5.1-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.1-rc.2) (2019-11-01)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.1-rc.1...v1.5.1-rc.2)
+
+ * Updated react-sdk with fix for bug that caused room filtering to
+ omit results.
+
+Changes in [1.5.1-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.1-rc.1) (2019-10-30)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.0...v1.5.1-rc.1)
+
+ * Add ability to hide tray icon on non-Mac (which has no tray icon)
+ [\#11258](https://github.com/vector-im/riot-web/pull/11258)
+ * Fix bug preventing display from sleeping after a call
+ [\#11264](https://github.com/vector-im/riot-web/pull/11264)
+ * Remove mention of CI scripts from docs
+ [\#11257](https://github.com/vector-im/riot-web/pull/11257)
+ * Fix skinning replaces being broken since being rewritten as React FC's
+ [\#11254](https://github.com/vector-im/riot-web/pull/11254)
+ * Update config docs about identity servers
+ [\#11249](https://github.com/vector-im/riot-web/pull/11249)
+ * Remove unneeded help about identity servers
+ [\#11248](https://github.com/vector-im/riot-web/pull/11248)
+ * Update from Weblate
+ [\#11243](https://github.com/vector-im/riot-web/pull/11243)
+ * Update sample config for new matrix.org CS API URL
+ [\#11207](https://github.com/vector-im/riot-web/pull/11207)
+ * clarify where the e2e tests are located
+ [\#11115](https://github.com/vector-im/riot-web/pull/11115)
+ * Update from Weblate
+ [\#11171](https://github.com/vector-im/riot-web/pull/11171)
+ * Prevent referrers from being sent
+ [\#6155](https://github.com/vector-im/riot-web/pull/6155)
+ * Add darkModeSupport to allow dark themed title bar.
+ [\#11140](https://github.com/vector-im/riot-web/pull/11140)
+ * Fix the label of Turkish language
+ [\#11124](https://github.com/vector-im/riot-web/pull/11124)
+ * Update default HS config to match well-known
+ [\#11112](https://github.com/vector-im/riot-web/pull/11112)
+
Changes in [1.5.0](https://github.com/vector-im/riot-web/releases/tag/v1.5.0) (2019-10-18)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.0-rc.1...v1.5.0)
diff --git a/docs/config.md b/docs/config.md
index e609f26d..7fa7774e 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -22,9 +22,10 @@ For a good example, see https://riot.im/develop/config.json.
`default_hs_url` is specified. When multiple sources are specified, it is unclear
which should take priority and therefore the application cannot continue.
* As of Riot 1.4.0, identity servers are optional. See [Identity servers](#identity-servers) below.
-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. The available features are described in [labs.md](labs.md).
+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 and are [documented](labs.md). The feature flag process is
+ [documented](feature-flags.md) as well.
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
diff --git a/docs/feature-flags.md b/docs/feature-flags.md
new file mode 100644
index 00000000..8d31afec
--- /dev/null
+++ b/docs/feature-flags.md
@@ -0,0 +1,112 @@
+# Feature flags
+
+When developing new features for Riot, we use feature flags to give us more
+flexibility and control over when and where those features are enabled.
+
+For example, flags make the following things possible:
+
+* Extended testing of a feature via labs on develop
+* Enabling features when ready instead of the first moment the code is released
+* Testing a feature with a specific set of users (by enabling only on a specific
+ Riot instance)
+
+The size of the feature controlled by a feature flag may vary widely: it could
+be a large project like reactions or a smaller change to an existing algorithm.
+A large project might use several feature flags if it's useful to control the
+deployment of different portions independently.
+
+Everyone involved in a feature (engineering, design, product, reviewers) should
+think about its deployment plan up front as best as possible so we can have the
+right feature flags in place from the start.
+
+## Interaction with spec process
+
+Historically, we have often used feature flags to guard client features that
+depend on unstable spec features. Unfortunately, there was never clear agreement
+about how long such a flag should live for, when it should be removed, etc.
+
+Under the [new spec
+process](https://github.com/matrix-org/matrix-doc/pull/2324), server-side
+unstable features can be used by clients and enabled by default as long as
+clients commit to doing the associated clean up work once a feature stabilises.
+
+## Starting work on a feature
+
+When starting work on a feature, we should create a matching feature flag:
+
+1. Add a new
+ [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js)
+ of the form:
+```js
+ "feature_cats": {
+ isFeature: true,
+ displayName: _td("Adds cats everywhere"),
+ supportedLevels: LEVELS_FEATURE,
+ default: false,
+ },
+```
+2. Check whether the feature is enabled as appropriate:
+```js
+ SettingsStore.isFeatureEnabled("feature_cats")
+```
+3. Add the feature to the [set of labs on develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json):
+```json
+ "features": {
+ "feature_cats": "labs"
+ },
+```
+4. Document the feature in the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md)
+
+With these steps completed, the feature is disabled by default, but can be
+enabled on develop by interested users for testing.
+
+Different features may have different deployment plans for when to enable where.
+The following lists a few common options.
+
+## Enabling by default on develop
+
+Set the feature to `enable` in the [develop config](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json):
+
+```json
+ "features": {
+ "feature_cats": "enable"
+ },
+```
+
+## Enabling by default on staging and app
+
+Set the feature to `enable` in the [app
+config](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json).
+
+## Feature deployed successfully
+
+Once we're confident that a feature is working well, we should remove the flag:
+
+1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js)
+2. Remove all `isFeatureEnabled` lines that test for the feature's setting
+3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md)
+4. Remove feature state from
+ [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json)
+ and [app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json)
+ configs
+5. Celebrate! 🥳
+
+## Convert to a regular setting (optional)
+
+Sometimes we decide a feature should always be user-controllable as a setting
+even after it has been fully deployed. In that case, we would craft a new,
+regular setting:
+
+1. Remove the feature flag from
+ [settings](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js)
+ and add a regular setting with the appropriate levels for your feature
+2. Replace the `isFeatureEnabled` lines with `getValue` or similar calls
+ according to the [settings
+ docs](https://github.com/matrix-org/matrix-react-sdk/blob/develop/docs/settings.md)
+ (checking carefully, as we may want a different mix of code paths when the
+ feature is always present but gated by a setting)
+3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md)
+4. Remove feature state from
+ [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json)
+ and [app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json)
+ configs
diff --git a/docs/labs.md b/docs/labs.md
index 0c1fb7d0..1a850fcc 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -59,3 +59,11 @@ but are hidden by default.
Ban lists are rooms within Matrix, proposed as [MSC2313](https://github.com/matrix-org/matrix-doc/pull/2313).
[Mjolnir](https://github.com/matrix-org/mjolnir) is a set of moderation tools which support
ban lists.
+
+## Verifications in DMs (`feature_dm_verification`)
+
+An implementation of [MSC2241](https://github.com/matrix-org/matrix-doc/pull/2241). When enabled, verification might not work with devices which don't support MSC2241.
+
+## New user info panel (`feature_user_info_panel`)
+
+A new implementation of the user & member info panel, designed to share more code between showing community members & room members.
diff --git a/electron_app/package.json b/electron_app/package.json
index 30012970..2b75dadb 100644
--- 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.5.0",
+ "version": "1.5.3",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
index 48a425c9..7e65c534 100644
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -393,7 +393,7 @@ app.on('ready', () => {
});
mainWindow.on('close', (e) => {
// If we are not quitting and have a tray icon then minimize to tray
- if (!global.appQuitting && tray.hasTray()) {
+ if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) {
// On Mac, closing the window just hides it
// (this is generally how single-window Mac apps
// behave, eg. Mail.app)
diff --git a/package.json b/package.json
index 84f18a80..b3c19525 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
- "version": "1.5.0",
+ "version": "1.5.3",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -74,8 +74,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
- "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
- "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+ "matrix-js-sdk": "2.4.3",
+ "matrix-react-sdk": "1.7.2",
"modernizr": "^3.6.0",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"prop-types": "^15.7.2",
@@ -111,12 +111,13 @@
"electron-builder": "^21.2.0",
"electron-builder-squirrel-windows": "^21.2.0",
"electron-devtools-installer": "^2.2.4",
- "electron-notarize": "^0.1.1",
+ "electron-notarize": "^0.2.0",
"eslint": "^5.8.0",
"eslint-config-google": "^0.7.1",
"eslint-plugin-babel": "^4.1.2",
"eslint-plugin-flowtype": "^2.50.3",
"eslint-plugin-react": "^7.11.1",
+ "eslint-plugin-react-hooks": "^2.2.0",
"expect": "^1.16.0",
"file-loader": "^3.0.1",
"fs-extra": "^0.30.0",
@@ -154,7 +155,7 @@
},
"build": {
"appId": "im.riot.app",
- "electronVersion": "6.1.12",
+ "electronVersion": "6.1.4",
"files": [
"node_modules/**",
"src/**"
diff --git a/riot.im/app/config.json b/riot.im/app/config.json
index 70ecddfd..974c30c2 100644
--- a/riot.im/app/config.json
+++ b/riot.im/app/config.json
@@ -25,8 +25,6 @@
}
},
"features": {
- "feature_lazyloading": "enable",
- "feature_room_breadcrumbs": "labs"
},
"roomDirectory": {
"servers": [
diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
index ed31d62a..78849e7e 100644
--- a/riot.im/develop/config.json
+++ b/riot.im/develop/config.json
@@ -13,22 +13,14 @@
"hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"features": {
- "feature_rich_quoting": "labs",
"feature_pinning": "labs",
- "feature_presence_management": "labs",
- "feature_sticker_messages": "labs",
- "feature_jitsi": "labs",
- "feature_tag_panel": "enable",
- "feature_keybackup": "labs",
"feature_custom_status": "labs",
"feature_custom_tags": "labs",
- "feature_lazyloading": "enable",
- "feature_tabbed_settings": "labs",
- "feature_sas": "labs",
- "feature_room_breadcrumbs": "labs",
"feature_state_counters": "labs",
"feature_many_integration_managers": "labs",
"feature_mjolnir": "labs"
+ "feature_user_info_panel": "labs",
+ "feature_dm_verification": "labs"
},
"welcomeUserId": "@riot-bot:matrix.org",
"piwik": {
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index a2ab2af4..5a870287 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -41,6 +41,13 @@
"Sign In": "Přihlásit se",
"Create Account": "Vytvořit účet",
"Need help?": "Chcete pomoct?",
- "Explore rooms": "Objevit místnosti",
- "Room Directory": "Adresář místností"
+ "Explore rooms": "Prohlížet místnosti",
+ "Room Directory": "Adresář místností",
+ "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfigurace Riotu obsahuje neplatný JSON. Opravte prosím tento problém a obnovte stránku.",
+ "The message from the parser is: %(message)s": "Zpráva z parseru je: %(message)s",
+ "Invalid JSON": "Neplatný JSON",
+ "Your Riot is misconfigured": "Riot je špatně nakonfigurován",
+ "Unexpected error preparing the app. See console for details.": "Neočekávaná chyba při přípravě aplikace. V konzoli je více informací.",
+ "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neplatná konfigurace: je možné specifikovat pouze jednu volbu z default_server_config, default_server_name, nebo default_hs_url.",
+ "Invalid configuration: no default server specified.": "Neplatná konfigurace: není zadán výchozí server."
}
diff --git a/src/i18n/strings/cy.json b/src/i18n/strings/cy.json
new file mode 100644
index 00000000..8f031b3e
--- /dev/null
+++ b/src/i18n/strings/cy.json
@@ -0,0 +1,25 @@
+{
+ "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Mae eich gosodiadau Riot yn cynnwys JSON annilys. Cywirwch y broblem ac ail-lwythwch y dudalen.",
+ "The message from the parser is: %(message)s": "Y neges gan y dosrannudd yn: %(message)s",
+ "Invalid JSON": "JSON annilys",
+ "Your Riot is misconfigured": "Mae eich Riot wedi'i gamosod",
+ "Unexpected error preparing the app. See console for details.": "Gwall annisgwyl wrth baratoi'r app. Gweler y consol am fanylion.",
+ "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Gosodiad annilys: dim ond un o default_server_config, default_server_name, neu default_hs_url y gall ei nodi.",
+ "Invalid configuration: no default server specified.": "Gosodiad annilys: ni nodwyd gweinydd diofyn.",
+ "Riot Desktop on %(platformName)s": "Riot Cyfrifiadur ar %(platformName)s",
+ "Unknown device": "Dyfais anhysbys",
+ "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s trwy %(browserName)s ar %(osName)s",
+ "You need to be using HTTPS to place a screen-sharing call.": "Mae angen i chi fod yn defnyddio HTTPS i osod galwad rhannu sgrin.",
+ "powered by Matrix": "pwerwyd gan Matrix",
+ "Custom Server Options": "Opsiynau Gweinydd Addasadwy",
+ "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.": "Gallwch ddefnyddio'r opsiynau gweinydd addasadwy i mewngofnodi i mewn i weinyddion Matrix eraill trwy rhoi URL hafanweinydd gwahanol. Mae hyn yn caniatáu ichi ddefnyddio Riot gyda chyfrif Matrix sy'n bodoli eisoes ar hafanweinydd gwahanol.",
+ "Dismiss": "Wfftio",
+ "Welcome to Riot.im": "Croeso i Riot.im",
+ "Decentralised, encrypted chat & collaboration powered by [matrix]": "Sgwrsio a chydweithredu datganoledig a amgryptiedig â phwerwyd gan [matrix]",
+ "Sign In": "Mewngofnodi",
+ "Create Account": "Creu Cyfrif",
+ "Need help?": "Angen cymorth?",
+ "Chat with Riot Bot": "Sgwrsio gyda Riot Bot",
+ "Explore rooms": "Archwilio Ystafelloedd",
+ "Room Directory": "Cyfeiriadur Ystafelloedd"
+}
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 3a8d21d2..43eff0e4 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -4,11 +4,11 @@
"Dismiss": "Απόρριψη",
"Riot Desktop on %(platformName)s": "Riot Desktop σε %(platformName)s",
"Unknown device": "Άγνωστη συσκευή",
- "You need to be using HTTPS to place a screen-sharing call.": "Απαιτείται η χρήση HTTPS για το διαμοιρασμό της επιφάνειας εργασίας μέσω κλήσης.",
+ "You need to be using HTTPS to place a screen-sharing call.": "Απαιτείται η χρήση HTTPS για την πραγματοποίηση κλήσης διαμοιρασμού επιφάνειας εργασίας.",
"Riot is not supported on mobile web. Install the app?": "Το Riot δεν υποστηρίζεται από περιηγητές κινητών. Θέλετε να εγκαταστήσετε την εφαρμογή;",
- "powered by Matrix": "με τη βοήθεια του Matrix",
+ "powered by Matrix": "λειτουργεί με το Matrix",
"Welcome to Riot.im": "Καλώς ήλθατε στο Riot.im",
- "Decentralised, encrypted chat & collaboration powered by [matrix]": "Αποκεντρωμένη, κρυπτογραφημένη συνομιλία & συνεργασία με τη βοήθεια του [matrix]",
+ "Decentralised, encrypted chat & collaboration powered by [matrix]": "Αποκεντρωμένη, κρυπτογραφημένη συνομιλία και συνεργασία χρησιμοποιώντας το [matrix]",
"Search the room directory": "Αναζήτηση στο ευρετήριο δωματίων",
"Chat with Riot Bot": "Συνομιλία με το Riot Bot",
"Get started with some tips from Riot Bot!": "Ξεκινήστε με μερικές συμβουλές από το Riot Bot!",
@@ -39,5 +39,14 @@
"Sign In": "Σύνδεση",
"Create Account": "Δημιουργία Λογαριασμού",
"Need help?": "Χρειάζεστε βοήθεια;",
- "Room Directory": "Ευρετήριο δωματίων"
+ "Room Directory": "Ευρετήριο δωματίων",
+ "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Η ρύθμιση παραμέτρων σας του Riot περιλαμβάνει μη έγκυρο JSON. Παρακαλώ διορθώστε το πρόβλημα και επαναφορτώστε την σελίδα.",
+ "The message from the parser is: %(message)s": "Το μήνυμα από τον αναλυτή είναι: %(message)s",
+ "Invalid JSON": "Μη έγκυρο JSON",
+ "Your Riot is misconfigured": "Οι παράμετροι του Riot σας είναι λανθασμένα ρυθμισμένοι",
+ "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.": "Μη έγκυρη ρύθμιση παραμέτρων: δεν έχει οριστεί προκαθορισμένος διακομιστής.",
+ "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 σε ένα διαφορετικό διακομιστή φιλοξενίας.",
+ "Explore rooms": "Εξερευνήστε δωμάτια"
}
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 022f721c..6176de21 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -10,7 +10,7 @@
"powered by Matrix": "Matrix の支援により活動しています。",
"Riot Desktop on %(platformName)s": "%(platformName)s向けデスクトップ版Riot",
"You need to be using HTTPS to place a screen-sharing call.": "画面共有通話を行うにはHTTPS通信を使う必要があります。",
- "Decentralised, encrypted chat & collaboration powered by [matrix]": "分散型の、暗号化された会話とコラボレーション。[matrix]で動作しています",
+ "Decentralised, encrypted chat & collaboration powered by [matrix]": "[matrix]が支援する、分散型で暗号化された会話とコラボレーション",
"Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "既にたくさんの部屋が、既存のネットワーク（Slack、IRC、Gitter等）に接続して、または独立的にMatrixに存在します。ディレクトリを検索してください！",
"Chat with Riot Bot": "Riot Botと会話",
"Get started with some tips from Riot Bot!": "Riot Botにヒントをもらって始めましょう！",
@@ -37,11 +37,16 @@
"Dev chat for the Dendrite dev team": "Dendrite開発者チームのための開発者チャット",
"Co-ordination for Riot translators": "Riot 翻訳者による共同作業",
"Unexpected error preparing the app. See console for details.": "アプリケーションの準備中に予期しないエラーが発生しました。詳細はコンソールを参照してください。",
- "Your Riot is misconfigured": "あなたの Riot は間違って設定されています。",
+ "Your Riot is misconfigured": "あなたのRiotは設定が間違っています",
"Invalid configuration: no default server specified.": "不正な設定です：デフォルトのサーバーが設定されていません。",
"Sign In": "サインイン",
"Create Account": "アカウントを作成する",
"Need help?": "助けが必要ですか？",
"Explore rooms": "部屋を探索する",
- "Room Directory": "部屋のディレクトリー"
+ "Room Directory": "部屋のディレクトリー",
+ "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riotの設定に妥当でないJSONが含まれています。問題を修正してページを再読みしてください。",
+ "The message from the parser is: %(message)s": "パーザーのメッセージ: %(message)s",
+ "Invalid JSON": "妥当でないJSON",
+ "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のいずれか一つのみが指定できます。",
+ "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.": "サーバーのカスタムオプションに別のホームサーバーURLを指定することで他のMatrixサーバーにサインインすることができます。これにより別のホームサーバー上で既にあるMatrixのアカウントでRiotを使うことができます。"
}
diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 6c1e8f1b..2c588830 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -8,8 +8,8 @@
"Riot is not supported on mobile web. Install the app?": "Riot nėra palaikoma naršant svetainėje mobiliaisiais įrenginiais. Įdiegti programėlę?",
"Riot Desktop on %(platformName)s": "Riot Desktop, naudojant %(platformName)s",
"%(appName)s via %(browserName)s on %(osName)s": "%(appName)s per %(browserName)s, naudojant %(osName)s",
- "You need to be using HTTPS to place a screen-sharing call.": "Norint skambinti su ekrano bendrinimo funkcija būtina naudoti HTTPS.",
- "Custom Server Options": "Tinkinto serverio parametrai",
+ "You need to be using HTTPS to place a screen-sharing call.": "Norint skambinti naudojant ekrano vaizdo dalijimosi funkciją, jūs turite naudoti HTTPS.",
+ "Custom Server Options": "Pasirinktiniai Serverio Nustatymai",
"You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.
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.": "Norėdami prisijungti prie kito nei Matrix serverio, galite naudoti tinkinto serverio parametrus ir nurodyti kito serverio URL adresą.
Tai leis jums naudoti Riot su esama Matrix paskyra kituose serveriuose.
Taip pat galite nustatyti tinkintą tapatybės serverį, tačiau tuomet negalėsite pakviesti kitus naudotojus pagal el. paštą, o taip pat ir jie negalės pakviesti jūsų.",
"Dismiss": "Atmesti",
"Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralizuoti, šifruoti pokalbiai ir bendradarbiavimas, veikiantis su [matrix]",
@@ -40,5 +40,13 @@
"Create Account": "Sukurti paskyrą",
"Need help?": "Reikia pagalbos?",
"Explore rooms": "Peržiūrėti kambarius",
- "Room Directory": "Kambarių katalogas"
+ "Room Directory": "Kambarių katalogas",
+ "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Jūsų Riot konfigūracijoje yra klaidingas JSON. Prašome pataisyti problemą ir iš naujo užkrauti puslapį.",
+ "The message from the parser is: %(message)s": "Analizatoriaus žinutė yra: %(message)s",
+ "Invalid JSON": "Klaidingas JSON",
+ "Your Riot is misconfigured": "Jūsų Riot yra neteisingai sukonfigūruotas",
+ "Unexpected error preparing the app. See console for details.": "Netikėta klaida ruošiant programą. Norėdami sužinoti daugiau detalių, žiūrėkite konsolę.",
+ "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Klaidinga konfigūracija: galima nurodyti tik vieną iš default_server_config, default_server_name, arba default_hs_url.",
+ "Invalid configuration: no default server specified.": "Klaidinga konfigūracija: nenurodytas numatytasis serveris.",
+ "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.": "Jūs galite naudoti pasirinktinius serverio nustatymus, kad prisijungtumėte prie kitų Matrix serverių, nurodydami kito serverio URL. Tai leidžia jums naudotis Riot su esama Matrix paskyra kitame serveryje."
}
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 97898f52..64a0a9a9 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -30,5 +30,7 @@
"Create Account": "Lag konto",
"Need help?": "Trenger du hjelp?",
"Room Directory": "Alle rom",
- "Explore rooms": "Se alle rom"
+ "Explore rooms": "Se alle rom",
+ "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot-konfigurasjonen din inneholder ugyldig JSON. Vennligst fiks problemet og oppdater siden.",
+ "The message from the parser is: %(message)s": "Meldingen fra parseren er: %(message)s"
}
diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
index dd4df4e6..78dce498 100644
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -200,7 +200,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
}
supportsAutoHideMenuBar(): boolean {
- return true;
+ // This is irelevant on Mac as Menu bars don't live in the app window
+ return !navigator.platform.toUpperCase().includes('MAC');
}
async getAutoHideMenuBarEnabled(): boolean {
diff --git a/yarn.lock b/yarn.lock
index 9b520a5b..3a7cc580 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3134,13 +3134,13 @@ electron-devtools-installer@^2.2.4:
rimraf "^2.5.2"
semver "^5.3.0"
-electron-notarize@^0.1.1:
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.1.1.tgz#c3563d70c5e7b3315f44e8495b30050a8c408b91"
- integrity sha512-TpKfJcz4LXl5jiGvZTs5fbEx+wUFXV5u8voeG5WCHWfY/cdgdD8lDZIZRqLVOtR3VO+drgJ9aiSHIO9TYn/fKg==
+electron-notarize@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.2.0.tgz#676c71688ee84149bab27b22426d0a9452e7e262"
+ integrity sha512-u3KdEMOEcGMF9yCML8ej4ZF+O29VmGYIjrs/DoOi23neTWOMiIc5YCeFs4vxq3JG496omcw7Y5pimPm0sH9A7g==
dependencies:
debug "^4.1.1"
- fs-extra "^8.0.1"
+ fs-extra "^8.1.0"
electron-publish@21.2.0:
version "21.2.0"
@@ -3364,6 +3364,11 @@ eslint-plugin-flowtype@^2.50.3:
dependencies:
lodash "^4.17.10"
+eslint-plugin-react-hooks@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.2.0.tgz#078264e9e388da6929ace09d6abe92c85963aff4"
+ integrity sha512-jSlnBjV2cmyIeL555H/FbvuSbQ1AtpHjLMHuPrQnt1eVA6lX8yufdygh7AArI2m8ct7ChHGx2uOaCuxq2MUn6g==
+
eslint-plugin-react@^7.11.1:
version "7.14.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz#911030dd7e98ba49e1b2208599571846a66bdf13"
@@ -4091,7 +4096,7 @@ fs-extra@^0.30.0:
path-is-absolute "^1.0.0"
rimraf "^2.2.8"
-fs-extra@^8.0.1, fs-extra@^8.1.0:
+fs-extra@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
@@ -5950,9 +5955,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@github:matrix-org/matrix-js-sdk#develop":
- version "2.4.2"
- resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/46d7e4c7075386f1330d6a49941e9979fc26be0a"
+matrix-js-sdk@2.4.3:
+ version "2.4.3"
+ resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.3.tgz#23b78cc707a02eb0ce7eecb3aa50129e46dd5b6e"
+ integrity sha512-8qTqILd/NmTWF24tpaxmDIzkTk/bZhPD5N8h69PlvJ5Y6kMFctpRj+Tud5zZjl5/yhO07+g+JCyDzg+AagiM/A==
dependencies:
another-json "^0.2.0"
babel-runtime "^6.26.0"
@@ -5973,9 +5979,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
- version "1.7.0"
- resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/53332018234fc9067c6200babb794ab3538a0791"
+matrix-react-sdk@1.7.2:
+ version "1.7.2"
+ resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.2.tgz#4c16fa6c2d188311ecb5163773dfdf7ca92b7ecc"
+ integrity sha512-CWCr41sRBeUChlvec6eJxmY02g+Re6PN3lt9tR7TkqGKyUu++Y72WPfirM+0t11QVtVyZ5Wo1WIzpropLBFyYw==
dependencies:
babel-plugin-syntax-dynamic-import "^6.18.0"
babel-runtime "^6.26.0"
@@ -6006,7 +6013,7 @@ matrix-mock-request@^1.2.3:
linkifyjs "^2.1.6"
lodash "^4.17.14"
lolex "4.2"
- matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+ matrix-js-sdk "2.4.3"
optimist "^0.6.1"
pako "^1.0.5"
png-chunks-extract "^1.0.0"