mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 10:15:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
21263 commits 203 branches 553 tags 406 MiB
Commit graph

21263 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zoe
4a3ea30e52 copy for verification screen 2020-01-30 16:11:05 +00:00
Zoe
9f5f15d1d3 Update copy when the user verifies their own devices 2020-01-30 15:59:59 +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
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
David Baker
e43de26720
Merge pull request #3992 from matrix-org/dbkr/default_display_name_register 
Send initial device display name on register
 2020-01-30 11:53:29 +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
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
J. Ryan Stinnett
1cd2b7d190
Merge pull request #3989 from matrix-org/t3chguy/olympics 
Apply the Olympic effect to SAS Emoji Verification
 2020-01-30 11:16:14 +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
Michael Telatynski
afecaa1662 fix left margins in UserInfo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 22:54:56 +00:00
Michael Telatynski
d17a2ff80c clean up unused CSS rules 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 22:54:45 +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
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
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
J. Ryan Stinnett
d362cc0f41 Fix room device level send setting 2020-01-29 19:55:27 +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
J. Ryan Stinnett
dcb7878f53
Merge pull request #3986 from matrix-org/bwindels/fixverifyingdevices 
Fix verifying individual devices
 2020-01-29 17:46:09 +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
J. Ryan Stinnett
3b9df23d01
Merge pull request #3982 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-01-29 16:33:54 +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
Michael Telatynski
7740ec0ae3
Merge pull request #3981 from matrix-org/t3chguy/fix_missing_async 
Add missing await causing promises to be leaked as room IDs
 2020-01-29 16:24:29 +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