PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
21244 commits 1 branch 0 tags 338 MiB
Commit graph

21244 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
61d0021c8e Fix styling special case for DialogButtons 2020-01-29 07:58:43 +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
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
2fb6e73794 speed up user info verification css transitions by 2x 2020-01-28 23:43:27 +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
ae8a4b678d Merge branch 'origin/develop' into Weblate. 2020-01-28 21:53:55 +00:00