mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 06:01:48 +03:00
Code Issues Projects Releases Packages Wiki Activity
36809 commits 219 branches 562 tags 474 MiB
Commit graph

1252 commits

Author SHA1 Message Date
Travis Ralston
32343f3382
Merge pull request #5698 from SimonBrandner/public-e2ee-warn 
Add a warning on E2EE rooms if you try to make them public
 2021-08-23 16:45:47 -06:00
David Baker
08b37eb7c5 Fix cross sisgning setup from settings screen 
We previously called bootstrap without the cache callbacks set up
which meant it prompted you for you password once for each of the
three keys it fished out of SSSS. Instead, display the same dialog
we display from the verify toast.

Also, in the case where you hadn't verified yet, the button didn't
do anything at all, so make it trigger a verification & change the
caption appropriately.

Add a state to reflect when cross signing is set up but SSSS isn't
(ie. user hasn't yet set up backup / set a passphrase).
 2021-08-18 19:22:42 +01:00
James Salter
23f70836b6 Update copy to indicate debug logs contain which UI elements you last interacted with 2021-08-18 17:05:15 +01:00
David Baker
c28d449f3f Fix import 
thanks vscode
 2021-08-13 18:21:59 +01:00
David Baker
7c8637f5db Add MatrixEvent type 2021-08-13 18:18:48 +01:00
David Baker
e78640572d Convert CrossSigningPanel to TS 
Type: task
 2021-08-13 18:07:58 +01:00
Michael Telatynski
228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092 2021-08-12 11:28:14 +01:00
Šimon Brandner
833a5ee182
Don't set hidden RRs labs setting at account level 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-11 14:37:35 +02:00
Michael Telatynski
195b8714fc Iterate PR based on feedback 2021-08-10 09:55:51 +01:00
Michael Telatynski
db951b43a3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-10 09:48:22 +01:00
Travis Ralston
6a9ebc6902
Merge pull request #6390 from SimonBrandner/feature/hidden-rrs 
Support for MSC2285 (hidden read receipts)
 2021-08-06 09:27:14 -06:00
Germain
3153e11761
Merge pull request #6566 from SimonBrandner/task/export-layout 2021-08-06 14:45:54 +01:00
Michael Telatynski
381108a9c2
Merge pull request #6227 from SimonBrandner/feature/copy-version/17603 2021-08-06 12:56:38 +01:00
Michael Telatynski
64995dfae7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-06 11:39:24 +01:00
Šimon Brandner
6afd75ac3c
Update/fix licenses 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 10:40:26 +02:00
Šimon Brandner
25c6b216b0
Move LayoutSwitcher CSS to a separate file 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 10:37:42 +02:00
Šimon Brandner
186acf92a9
Wrap in () 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 10:30:38 +02:00
Šimon Brandner
85f5ec3a94
Move LayoutSwitcher into a separate component 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 10:27:18 +02:00
Šimon Brandner
44acded0a0
Use snake case 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:55:08 +02:00
Šimon Brandner
6e688b3c3a
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn 2021-08-06 07:53:07 +02:00
Šimon Brandner
015e0b6d77
Make into a labs feature 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:51:57 +02:00
Šimon Brandner
3abc419266
Remove spaces and use correct character 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-08-06 07:41:56 +02:00
Šimon Brandner
1e9437db7b
Use correct character 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-08-06 07:41:37 +02:00
Šimon Brandner
94f915a436
Remove spaces 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-08-06 07:41:23 +02:00
Šimon Brandner
67062dab88
Remove spaces 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-08-06 07:40:35 +02:00
Šimon Brandner
717691ef2f
Remove spaces 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-08-06 07:40:25 +02:00
Šimon Brandner
b99e39e011
Merge remote-tracking branch 'upstream/develop' into feature-surround-with 2021-08-04 18:14:38 +02:00
Michael Telatynski
2d3211ccf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-04 12:14:29 +01:00
Michael Telatynski
a6e5112be0 Offer a way to create a space based on existing community 2021-08-04 10:37:35 +01:00
James Salter
dc7aad1abf Revert "Revert "Add support for Posthog Analytics under a labs flag"" 
This reverts commit c5ea253181.
 2021-08-03 11:55:02 +01:00
James Salter
c5ea253181
Revert "Add support for Posthog Analytics under a labs flag" 2021-08-03 07:30:02 +01:00
James Salter
a65b41be63
Merge pull request #6495 from matrix-org/posthog-analytics 
Add support for Posthog Analytics under a labs flag
 2021-08-02 14:46:17 +01:00
Šimon Brandner
44258fd278
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603 2021-08-02 11:32:57 +02:00
Michael Telatynski
3c436c9617 update setting naming to match style 2021-07-30 12:20:02 +01:00
James Salter
a1ffd240e1 Use .instance pattern 2021-07-29 14:40:18 +01:00
Šimon Brandner
e0762827fe
Fix typo 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-28 17:19:32 +02:00
Šimon Brandner
168a32902e
Remove additional word 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-28 16:50:40 +02:00
Šimon Brandner
9ec4507da5
Update copy 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-28 16:49:03 +02:00
Michael Telatynski
07b9d6b30b Fix styling of setting flag descriptions in preferences 
and add description to spaces all/home setting
and make it an account setting rather than device one
and hide it from the Beta card
 2021-07-28 14:39:19 +01:00
Šimon Brandner
e445c9c3ff
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-28 13:28:11 +02:00
James Salter
bd7e2dee3d Merge remote-tracking branch 'origin' into posthog-analytics 2021-07-28 11:13:22 +01:00
James Salter
1d81bdc6f9 Interface changes and anonymity fixes 2021-07-28 09:37:08 +01:00
Šimon Brandner
5f6a1e336e
Remove unnecessary curly braces 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 18:46:19 +02:00
Šimon Brandner
9761c38f3d
Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 18:39:22 +02:00
Michael Telatynski
5ccd02dd6e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/messages/MImageBody.tsx
 2021-07-23 10:42:46 +01:00
Michael Telatynski
f5630acea7 Adhere to better eslint rules 2021-07-23 10:35:10 +01:00
Michael Telatynski
18bb4bce35 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/stores/SpaceStore.tsx
 2021-07-22 12:44:27 +01:00
James Salter
34f8c60b34 Hook analytics into the SDK 2021-07-21 16:15:18 +01:00
Germain Souquet
c155382445 Improve new layout switcher UI 2021-07-21 14:55:30 +02:00
Michael Telatynski
d147aaa984 delint and fix min-height issue 2021-07-21 11:27:36 +01:00