OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
21,443 Commits
205 Branches
546 Tags
417 MiB
Commit Graph

21443 Commits (be70ef44f81521b70f05cbb538edd918f61a1781)

Author SHA1 Message Date
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
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
Bruno Windels a687e4a220
Merge pull request #3976 from matrix-org/bwindels/fixstartrace-rebased 
Verification: don't block UI update on verification finishing
 2020-01-29 15:04:14 +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
Weblate 8d3ebd7ec5 Merge branch 'origin/develop' into Weblate. 2020-01-29 14:37:11 +00:00
J. Ryan Stinnett c76dd0f67e
Merge pull request #3977 from matrix-org/jryans/cs-polish 
Adjust icons with in person with design
 2020-01-29 14:37:05 +00:00
J. Ryan Stinnett 6d47f9620f Adjust icons with in person with design 2020-01-29 14:28:19 +00: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