Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 22:14:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,539 Commits 206 Branches 552 Tags 519 MiB
3eb07465f7
Commit Graph

17234 Commits

Author SHA1 Message Date
David Baker
85489c4ec5
Merge pull request #4014 from matrix-org/dbkr/theme_is_login_override 
Add an override for the theme
 2020-01-31 13:30:12 +00:00
Weblate
e3f9de0cf4 Merge branch 'origin/develop' into Weblate. 2020-01-31 13:22:28 +00:00
J. Ryan Stinnett
636b3696ed
Merge pull request #4011 from matrix-org/jryans/comp-sec-title 
Add title to complete security loading
 2020-01-31 13:22:22 +00:00
David Baker
cb9362456f remove setter 2020-01-31 13:18:01 +00:00
David Baker
2d9b111680 Add an override for the theme 
So we can force the light theme on unthemeable pages like the login
& complete security page.

Fixes https://github.com/vector-im/riot-web/issues/12149
Fixes https://github.com/vector-im/riot-web/issues/12157
 2020-01-31 12:28:14 +00:00
J. Ryan Stinnett
02cada7cc6 First pass of copy changes 2020-01-31 12:15:19 +00:00
J. Ryan Stinnett
b64ba1dbbf Add temporary feature flag to control padlocks 
This default on feature flag will help in case we want to trial padlocks on vs.
off this weekend.

Fixes https://github.com/vector-im/riot-web/issues/12166
 2020-01-31 11:09:49 +00:00
Weblate
0447501c3b Merge branch 'origin/develop' into Weblate. 2020-01-31 11:06:01 +00:00
David Baker
630507304a
Merge pull request #4012 from matrix-org/dbkr/just_one_zxcvbn_suggestion 
Only display the first zxcvbn warning/suggestion
 2020-01-31 11:05:54 +00:00
Weblate
9e92d2ab1c Merge branch 'origin/develop' into Weblate. 2020-01-31 11:00:20 +00:00
David Baker
c111d70deb
Merge pull request #4009 from matrix-org/dbkr/log_exceptions_other_than_cancel 
Log exceptions from accessSecretStorage
 2020-01-31 11:00:16 +00:00
David Baker
96d5fb5ce3 Only display the first zxcvbn warning/suggestion 
As per comment

Fixes https://github.com/vector-im/riot-web/issues/12150
 2020-01-31 10:59:35 +00:00
J. Ryan Stinnett
1a95a1d4ba Add title to complete security loading 2020-01-31 10:47:58 +00:00
Weblate
025adb0a6f Merge branch 'origin/develop' into Weblate. 2020-01-31 10:46:02 +00:00
J. Ryan Stinnett
19ab395c18
Merge pull request #3995 from matrix-org/jryans/4s-in-mem 
Add advanced option to keep secret storage in memory for session
 2020-01-31 10:45:57 +00:00
David Baker
ea7f160950 lint 2020-01-31 10:38:20 +00:00
Zoe
af0598bbcb double-check user verification 2020-01-31 10:37:40 +00:00
David Baker
26c9b64c3b Log exceptions from accessSecretStorage 
Rather than ignoring everything assuming the user cancelled
 2020-01-31 10:35:05 +00:00
Weblate
5ab707bd8b Merge branch 'origin/develop' into Weblate. 2020-01-31 10:20:18 +00:00
J. Ryan Stinnett
68b2454920
Merge pull request #4006 from matrix-org/jryans/user-list-deco 
Add shields to member list, move power label to text
 2020-01-31 10:20:13 +00:00
Weblate
e9426680be Merge branch 'origin/develop' into Weblate. 2020-01-31 10:20:10 +00:00
Jeff Huang
fe33e2664f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.2% (2086 of 2102 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-31 10:20:09 +00:00
David Baker
24075dc248
Merge pull request #4005 from matrix-org/dbkr/encryption_events 
Make encryption events into bubble-style tiles
 2020-01-31 10:20:03 +00:00
Zoe
36d7b8e3ed don't close in UI, a js-sdk event will do that 2020-01-31 09:59:24 +00:00
David Baker
d0ab37ac50 Only say the room is encrypted if it actually is 2020-01-31 09:58:21 +00:00
Weblate
2e65ec2c58 Merge branch 'origin/develop' into Weblate. 2020-01-31 09:58:05 +00:00
Jeff Huang
eb02c60abe Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.3% (2083 of 2098 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-31 09:58:05 +00:00
Zoe
585a38cd45
Merge pull request #4000 from matrix-org/foldleft/12038-copy 
Update copy when the user verifies their own devices
 2020-01-31 09:57:52 +00:00
J. Ryan Stinnett
3ef7e5113b Move power label to right of name 
The power label is shown to the right of the name, but hidden on hover.

Part of https://github.com/vector-im/riot-web/issues/11940
 2020-01-30 22:09:57 +00:00
J. Ryan Stinnett
57c4293fc6 Add verification status icons to room members 
This displays verification status on each room member tile using the same shield
logic as elsewhere.

Part of https://github.com/vector-im/riot-web/issues/11940
 2020-01-30 21:38:40 +00:00
Weblate
246a4406c9 Merge branch 'origin/develop' into Weblate. 2020-01-30 21:16:56 +00:00
Michael Telatynski
b98b0fe478
Merge pull request #4004 from matrix-org/t3chguy/invite 
Use Sets instead of array scans and simplify hiding of invalid users when inviting
 2020-01-30 21:16:51 +00:00
Weblate
813114390f Merge branch 'origin/develop' into Weblate. 2020-01-30 21:16:12 +00:00
Michael Telatynski
7db6f89a9f hmm, there were two things using the client :(( 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 21:07:32 +00:00
Michael Telatynski
1e09399dd6 delint and collapse two consecutive filter operations 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 21:01:55 +00:00
Michael Telatynski
7e45979e00 change order of if or conditions as micro-optimization 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 20:59:30 +00:00
David Baker
58d16fea7d lint 2020-01-30 20:59:27 +00:00
David Baker
d56de6a673 i18n again 2020-01-30 20:52:37 +00:00
David Baker
f84795ebae Remove now unused code from TextForEvent 2020-01-30 20:50:12 +00:00
David Baker
5760e71318 i18n 2020-01-30 20:50:06 +00:00
David Baker
2332cdb5d8
full stop 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-30 20:47:46 +00:00
David Baker
5447a04f8e oops, forgot the component 2020-01-30 20:15:15 +00:00
David Baker
39e9bffe1f Make encryption events into bubble-style tiles 
Factors out the verification tile stuff into encryption event
styles so we can reuse them betwen all the encryption event tiles.
Also makes the event list summary stuff even more gnarly by
putting the encryption event tile above the group. We really need
to refactor that. :/

Fixes https://github.com/vector-im/riot-web/issues/12006
 2020-01-30 20:03:26 +00:00
Michael Telatynski
bc71092b81 Use Sets instead of array scans and simplify hiding of invalid users to invite 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 19:27:59 +00:00
Michael Telatynski
b84fd245b1 Fix room completion for invited rooms and upgraded rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 18:03:45 +00:00
Travis Ralston
724cff6a2e Update QR code rendering to support VerificationRequests 
Makes for building the QR code easier and more common.
 2020-01-30 17:12:44 +00:00
Zoe
e58b59c26e don't tell users to verify themselves in person 2020-01-30 16:41:25 +00:00
J. Ryan Stinnett
bae35c0859 Change power icon to label instead 2020-01-30 16:40:25 +00:00
J. Ryan Stinnett
ceebb7dc55 Remove unused Entities, UserTile modules 2020-01-30 16:40:25 +00:00
Zoe
f787bde80a copy 2020-01-30 16:36:57 +00:00
Weblate
c5306fd7b6 Merge branch 'origin/develop' into Weblate. 2020-01-30 16:30:24 +00:00
David Baker
8a09cfbfbd
Merge pull request #3999 from matrix-org/dbkr/user_info_black_shields 
Make shields in UserInfo black if user isn't verified
 2020-01-30 16:30:19 +00:00
Zoe
a9d85e1fa3 lint 2020-01-30 16:27:35 +00:00
David Baker
4f62fc16bd lint 2020-01-30 16:19:04 +00:00
Weblate
a92b14c7ab Merge branch 'origin/develop' into Weblate. 2020-01-30 16:13:00 +00:00
J. Ryan Stinnett
ddc628c804
Merge pull request #3994 from matrix-org/jryans/verify-user-text 
Change verify user text
 2020-01-30 16:12:55 +00:00
Zoe
4a3ea30e52 copy for verification screen 2020-01-30 16:11:05 +00:00
David Baker
77618d30fd Actually this is green because it's a link 
not because the things were verified. Use the linkButton class
 2020-01-30 16:08:42 +00:00
Zoe
9f5f15d1d3 Update copy when the user verifies their own devices 2020-01-30 15:59:59 +00:00
David Baker
0956d00637 Make shields in UserInfo black if user isn't verified 2020-01-30 15:59:03 +00:00
Zoe
99b04a6f70 lint 2020-01-30 15:41:26 +00:00
Zoe
49d2ed8906 ... and take action when the counter reaches zero in verification toast 2020-01-30 15:37:44 +00:00
Zoe
7e98ea79d2 Fix verification toast timeouts to not stick at 0 
Fixes: https://github.com/vector-im/riot-web/issues/12038
 2020-01-30 15:31:20 +00:00
Weblate
e94af1e643 Merge branch 'origin/develop' into Weblate. 2020-01-30 15:19:38 +00:00
Zoe
318689f40b Disable all inputs in login form while busy, not just the submit button 2020-01-30 15:06:36 +00:00
J. Ryan Stinnett
788cb24093 Add advanced option to keep secret storage in memory for session 
This adds a default-off option to keep the secret storage passphrase cached in
memory for the current session to avoid death by prompts.
 2020-01-30 14:18:12 +00:00
J. Ryan Stinnett
fd5798aa87 Change verify user text 2020-01-30 13:21:51 +00:00
Weblate
e18e01217c Merge branch 'origin/develop' into Weblate. 2020-01-30 13:10:37 +00:00
Zoe
767015d19d
Merge pull request #3993 from matrix-org/foldleft/12106-round-two 
fix SAS dialog width
 2020-01-30 13:10:32 +00:00
Weblate
ae57feaf70 Merge branch 'origin/develop' into Weblate. 2020-01-30 13:08:47 +00:00
J. Ryan Stinnett
9c8ffb6c4e
Merge pull request #3990 from matrix-org/t3chguy/fix_composer_placeholder 
Update placeholder in the composer when it gets changed
 2020-01-30 13:08:42 +00:00
Zoe
4c1cc6feba fix SAS dialog width 
used fixedWidth to accomplish the same goal

clean up css
 2020-01-30 12:48:41 +00:00
Weblate
4de9a2074e Merge branch 'origin/develop' into Weblate. 2020-01-30 11:53:34 +00:00
David Baker
c8673452be Merge remote-tracking branch 'origin/develop' into dbkr/default_display_name_register 2020-01-30 11:45:54 +00:00
David Baker
2f4b3272da Send initial device display najme on register 
Fixes https://github.com/vector-im/riot-web/issues/12140
 2020-01-30 11:27:54 +00:00
Weblate
cbd9c52ad8 Merge branch 'origin/develop' into Weblate. 2020-01-30 11:26:19 +00:00
Travis Ralston
67468d85c6
Merge pull request #3959 from matrix-org/travis/update-qr-code 
Update QR code handling for new spec
 2020-01-30 11:26:13 +00:00
Weblate
68c61a057e Merge branch 'origin/develop' into Weblate. 2020-01-30 11:16:24 +00:00
random
f2dda28ad3 Translated using Weblate (Italian) 
Currently translated at 95.5% (2002 of 2096 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-01-30 11:16:24 +00:00
Jeff Huang
7038481394 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 94.8% (1988 of 2096 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-30 11:16:22 +00:00
Michael Telatynski
52ed55d887 Update placeholder when it changes, not sure how this ever worked 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 00:23:19 +00:00
Michael Telatynski
ea0fafc4e9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/olympics 2020-01-29 22:55:02 +00:00
Weblate
4de21aa676 Merge branch 'origin/develop' into Weblate. 2020-01-29 22:45:40 +00:00
Michael Telatynski
1475f5c73a
Merge pull request #3988 from matrix-org/t3chguy/fix_Field_usage 
Pass an ID to the <Field/> as needed and fix div inside p nesting
 2020-01-29 22:45:34 +00:00
Michael Telatynski
33ec73095e Apply the Olympic effect to SAS Emoji Verification 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 22:44:49 +00:00
Michael Telatynski
a180dddc66 Pass an ID to the <Field/> as needed and fix div inside p nesting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 22:31:19 +00:00
Weblate
6d6813efaa Merge branch 'origin/develop' into Weblate. 2020-01-29 22:22:59 +00:00
J. Ryan Stinnett
c851cc6070
Merge pull request #3987 from matrix-org/jryans/update-user-info-trust 
Update user info for device and trust changes
 2020-01-29 22:22:54 +00:00
J. Ryan Stinnett
eaa48665d2 Guard request input 2020-01-29 21:59:30 +00:00
J. Ryan Stinnett
7a5bf8f102 Update user info for device and trust changes 
This ensure the user info panel updates automatically for device and trust
changes.

Fixes https://github.com/vector-im/riot-web/issues/12134`
 2020-01-29 21:55:29 +00:00
Weblate
7e8392456e Merge branch 'origin/develop' into Weblate. 2020-01-29 20:40:18 +00:00
J. Ryan Stinnett
786ddb8a7e
Merge pull request #3985 from matrix-org/jryans/relax-account-data-check 
Relax secret storage account data check
 2020-01-29 20:40:13 +00:00
Weblate
7c20bb8e78 Merge branch 'origin/develop' into Weblate. 2020-01-29 19:55:38 +00:00
J. Ryan Stinnett
d362cc0f41 Fix room device level send setting 2020-01-29 19:55:27 +00:00
Weblate
b2fe0c5dde Merge branch 'origin/develop' into Weblate. 2020-01-29 19:54:06 +00:00
catborise
d854afdfd4 Translated using Weblate (Turkish) 
Currently translated at 70.4% (1475 of 2095 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-29 19:54:06 +00:00
J. Ryan Stinnett
3ff3a3cebd Fix delete button for one session 2020-01-29 19:53:50 +00:00
David Baker
ac173e9d50
Merge pull request #3984 from matrix-org/dbkr/rightpanel_verif_phase 
Fix various races that prevented the right panel being in the right state for verifications
 2020-01-29 18:03:27 +00:00
David Baker
d63bb240aa
those words again 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-29 17:52:12 +00:00
David Baker
de6ef9ec90
words 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-29 17:51:51 +00:00
Bruno Windels
ad458722dc evaluate on mount whether we need to call .verify() 
as the request might be in phase started already.
 2020-01-29 17:58:23 +01:00
Travis Ralston
c625870658 Merge branch 'develop' into travis/update-qr-code 2020-01-29 16:57:33 +00:00
David Baker
e403169e13 Fix various races that prevented the right panel being in the right state for verifications 
Fixes https://github.com/vector-im/riot-web/issues/11989
 2020-01-29 16:56:12 +00:00
J. Ryan Stinnett
6f0d88a126 Relax secret storage account data check 
If the homeserver is confused about account data or otherwise explodes here, we
don't want to block login, so just warn in this case.
 2020-01-29 16:54:08 +00:00
J. Ryan Stinnett
d8ca9d0f13 Prune unused translations 2020-01-29 16:35:38 +00:00
Weblate
3a770c78c6 Merge branch 'origin/develop' into Weblate. 2020-01-29 16:32:45 +00:00
J. Ryan Stinnett
6a94d84630
Merge pull request #3980 from matrix-org/jryans/cs-polish 
Replace device with session in UI text
 2020-01-29 16:32:40 +00:00
Weblate
b7b323095a Merge branch 'origin/develop' into Weblate. 2020-01-29 16:24:34 +00:00
J. Ryan Stinnett
067bfe2ee3 Tweaks from PR 2020-01-29 16:10:46 +00:00
Michael Telatynski
a2734e6955 Add missing await causing promises to be leaked as room IDs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 15:56:26 +00:00
J. Ryan Stinnett
81ee27f41e Replace device with session in UI text 
This replaces "device" with "session" throughout user-visible text at the React
layer. Variable names and comments are left as-is for now.
 2020-01-29 15:52:32 +00:00
Weblate
f8df2f4e00 Merge branch 'origin/develop' into Weblate. 2020-01-29 15:33:24 +00:00
J. Ryan Stinnett
725ec1dda6
Merge pull request #3978 from matrix-org/jryans/cs-polish 
Change new session toast to unverified
 2020-01-29 15:33:19 +00:00
Weblate
7bf814810e Merge branch 'origin/develop' into Weblate. 2020-01-29 15:27:51 +00:00
Michael Telatynski
9457520cc2
Merge pull request #3975 from matrix-org/t3chguy/right_panel_learn_more 
Replace Verify button in UserInfo verification with "Learn more"
 2020-01-29 15:27:46 +00:00
Weblate
4c44a2322c Merge branch 'origin/develop' into Weblate. 2020-01-29 15:17:38 +00:00
David Baker
b804a1cedb
Merge pull request #3979 from matrix-org/dbkr/no_peeking 
Don't peek until the matrix client is ready
 2020-01-29 15:17:33 +00:00
J. Ryan Stinnett
b5914f5c2b Fix later button 2020-01-29 15:14:56 +00:00
Travis Ralston
1abfb8f06a Merge branch 'develop' into travis/update-qr-code 2020-01-29 15:11:42 +00:00
David Baker
b96ad4a4f0 Don't peek until the matrix client is ready 
When the client loaded, we'd load the room view which would try to
get a room object from the client, fail because the client wasn't
ready, think it's because the user wasn't joined to the room and
start peeking instead.

Coupled with the bug fixed by https://github.com/matrix-org/matrix-js-sdk/pull/1188
this would have caused https://github.com/vector-im/riot-web/issues/11120
 2020-01-29 15:07:43 +00:00
Weblate
9a1fec6506 Merge branch 'origin/develop' into Weblate. 2020-01-29 15:04:19 +00:00
Travis Ralston
00fa7cce57 Appease the linter 2020-01-29 15:02:52 +00:00
J. Ryan Stinnett
f12fe984e5 Change new session toast to unverified 
This also changes text to show the device ID and name in the toast.

Fixes https://github.com/vector-im/riot-web/issues/11916
 2020-01-29 15:00:04 +00:00
Travis Ralston
c4b7e3866f Merge branch 'develop' into travis/update-qr-code 2020-01-29 14:58:16 +00:00
Bruno Windels
44bc0d9fb1 phase is a prop now 2020-01-29 15:45:36 +01:00
Bruno Windels
3590c97d96 unrelated fix: rerender hidden event tile when decrypted 
to get accurate type
 2020-01-29 15:27:55 +01:00
Bruno Windels
59dc3cfb97 update immediately, don't wait until verification is done 
this can deadlock, as you can't finish the verification without the UI
 2020-01-29 15:27:55 +01:00
Bruno Windels
c4f1659116 don't dismiss toasts for device verification 
as they are immediately started
 2020-01-29 15:27:26 +01:00
Michael Telatynski
00dd1a4a8f Re-use existing classes to fix font-size matching 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 14:22:20 +00:00
Michael Telatynski
19e7c768b6 Replace Verify button in UserInfo verification with "Learn more" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 14:11:50 +00:00
Weblate
27fdb573c5 Merge branch 'origin/develop' into Weblate. 2020-01-29 14:09:14 +00:00
Michael Telatynski
64e96331ca
Merge pull request #3973 from matrix-org/t3chguy/update_copy 
Update copy for right panel verification
 2020-01-29 14:09:09 +00:00
Weblate
33e85746a3 Merge branch 'origin/develop' into Weblate. 2020-01-29 14:04:54 +00:00
random
8418625026 Translated using Weblate (Italian) 
Currently translated at 98.2% (2060 of 2098 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-01-29 14:04:54 +00:00
Kévin C
042bffc5e2 Translated using Weblate (French) 
Currently translated at 100.0% (2098 of 2098 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-29 14:04:52 +00:00
J. Ryan Stinnett
c0e88bede9
Merge pull request #3972 from matrix-org/jryans/missing-timeline-uisi 
Check for timeline in pre-join UISI path
 2020-01-29 14:04:45 +00:00
Michael Telatynski
957e862939 Update copy some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 13:58:02 +00:00
Michael Telatynski
920daa3125 Get rid of custom enter handling and protect handlers, disabling button isn't foolproof 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 13:43:08 +00:00
Michael Telatynski
fe71fe6033 Sprinkle forms and new-password designators to make autofill and password completion less wild 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 13:38:50 +00:00
Michael Telatynski
cb0392b78d use forms to wrap password fields so Chrome doesn't go wild and prefill all the things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 13:24:45 +00:00
Michael Telatynski
227e6f6376 regen i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 12:16:42 +00:00
Michael Telatynski
a549c42022 Update copy for right panel verification 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 12:10:50 +00:00
J. Ryan Stinnett
336f623aa9 Check for timeline in pre-join UISI path 
Somehow, live events can be missing a timeline, even though that should not
happen... This restores @uhoreg's previous version where we test for this case.

Fixes https://github.com/vector-im/riot-web/issues/12120
 2020-01-29 12:00:04 +00:00
Travis Ralston
a8cfde72e1 Merge branch 'develop' into travis/update-qr-code 2020-01-29 11:47:59 +00:00
Weblate
1f0e5f31bd Merge branch 'origin/develop' into Weblate. 2020-01-29 11:45:27 +00:00
Travis Ralston
45735d5ae3
Merge pull request #3970 from matrix-org/travis/user-lists/fix-paste 
Let users paste text if they've already started filtering invite targets
 2020-01-29 11:45:21 +00:00
Weblate
8cf4e20b72 Merge branch 'origin/develop' into Weblate. 2020-01-29 11:40:37 +00:00
Travis Ralston
e200988dbf
Merge pull request #3969 from matrix-org/travis/user-lists/suggestions 
Filter event types when deciding on activity metrics for DM suggestions
 2020-01-29 11:40:32 +00:00
Weblate
159a7a7ce2 Merge branch 'origin/develop' into Weblate. 2020-01-29 11:32:19 +00:00
Zoe
7d6981ba1a Revert "reload on enabling cross-signing just to make things generally happier" 
This reverts commit 2aa21d9199.

It was causing a login loop
 2020-01-29 11:29:56 +00:00
Travis Ralston
95a78538e0
Break after getting timestamp 2020-01-29 11:23:48 +00:00
Travis Ralston
a138a66e77 Let users paste text if they've already started filtering invite targets 
Fixes https://github.com/vector-im/riot-web/issues/11814
 2020-01-29 11:22:03 +00:00
Damir Jelić
ce7b860d61 Merge branch 'poljar/eventindex-docs' into develop 2020-01-29 12:17:48 +01:00
Weblate
8098f12277 Merge branch 'origin/develop' into Weblate. 2020-01-29 11:17:01 +00:00
Weblate
5b651ee984 Merge branch 'origin/develop' into Weblate. 2020-01-29 11:14:53 +00:00
Travis Ralston
95edadbfa1
Merge pull request #3968 from matrix-org/travis/user-lists/autofocus 
Automatically focus on the invite dialog input
 2020-01-29 11:14:48 +00:00
Travis Ralston
8d12657483 Filter event types when deciding on activity metrics for DM suggestions 
Fixes https://github.com/vector-im/riot-web/issues/12083
 2020-01-29 11:14:33 +00:00
Travis Ralston
610354220e Automatically focus on the invite dialog input 
Fixes https://github.com/vector-im/riot-web/issues/12070
 2020-01-29 11:01:00 +00:00
Weblate
f4a2304c65 Merge branch 'origin/develop' into Weblate. 2020-01-29 09:55:56 +00:00
David Baker
fa1f2cd7e0
Merge pull request #3966 from matrix-org/dbkr/restore_key_backup_in_complete_security 
Restore key backup in Complete Security dialog
 2020-01-29 09:55:50 +00:00
Weblate
1d1c40fd32 Merge branch 'origin/develop' into Weblate. 2020-01-29 09:46:29 +00:00
Michael Telatynski
b24c7f3a04
Merge pull request #3967 from matrix-org/t3chguy/cs_verification_decoration 
Right Panel Verification improvements
 2020-01-29 09:46:24 +00:00
David Baker
e9854f5e44 i18n 2020-01-29 09:32:09 +00:00
Travis Ralston
7d1c61fa55 Use new constant for QR code verification 2020-01-29 09:29:45 +00:00
Michael Telatynski
37e568448d delint 2020-01-29 08:08:52 +00:00
Michael Telatynski
0bb423fd5a Add console log on unhandled error to track down rageshake 2020-01-29 08:00:32 +00:00
Michael Telatynski
2aa21d9199 reload on enabling cross-signing just to make things generally happier 2020-01-29 07:54:28 +00:00
Michael Telatynski
d824145638 show as pending whilst in an empty state until told better to prevent a flash 2020-01-29 07:54:10 +00:00
Michael Telatynski
3d47e25955 improve PropTypes for better rageshakes 2020-01-29 07:53:45 +00:00
Michael Telatynski
83fdeeb180 Fix MemberInfo handling User objects without crashing 2020-01-29 07:53:23 +00:00
Michael Telatynski
2fbda42374 Fix buttons in right panel verif 2020-01-29 07:53:06 +00:00
Travis Ralston
797b23ecfa Merge branch 'develop' into travis/update-qr-code 2020-01-29 00:19:47 +00:00
Weblate
99a26e9338 Merge branch 'origin/develop' into Weblate. 2020-01-28 23:57:53 +00:00
Michael Telatynski
2c973f7467
Merge pull request #3950 from matrix-org/t3chguy/cs_verification_decoration 
Cross Signing Right Panel Verification Decoration
 2020-01-28 23:57:48 +00:00
Michael Telatynski
5c44ff8f8a other PR iteration based on feedback 2020-01-28 23:48:00 +00:00
Michael Telatynski
c632c72f25 tidy up right-panel if-else-if statement 2020-01-28 23:43:09 +00:00
David Baker
4a26a72684 Restore key backup in Complete Security dialog 
Fixes https://github.com/vector-im/riot-web/issues/11889
 2020-01-28 22:46:21 +00:00
Weblate
76baf33461 Merge branch 'origin/develop' into Weblate. 2020-01-28 22:13:34 +00:00
Michael Telatynski
c6a827995f
Merge pull request #3965 from matrix-org/t3chguy/members_button_regression 
Passing refireParams actually prevented this from working
 2020-01-28 22:13:29 +00:00
Michael Telatynski
7b5a8856a4 Passing refireParams actually prevented this from working 2020-01-28 22:06:04 +00:00
Weblate
3d816e3042 Merge branch 'origin/develop' into Weblate. 2020-01-28 22:02:25 +00:00
David Baker
8c471d6713
Merge pull request #3964 from matrix-org/dbkr/start_key_backup_in_bootstrap 
Start new key backup in security setup flow
 2020-01-28 22:02:20 +00:00
Weblate
a58f9a6b07 Merge branch 'origin/develop' into Weblate. 2020-01-28 20:36:28 +00:00
Szimszon
68a22a4d64 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2075 of 2075 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-28 20:36:28 +00:00
Hubert Chathi
793ff2cccc
Hide pre-join UTDs (#3881) 2020-01-28 15:36:24 -05:00
Weblate
624ea505c3 Merge branch 'origin/develop' into Weblate. 2020-01-28 20:05:48 +00:00
J. Ryan Stinnett
02ba548a62
Merge pull request #3963 from matrix-org/jryans/user-info-device-id 
Add device IDs in user info tooltips
 2020-01-28 20:05:43 +00:00
J. Ryan Stinnett
32cb3b8ccb onClick to separate line 2020-01-28 19:55:53 +00:00
David Baker
39c8a9d204 Start new key backup in security setup flow 
Part of https://github.com/vector-im/riot-web/issues/11889
 2020-01-28 19:42:09 +00:00
Weblate
85d929f694 Merge branch 'origin/develop' into Weblate. 2020-01-28 18:05:14 +00:00
J. Ryan Stinnett
6fb8f6eef1 Add device IDs in user info tooltips 
For easier device identification, add the device ID in an HTML tooltip for now.

Fixes https://github.com/vector-im/riot-web/issues/12103
 2020-01-28 18:03:51 +00:00
David Baker
de295cc350 Merge remote-tracking branch 'origin/develop' into dbkr/better_flow_for_upgrade_on_login 2020-01-28 17:49:57 +00:00
Michael Telatynski
b002806639 Use DialogButtons because reusability :(( 2020-01-28 17:42:39 +00:00
Travis Ralston
61b198d7f8 Merge branch 'develop' into travis/update-qr-code 2020-01-28 17:27:17 +00:00
David Baker
5e1b42b350 unused component 2020-01-28 17:21:42 +00:00
Michael Telatynski
76e61b9948 Merge branches 'develop' and 't3chguy/cs_verification_decoration' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration 2020-01-28 17:19:59 +00:00
David Baker
e1e35a53e4 i18n 2020-01-28 17:18:09 +00:00
David Baker
546acb696d Add confirmation to skip button 
Re-using the opt out phase which was unused
 2020-01-28 17:15:50 +00:00
Michael Telatynski
58df4127d3 Update propTypes and remove todo 2020-01-28 17:14:48 +00:00
Weblate
0a67fb9a6b Merge branch 'origin/develop' into Weblate. 2020-01-28 16:54:21 +00:00