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

21273 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
J. Ryan Stinnett
8fd174f1d5
Merge pull request #3971 from matrix-org/foldleft/fix-login-loop 
Revert a change causing a login loop
 2020-01-29 11:32:14 +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