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
21138 commits 203 branches 553 tags 406 MiB
Commit graph

21138 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
acf09a004f
Merge pull request #3946 from matrix-org/t3chguy/emoji 
fix compound emoji
 2020-01-27 09:42:44 +00:00
Michael Telatynski
a4bbe2ba64 fix compound emoji 2020-01-26 22:17:31 +00:00
Besnik Bleta
49cdbc9ebe Translated using Weblate (Albanian) 
Currently translated at 99.7% (2043 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-01-26 17:23:20 +00:00
David Baker
086e43e584 comments ftw 2020-01-25 21:30:42 +00:00
David Baker
f851f976e7 Stop rogue verification toast if you verify during login 
Fixes https://github.com/vector-im/riot-web/issues/12057
 2020-01-25 21:26:43 +00:00
David Baker
9e38c62791 Show incoming verification requests in the 'complete security' phase 
If you click to verify your new sign in on another device, actually
show the verification request on the 'complete security' screen.
 2020-01-25 20:42:45 +00:00
David Baker
7169a84449 Dismiss toasts for logged out devices 2020-01-25 17:08:31 +00:00
David Baker
8c5fd5c77e Verification nag toasts 
Implement the three differenty cases for this session, and also fix
ones for other sessions which had the wrong copy.

Fixes https://github.com/vector-im/riot-web/issues/11220
 2020-01-25 16:52:12 +00:00
David Baker
437b45f8a6 Remember password for e2e bootstrapping 
Fixes https://github.com/vector-im/riot-web/issues/12046
 2020-01-25 15:28:06 +00:00
Weblate
369636277f Merge branch 'origin/develop' into Weblate. 2020-01-25 12:40:31 +00:00
Kévin C
c96f82cd8b Translated using Weblate (French) 
Currently translated at 100.0% (2050 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-25 12:40:31 +00:00
Jeff Huang
e710607a72 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2050 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-25 12:40:29 +00:00
Osoitz
440b3fd1fd Translated using Weblate (Basque) 
Currently translated at 100.0% (2050 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-01-25 12:40:27 +00:00
David Baker
988ae14d35
Merge pull request #3937 from matrix-org/dbkr/e2esetup 
Setup flow for cross-signing on login / registration
 2020-01-25 12:40:17 +00:00
Weblate
d3d749ac73 Merge branch 'origin/develop' into Weblate. 2020-01-24 22:39:52 +00:00
J. Ryan Stinnett
cb34f37a2c
Merge pull request #3935 from matrix-org/jryans/prof-avatar-size 
Update profile avatar letter size
 2020-01-24 22:39:47 +00:00
Weblate
6895ad1009 Merge branch 'origin/develop' into Weblate. 2020-01-24 22:39:14 +00:00
J. Ryan Stinnett
204b7d3362
Merge pull request #3936 from matrix-org/jryans/hide-default-enc-algo 
Hide default encryption algorithm
 2020-01-24 22:39:08 +00:00
Weblate
cf08aa2b0e Merge branch 'origin/develop' into Weblate. 2020-01-24 22:36:49 +00:00
catborise
662c723bf3 Translated using Weblate (Turkish) 
Currently translated at 73.7% (1515 of 2056 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-24 22:36:49 +00:00
Szimszon
95df8b9bb7 Translated using Weblate (Hungarian) 
Currently translated at 99.8% (2052 of 2056 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-24 22:36:47 +00:00
J. Ryan Stinnett
ee303b0d56
Merge pull request #3938 from matrix-org/jryans/webpack-warnings 
Resolve default export warnings from Webpack
 2020-01-24 22:36:39 +00:00
J. Ryan Stinnett
9991a544aa Resolve default export warnings from Webpack 
Webpack was printing several warnings about missing default exports,
particularly from components, where we auto-generate a default import via the
component index.

As part of this, the emoji picker recent handling (which is not a component) is
moved elsewhere to avoid the generated import.
 2020-01-24 22:26:34 +00:00
David Baker
3d7137d4ad Setup flow for cross-signing on login / registration 
Still outstanding:
 * Keep password from login / registration
 * Confirmation on skip button

Fixes https://github.com/vector-im/riot-web/issues/11902
 2020-01-24 19:11:57 +00:00
J. Ryan Stinnett
bf0e1efce8 Hide default encryption algorithm 
When the default encryption algorithm is used, we hide it to remove some jargon
from the app. For any other algorithm, we continue showing it and add
"unrecognised".

Fixes https://github.com/vector-im/riot-web/issues/8829
 2020-01-24 17:53:33 +00:00
J. Ryan Stinnett
2021498755 Update profile avatar letter size 
Fixes https://github.com/vector-im/riot-web/issues/12042
 2020-01-24 17:31:04 +00:00
Weblate
bf9d943a5c Merge branch 'origin/develop' into Weblate. 2020-01-24 16:49:36 +00:00
Travis Ralston
1986f13275
Merge pull request #3934 from matrix-org/travis/cross-signing-info 
Add null check for cross-signing info in verification panel
 2020-01-24 09:49:30 -07:00
Travis Ralston
540a7f5c02 less duplication 2020-01-24 09:41:47 -07:00
Michael Telatynski
b67256c7c2 post-merge fix 2020-01-24 16:41:43 +00:00
Travis Ralston
91d59556db Also check for our own key ID 2020-01-24 09:37:12 -07:00
Travis Ralston
f8e0dcf264 Add null check for cross-signing info in verification panel 2020-01-24 09:33:55 -07:00
Michael Telatynski
342fcb09c4 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration 
 Conflicts:
	src/components/views/right_panel/VerificationPanel.js
	src/components/views/toasts/VerificationRequestToast.js
 2020-01-24 16:19:41 +00:00
Michael Telatynski
7a5e172b88 Apply a huge part of the decorations and copy 2020-01-24 16:16:46 +00:00
Weblate
f51d3b196d Merge branch 'origin/develop' into Weblate. 2020-01-24 15:57:49 +00:00
Travis Ralston
169ca4a4da
Merge pull request #3926 from matrix-org/travis/event-tile-trace 
Add trace logging to figure out which component is causing weird events
 2020-01-24 08:57:43 -07:00
Weblate
72f24b127d Merge branch 'origin/develop' into Weblate. 2020-01-24 15:57:33 +00:00
Travis Ralston
9722b34c35
Merge pull request #3906 from matrix-org/travis/user-lists-labs 
Remove user lists feature flag, making it the default
 2020-01-24 08:57:27 -07:00
Weblate
5ccf5573da Merge branch 'origin/develop' into Weblate. 2020-01-24 15:57:24 +00:00
Travis Ralston
ddafd010ee
Merge pull request #3925 from matrix-org/travis/invite-polish 
Last bit of polish for user lists
 2020-01-24 08:57:18 -07:00
Travis Ralston
abc2808b62 Fix i18n post-merge 2020-01-24 08:57:03 -07:00
Travis Ralston
5f2df15987
Merge branch 'develop' into travis/invite-polish 2020-01-24 08:56:18 -07:00
Weblate
72e7ac4a7a Merge branch 'origin/develop' into Weblate. 2020-01-24 15:55:45 +00:00
Travis Ralston
eb2402609a
Merge pull request #3871 from matrix-org/travis/qr-verif-rp 
QR code verification
 2020-01-24 08:55:40 -07:00
Damir Jelić
9f3e5ab1db ManageEventIndexDialog: Remove an unused import. 2020-01-24 16:52:26 +01:00
Damir Jelić
3208ac60c7 ManageEventIndexDialog: Override the Disable button class to be danger. 2020-01-24 16:47:29 +01:00
Damir Jelić
5d3b916a89 DialogButtons: Allow setting the cancel button class with a prop. 2020-01-24 16:46:46 +01:00
Damir Jelić
cd225943ea EventIndexPanel: Shorten a overly long line. 2020-01-24 16:22:09 +01:00
Damir Jelić
ddea7415c7 EventIndexPanel: Use formatCountLong to format the event and room counts. 2020-01-24 16:15:06 +01:00
Damir Jelić
2d8477aaa6 FormattingUtils: Add a formatCountLong method. 2020-01-24 16:13:55 +01:00