OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
20,917 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

16707 Commits (5ccf5573da3e89e2492508f87f19ff4ba3033ea8)

Author SHA1 Message Date
Zoe a409b9b96f whoops, left some printfs 2020-01-23 11:14:01 +00:00
Zoe ee33c7cd62 lint 2020-01-23 11:10:39 +00:00
David Baker 10db79bb93 Merge remote-tracking branch 'origin/develop' into dbkr/bootstrap_visuals_1 2020-01-23 11:05:21 +00:00
Weblate f3a846dfff Merge branch 'origin/develop' into Weblate. 2020-01-23 11:04:58 +00:00
Balázs Meskó 5d8249507c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-23 11:04:57 +00:00
Kévin C f7ca8a1b84 Translated using Weblate (French) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-23 11:04:56 +00:00
Jeff Huang 8218962c37 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-23 11:04:56 +00:00
David Baker 442b8be459
Merge pull request #3897 from matrix-org/dbkr/bootstrap_from_key_backup_ui 
Implement some parts of new cross signing bootstrap UI
 2020-01-23 11:04:49 +00:00
Zoe d68db74efe Room list reflects encryption state 2020-01-23 10:46:05 +00:00
David Baker c0b7132404 Different copy on done screen if we setup from scratch 2020-01-23 10:18:08 +00:00
Travis Ralston e41f94bdb7 Try to populate user IDs even when the server's directory fails us 
Fixes https://github.com/vector-im/riot-web/issues/11943
 2020-01-22 22:33:50 -07:00
Travis Ralston 054ebb9458 Fix scrollable area and padding in user lists dialog 2020-01-22 21:07:29 -07:00
Weblate c86f0795bd Merge branch 'origin/develop' into Weblate. 2020-01-23 01:06:48 +00:00
J. Ryan Stinnett 1fdd155dd2
Merge pull request #3904 from matrix-org/jryans/report-admin-external-links 
Treat links as external in report content admin message
 2020-01-23 01:06:42 +00:00
J. Ryan Stinnett a504faa2f6 Treat links as external in report content admin message 
This marks all the links in the report content admin message (in Markdown
format) as external so they open in a new tab.
 2020-01-22 22:08:37 +00:00
Weblate d2d5c446e7 Merge branch 'origin/develop' into Weblate. 2020-01-22 21:14:31 +00:00
catborise 78ed8019d4 Translated using Weblate (Turkish) 
Currently translated at 72.6% (1482 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-22 20:57:27 +00:00
Szimszon cf5673be17 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-22 20:57:24 +00:00
David Baker 30b0663eb0 lint 2020-01-22 18:15:35 +00:00
David Baker 78654cc693 Updated visuals for cross-signing bootstrap 
* Use Fields rather than plain inputs
 * Update padding & alignment to match designs
 * Add Skip buttons
 * Update copy as per designs

Part of https://github.com/vector-im/riot-web/issues/11902
Based on https://github.com/matrix-org/matrix-react-sdk/pull/3897
 2020-01-22 18:08:39 +00:00
Michael Telatynski b7d1c17ad1 simple optimization to bail out of check on first failure 2020-01-22 16:56:27 +00:00
Michael Telatynski 9706114bb5 move E2E_STATE to E2EIcon to simplify imports 2020-01-22 16:54:31 +00:00
Michael Telatynski 33b5d42c06 Be consistent about our settings svg, free the other one 2020-01-22 15:34:17 +00:00
Damir Jelić c3418df919 FilePanel: Remove whitespace before two function definitions. 2020-01-22 16:31:49 +01:00
Damir Jelić c5e8753b05 FilePanel: Don't import the whole of the js-sdk. 2020-01-22 16:26:40 +01:00
Weblate 186def976f Merge branch 'origin/develop' into Weblate. 2020-01-22 15:26:26 +00:00
Damir Jelić f917c2faea FilePanel: Listen for live events and add them to an open FilePanel. 2020-01-22 16:21:11 +01:00
David Baker 7e52eb9f65 Unused import 2020-01-22 15:16:41 +00:00
David Baker c04872dd9b i18n 2020-01-22 15:12:38 +00:00
Damir Jelić 735ba4fd33 EventIndex: Correctly populate events on initial fill requests. 2020-01-22 16:11:54 +01:00
David Baker e3a28e3e44 Remove the react-sdk version 
I'm not sure if there was ever a point where this did work and
we had 'dist' and 'gitHead' properties in our package.json but
I can't find any trace of them now and I'm sick of this just being
there syaing '<local>' all the time.
 2020-01-22 15:05:25 +00:00
Weblate ebe0cc486c Merge branch 'origin/develop' into Weblate. 2020-01-22 14:32:15 +00:00
Michael Telatynski 97edb824bc
Merge pull request #3893 from matrix-org/t3chguy/double_slash 
Slash Command improvements around sending messages with leading slash
 2020-01-22 14:32:09 +00:00
Weblate b5d20cc0a2 Merge branch 'origin/develop' into Weblate. 2020-01-22 14:25:44 +00:00
Michael Telatynski 516dd25797 fix typo in fallback codepath 2020-01-22 14:24:10 +00:00
J. Ryan Stinnett fbb65f068a Support admin configurable message when reporting content 
This adds support for an admin-configured message in config.json to be shown in
the report content dialog to allow linking to community rules, etc.

Fixes https://github.com/vector-im/riot-web/issues/11992
 2020-01-22 14:07:18 +00:00
Michael Telatynski 832da062cc Improve trailing spurious breaks + tests 2020-01-22 13:37:27 +00:00
Michael Telatynski e1e53f567f add more tests 2020-01-22 11:56:27 +00:00
David Baker e98269822c Add icon to bootstrap dialogs 2020-01-22 11:44:47 +00:00
Weblate 433d13277b Merge branch 'origin/develop' into Weblate. 2020-01-22 11:44:22 +00:00
random 5571164fe0 Translated using Weblate (Italian) 
Currently translated at 100.0% (2039 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-01-22 11:44:21 +00:00
Zoe 684974372d
Merge pull request #3896 from matrix-org/zip/11986-only-warn-unverified 
Don't warn on unverified users; ensured behavior stays the same with flags off
 2020-01-22 11:44:14 +00:00
Weblate e7a54ac3ea Merge branch 'origin/develop' into Weblate. 2020-01-22 11:24:31 +00:00
Szimszon e923fdb149 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2039 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-22 11:24:31 +00:00
Kévin C d92ddebe5a Translated using Weblate (French) 
Currently translated at 100.0% (2039 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-22 11:24:31 +00:00
Jeff Huang 78f7622fc5 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2039 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-22 11:24:31 +00:00
Michael Telatynski 2a331c0a2b
Merge pull request #3895 from matrix-org/t3chguy/roving 
Fix roving room list for resizer and ff tabstop a11y
 2020-01-22 11:24:23 +00:00
Zoe 85ee6bd51f Don't warn on unverified users; ensured behavior stays the same with flags off 2020-01-22 11:22:20 +00:00
David Baker 644d68d836 Update copy in bootstrap success dialog phase 2020-01-22 10:59:50 +00:00
David Baker d211372740 UI to bootsrap SSSS from key backup 2020-01-22 10:44:02 +00:00
Michael Telatynski 37fb500e22 fix useCallback dependencies, delint 2020-01-22 10:41:10 +00:00
Michael Telatynski 2c6fe78012 Fix roving room list for resizer and ff tabstop a11y 2020-01-22 10:36:20 +00:00
Weblate d2ff9b1abc Merge branch 'origin/develop' into Weblate. 2020-01-21 18:11:41 +00:00
Zoe 0809d7dcba
Merge pull request #3875 from matrix-org/zip/11880-message-shields 
Verify individual messages via cross-signing
 2020-01-21 18:11:36 +00:00
Michael Telatynski 7b26067397 delint 2020-01-21 18:03:01 +00:00
Michael Telatynski e455aa474d improve copy further 2020-01-21 17:58:53 +00:00
Michael Telatynski a8df058ea6 tidy up, improve wording on modal 2020-01-21 17:54:27 +00:00
Weblate 36329495bb Merge branch 'origin/develop' into Weblate. 2020-01-21 17:36:37 +00:00
catborise 931c0885de Translated using Weblate (Turkish) 
Currently translated at 70.7% (1440 of 2038 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-21 17:36:36 +00:00
Michael Telatynski 587ff6ad75
Merge pull request #3844 from matrix-org/t3chguy/roving 
Implement Roving Tab Index and Room List as TreeView
 2020-01-21 17:36:30 +00:00
Zoe 2480f709b3 E2ESTATE -> E2E_STATE 2020-01-21 17:19:10 +00:00
Michael Telatynski 9f7df33bc3 re-arrange to split the async task into two and only wait on the user-blocking one 2020-01-21 16:57:07 +00:00
Weblate d0ebea044c Merge branch 'origin/develop' into Weblate. 2020-01-21 16:56:14 +00:00
Zoe ec714283ca
Merge pull request #3888 from matrix-org/zip/11833-overlay-shields 
Move room header shields over the avatar for the room
 2020-01-21 16:56:09 +00:00
Weblate 5926fa7d9d Merge branch 'origin/develop' into Weblate. 2020-01-21 16:52:14 +00:00
Michael Telatynski b34fe45518 First attempt. Has a lag issue due to the async-clear :( 2020-01-21 16:50:04 +00:00
Michael Telatynski 060938379a Fix changes after typing / at pos=0 allowing to cancel command 2020-01-21 15:58:51 +00:00
Michael Telatynski b5e902e1f2 Fix escaping commands using double-slash //, e.g //plain sends `/plain` 2020-01-21 15:55:21 +00:00
Michael Telatynski b2aba6db35 Initial attempt to make toggleInlineFormat paragraph-aware 2020-01-21 15:32:32 +00:00
J. Ryan Stinnett 9c0cf326c1 Only show devices and verify actions in E2EE rooms 
This changes logic to only show the devices list and verify button in E2EE
rooms, matching the design.

Fixes https://github.com/vector-im/riot-web/issues/11839
 2020-01-21 15:13:03 +00:00
Damir Jelić a0599dedf0 EventIndex: Use the newly exposed TimelineWindow methods. 2020-01-21 15:45:29 +01:00
Weblate 34ba7a728e Merge branch 'origin/develop' into Weblate. 2020-01-21 13:44:26 +00:00
J. Ryan Stinnett 224528afd4
Merge pull request #3887 from matrix-org/jryans/user-verif-mismatch 
Change user info verification checks to use cross-signing
 2020-01-21 13:44:22 +00:00
Zoe c8a2f6a5a0 Move room header shields over the avatar for the room 
Currently this is calibrated like the lil' DM icon is
 2020-01-21 13:33:16 +00:00
Weblate adb1f8414d Merge branch 'origin/develop' into Weblate. 2020-01-21 13:15:43 +00:00
Michael Telatynski ddfed32ea9
Merge pull request #3886 from matrix-org/t3chguy/insert_mention_colon 
Fix click-to-ping not inserting colon if composer non-empty
 2020-01-21 13:15:38 +00:00
J. Ryan Stinnett b3d56b378e Use cross-signing verification only for own devices 
The device verification checks are slightly more nuanced: we want to use
stricter cross-signing checks for your own devices to encourage everyone to
trust their devices via cross-signing so that other users can in turn trust
them.

However, for other users, it's okay to use the looser verification check that
also includes locally verified devices.
 2020-01-21 12:03:52 +00:00
J. Ryan Stinnett a7231d7336 New session toast should check cross-signing verification 
To ensure all your sessions are cross-signing verified, we use the more specific
test for only that kind of verification in the new session toast.
 2020-01-21 11:33:14 +00:00
Michael Telatynski f56a9d246f Fix index for _insertMention 2020-01-21 11:13:08 +00:00
Weblate 6ee6bed1f1 Merge branch 'origin/develop' into Weblate. 2020-01-21 11:01:44 +00:00
Michael Telatynski adec308529
Merge pull request #3884 from matrix-org/t3chguy/emoji_space_complete 
Fix emoticon space completion for upper case emoticons like :D xD
 2020-01-21 11:01:40 +00:00
J. Ryan Stinnett 8a00ff7f1f Change all user info verification checks to cross-signing 
This fixes some user vs. device verification confusion in user info by changing
all the verification tests to the cross-signing variant when the lab is enabled.

Fixes https://github.com/vector-im/riot-web/issues/11886
 2020-01-21 11:00:40 +00:00
Weblate 7bc0abf01d Merge branch 'origin/develop' into Weblate. 2020-01-21 10:56:19 +00:00
J. Ryan Stinnett ff8ee5cc7d
Merge pull request #3880 from matrix-org/jryans/repair-cs-panel 
Repair cross-signing panel with async status
 2020-01-21 10:56:13 +00:00
Weblate bb0adb1c64 Merge branch 'origin/develop' into Weblate. 2020-01-21 10:33:27 +00:00
catborise b5d5f4e13a Translated using Weblate (Turkish) 
Currently translated at 70.0% (1428 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-21 10:33:27 +00:00
Makoto Kato 46f2c1f29b Translated using Weblate (Japanese) 
Currently translated at 60.1% (1226 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-01-21 10:33:26 +00:00
Szimszon 21dea18985 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2039 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-21 10:33:26 +00:00
Kévin C 961f52924e Translated using Weblate (French) 
Currently translated at 100.0% (2039 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-21 10:33:25 +00:00
Jeff Huang 996d0f1d20 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2039 of 2039 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-21 10:33:25 +00:00
Michael Telatynski 26bba4416b Fix emoticon space completion for upper case emoticons like :D xD 2020-01-21 10:12:23 +00:00
Zoe d34f1e52ad constants for e2estates 2020-01-21 10:08:53 +00:00
Michael Telatynski 397e116efb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/roving 2020-01-20 20:48:11 +00:00
Michael Telatynski be6a382121 delint 2020-01-20 20:46:12 +00:00
J. Ryan Stinnett 5a67bd4b46 Repair cross-signing panel with async status 
This repairs the cross-signing panel after recent changes that made the panel's
status an async function.

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3864
Fixes https://github.com/vector-im/riot-web/issues/11952
 2020-01-20 20:35:25 +00:00
Michael Telatynski 0bcfe5819f Integrate handleHomeEnd 2020-01-20 20:31:36 +00:00
J. Ryan Stinnett e947a68e13 Remove temporary key backup button 
This removes the temporary extra key backup setup button in Settings used for
testing with and without cross-signing. With this change, there's only one
button and the path you take is determined by the labs flag.

Fixes https://github.com/vector-im/riot-web/issues/11890
 2020-01-20 20:21:03 +00:00
Weblate bdd28bf922 Merge branch 'origin/develop' into Weblate. 2020-01-20 17:53:24 +00:00
Travis Ralston 7193e7dcb0
Merge pull request #3866 from matrix-org/travis/ftue/user-lists/7-suggestions 
Score users who have recently spoken higher in invite suggestions
 2020-01-20 10:53:18 -07:00
Weblate fa3b9584dd Merge branch 'origin/develop' into Weblate. 2020-01-20 17:18:40 +00:00
random 8df07334c3 Translated using Weblate (Italian) 
Currently translated at 100.0% (2035 of 2035 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-01-20 17:18:40 +00:00
Bruno Windels 95a0ebaf06
Merge pull request #3796 from matrix-org/bwindels/verification-right-panel 
Initial support for verification in right panel
 2020-01-20 17:18:32 +00:00
Zoe 12c4e45387 User verified but device deleted isn't a useful state 2020-01-20 17:15:38 +00:00
Travis Ralston 7c877fb9c4 Reinstate client variable that is actually used 2020-01-20 10:08:35 -07:00
Travis Ralston 727ca8ba77 Don't double check ourselves 2020-01-20 10:04:14 -07:00
Travis Ralston 551b2907d8 Fix variable usage and naming 2020-01-20 09:29:33 -07:00
Zoe 51fb3b494f lint and i18n 2020-01-20 15:25:28 +00:00
Zoe f77eb07849 Verify individual messages via cross-signing 
Fixes #11880
 2020-01-20 15:16:41 +00:00
David Baker a849826a41
Merge pull request #3874 from matrix-org/dbkr/fix_editor_modified_flag_2 
Fix arrows keys moving through edit history
 2020-01-20 13:42:44 +00:00
David Baker 277f107924 Set flag before mutating on cut too 2020-01-20 13:03:09 +00:00
David Baker 2ed5d89c9f Fix arrows keys moving through edit history 
Different fix that fixes https://github.com/vector-im/riot-web/issues/11817
by setting the flag before the callback rather than having the update
method set the flag.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3842
Fixes https://github.com/vector-im/riot-web/issues/11917
 2020-01-20 12:20:21 +00:00
J. Ryan Stinnett 15749621a5 Fix rageshake submission after build changes 
We aren't able to depend on `require` in this context anymore.

Fixes https://github.com/vector-im/riot-web/issues/11938
 2020-01-20 12:06:48 +00:00
Damir Jelić 4cf44cf5a5 EventIndex/FilePanel: Allow longer lines. 2020-01-20 12:43:20 +01:00
Damir Jelić 0b4b9d8d5d EventIndex: Simplify the json event getting logic. 2020-01-20 12:42:46 +01:00
Damir Jelić b4c8a686ce EventIndex: Don't import the whole js-sdk. 2020-01-20 12:41:55 +01:00
J. Ryan Stinnett d35788476a
Merge pull request #3867 from matrix-org/travis/fix-messagepanel-ref 
Fix error about MessagePanel not being available for read markers
 2020-01-20 11:38:27 +00:00
J. Ryan Stinnett 86a0a2e806
Merge pull request #3864 from matrix-org/jryans/complete-sec-confused 
Adjust secret storage to work before sync
 2020-01-20 11:31:01 +00:00
catborise 93b6040291 Translated using Weblate (Turkish) 
Currently translated at 69.3% (1410 of 2035 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-20 10:07:44 +00:00
Damir Jelić 0c854fce9b FilePanel: Remove a stale comment. 2020-01-20 10:09:58 +01:00
Damir Jelić 9978fee512 Lifecycle: Comment why we need to initialize the index before the client. 2020-01-20 10:06:20 +01:00
catborise 931cace323 Translated using Weblate (Turkish) 
Currently translated at 66.5% (1354 of 2035 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-19 15:22:54 +00:00
take100yen 0e2f90a31e Translated using Weblate (Japanese) 
Currently translated at 60.2% (1226 of 2035 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-01-19 15:22:53 +00:00
Szimszon 1ec55b611f Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2035 of 2035 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-19 15:22:50 +00:00
Kévin C 4d08cbecf7 Translated using Weblate (French) 
Currently translated at 100.0% (2035 of 2035 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-19 15:22:50 +00:00
Osoitz ef7aeda4d6 Translated using Weblate (Basque) 
Currently translated at 100.0% (2035 of 2035 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-01-19 15:22:50 +00:00
Weblate 4cc58c78dd Merge branch 'origin/develop' into Weblate. 2020-01-18 02:13:44 +00:00
Michael Telatynski c97de43f69 Remove unused fetch polyfills, querystring, require-json. Move glob to dev-dep 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-18 02:01:45 +00:00
Jeff Huang 2eaafa71a2 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2035 of 2035 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-18 01:52:40 +00:00
Travis Ralston df3fe5139d Fix error about MessagePanel not being available for read markers 
Stacktrace:
```
TimelinePanel.js?b9ae:1139 Uncaught (in promise) TypeError: Cannot read property 'getBoundingClientRect' of null
    at Object._getLastDisplayedEventIndex (TimelinePanel.js?b9ae:1139)
    at Object.updateReadMarker (TimelinePanel.js?b9ae:751)
    at Object._callee$ (TimelinePanel.js?b9ae:613)
    at tryCatch (runtime.js?4422:45)
    at Generator.invoke [as _invoke] (runtime.js?4422:271)
    at Generator.prototype.<computed> [as next] (runtime.js?4422:97)
    at asyncGeneratorStep (asyncToGenerator.js?56ef:3)
    at _next (asyncToGenerator.js?56ef:25)
```
 2020-01-17 17:07:37 -07:00
Travis Ralston 3850377e27 Appease the linter 2020-01-17 14:40:33 -07:00
Travis Ralston 2faa4254ba Score users who have recently spoken higher in invite suggestions 
Fixes https://github.com/vector-im/riot-web/issues/11769

The algorithm should be documented in the diff as comments.
 2020-01-17 14:36:23 -07:00
Weblate 06edb1ae1a Merge branch 'origin/develop' into Weblate. 2020-01-17 20:38:49 +00:00
David Baker c7ddba786b Move feature flag check for new session toast 
Forgot the path where it checks on startup. Just put it in recheck which covers everything.

Fixes https://github.com/vector-im/riot-web/issues/11921
 2020-01-17 20:06:44 +00:00
J. Ryan Stinnett 4a82e86859 Adjust secret storage to work before sync 
This adjusts to changed JS SDK APIs that allow secret storage to optionally ask
the server for any account data needed at login.

Fixes https://github.com/vector-im/riot-web/issues/11901
 2020-01-17 17:59:12 +00:00
Weblate 958818d49e Merge branch 'origin/develop' into Weblate. 2020-01-17 16:55:46 +00:00
David Baker 158bf3d1fa
Merge pull request #3863 from matrix-org/dbkr/catch_exception_checkterms 
Catch exception in checkTerms if no ID server
 2020-01-17 16:55:41 +00:00
David Baker 03cb76861f Catch exception in checkTerms if no ID server 
This line will throw if it can't get to the ID server, so move it
inside the catch block too.
 2020-01-17 16:26:47 +00:00
Bruno Windels 716c8ba68f pr feedback 2020-01-17 17:02:31 +01:00
Weblate 09e18be9f7 Merge branch 'origin/develop' into Weblate. 2020-01-17 15:43:28 +00:00
Szimszon 942b391d8e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2035 of 2035 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-17 15:43:28 +00:00
Bruno Windels a73b7229a7 fix lint 2020-01-17 16:31:38 +01:00
Bruno Windels 5556cb5749 Merge branch 'develop' into bwindels/verification-right-panel 2020-01-17 16:02:51 +01:00
Bruno Windels d20db3560a fix import paths after build system refactor 2020-01-17 15:50:27 +01:00
David Baker d69c5f6a1b Catch exception if passphrase dialog cancelled 
As hopefully explained by comment
 2020-01-17 14:46:20 +00:00
Weblate bba11c2862 Merge branch 'origin/develop' into Weblate. 2020-01-17 14:24:29 +00:00
J. Ryan Stinnett 1a6be3addd
Merge pull request #3860 from matrix-org/jryans/disable-key-request 
Disable key request dialogs with cross-signing
 2020-01-17 14:24:23 +00:00
Weblate 4ef116b3ce Merge branch 'origin/develop' into Weblate. 2020-01-17 14:17:28 +00:00
David Baker a525ba57c7
Merge pull request #3859 from matrix-org/dbkr/new_session_toast 
Toasts for new, unverified sessions
 2020-01-17 14:17:22 +00:00
Weblate 0cbb71894b Merge branch 'origin/develop' into Weblate. 2020-01-17 14:09:11 +00:00
David Baker 3a29a5e66c
Merge pull request #3861 from matrix-org/dbkr/suppress_integrationmanagers_error 
Check for a matrixclient before trying to use it
 2020-01-17 14:09:05 +00:00