Commit graph

33869 commits

Author SHA1 Message Date
Germain
d3101b5ce4
Merge branch 'develop' into gsouquet/dialogs-ts-migration 2021-06-15 00:02:49 +01:00
Germain Souquet
2e6dab0bcd change parameter to use preset enum 2021-06-15 00:01:05 +01:00
Germain Souquet
07bdaeaf70 Fix mjolnir private chat enum 2021-06-14 23:55:14 +01:00
Germain Souquet
b2f20e052d remove unused import 2021-06-14 23:51:38 +01:00
Germain Souquet
75151b7a6c Migrate TermsDialog to TypeScript 2021-06-14 23:50:41 +01:00
Germain Souquet
de414cd0a6 Migrate UserSettingsDialog to TypeScript 2021-06-14 23:42:36 +01:00
Michael Telatynski
6b4f63df2a
Merge pull request #6184 from matrix-org/t3chguy/rs/5566 2021-06-14 23:27:51 +01:00
Michael Telatynski
2fd8cc414c
Merge pull request #6111 from matrix-org/t3chguy/fix/17365 2021-06-14 22:57:14 +01:00
Michael Telatynski
539465ecb4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
2021-06-14 22:22:30 +01:00
Michael Telatynski
430ec8cecd Clear selected rooms after operation in manage space rooms 2021-06-14 22:18:18 +01:00
Michael Telatynski
f8eea2ae23 Fix word wrap in space descriptions 2021-06-14 22:18:02 +01:00
Germain Souquet
a030c1270a Migrate ErrorDialog to TypeScript 2021-06-14 21:55:47 +01:00
Germain Souquet
cf822d4d4c Migrate DeactivateAccountDialog to TypeScript 2021-06-14 21:53:44 +01:00
Germain Souquet
e39baf3e23 Migrate CryptoStoreTooNewDialog to TypeScript 2021-06-14 21:45:12 +01:00
Germain Souquet
de95f3bc01 Migrate CreateGroupDialog to TypeScript 2021-06-14 21:43:54 +01:00
Germain Souquet
5cbbb5110b Migrate ConfirmWipeDeviceDialog to TypeScript 2021-06-14 21:38:10 +01:00
Germain Souquet
c2aaba1f79 Migrate ConfirmUserActionDialog to TypeScript 2021-06-14 21:36:56 +01:00
Michael Telatynski
91df392a2a
Merge pull request #5880 from SimonBrandner/show-username 2021-06-14 21:34:01 +01:00
Germain Souquet
9443ef4ff9 Migrate ConfirmRedactDialog to TypeScript 2021-06-14 21:31:17 +01:00
Germain Souquet
6877504f2d Migrate ConfirmAndWaitRedactDialog to TypeScript 2021-06-14 21:30:28 +01:00
Germain Souquet
1ff3aa0d74 Migrate ChangelogDialog to TypeScript 2021-06-14 21:26:15 +01:00
Germain Souquet
be92226448 Migrate BugReportDialog to TypeScript 2021-06-14 21:23:28 +01:00
Germain Souquet
f2250af565 Migrate AskInviteAnywayDialog to TypeScript 2021-06-14 21:03:12 +01:00
Germain Souquet
5f2ab50a90 migrate SetupEncryptionStore to TypeScript 2021-06-14 20:58:20 +01:00
Travis Ralston
d4c039a332
Merge pull request #6183 from matrix-org/travis/fix-types
Move various createRoom types to the js-sdk
2021-06-14 13:51:37 -06:00
Germain Souquet
68db2438ea Migrate SetupEncryptionDialog to TypeScript 2021-06-14 20:41:26 +01:00
Travis Ralston
951fbf4a1a fix import 2021-06-14 13:38:43 -06:00
Travis Ralston
2eafe132b8 Move various createRoom types to the js-sdk 2021-06-14 13:31:58 -06:00
Germain Souquet
0909112fa9 Migrate CreateCrossSigningDialog to TypeScript 2021-06-14 20:21:11 +01:00
Germain Souquet
6b746b5d1d Migrate ConfirmDestroyCrossSigningDialog to TypeScript 2021-06-14 20:15:05 +01:00
Germain
42538f8c75
Merge pull request #6175 from matrix-org/gsouquet/fix-17621
Fix HTML tag for Event Tile when not rendered in a list
2021-06-14 15:48:00 +01:00
Šimon Brandner
e260e8671f
Inline display name into return
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-11 15:14:16 +02:00
Germain
015890477d
Merge pull request #6176 from matrix-org/gsouquet/deprecate-dependencies 2021-06-11 12:43:51 +01:00
Germain Souquet
37484e3fc4 Add TextEncoder polyfill for test run 2021-06-11 12:33:02 +01:00
Germain Souquet
84679cf8ec remove legacy polyfills and unused dependencies 2021-06-11 12:19:14 +01:00
Germain Souquet
b1824ce579 fix HTML tag for Event Tile when not rendered in a list 2021-06-11 11:34:53 +01:00
Germain
e84d51bc0a
Merge pull request #6173 from SimonBrandner/fix/hover-select-event-tile/17576
Fix buggy hovering/selecting of event tiles
2021-06-11 09:30:32 +01:00
Šimon Brandner
5343be7814
Fix buggy hovering/selecting of event tiles
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-10 18:53:56 +02:00
Germain
88e337b89c
Merge pull request #5929 from matrix-org/gsouquet-e2ee-warning 2021-06-10 14:58:31 +01:00
Germain
c6968b4919
Merge pull request #6156 from matrix-org/gsouquet/gh-actions-e2e-tests
Migrate end to end tests to GitHub actions
2021-06-10 14:41:46 +01:00
Šimon Brandner
8174973cfe
Use the same styling as for mx_TextualEvent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-10 15:31:27 +02:00
Germain
79b8fbc2a9
Add indentation for unencrypted warning text
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-06-10 14:21:48 +01:00
Germain
0a6cd6a758
Merge pull request #6171 from matrix-org/gsouquet/fix-17505
Fix expanding last collapsed sticky session when zoomed in
2021-06-10 12:44:57 +01:00
Germain Souquet
9731e275f8 cater for an undefined MatrixClient on rooms 2021-06-10 12:15:55 +01:00
Germain Souquet
6606a1142d Update unencrypted room warning copy 2021-06-10 11:29:10 +01:00
Germain Souquet
0e2e327c46 Delete new room intro stale CSS 2021-06-10 11:19:25 +01:00
Germain Souquet
7f3173f170 Implement unencrypted warning slate in rooms 2021-06-10 11:14:43 +01:00
Germain Souquet
4f649f290c Migrate RoomSettingsDialog to TypeScript 2021-06-10 10:46:54 +01:00
Germain Souquet
c2d1eb3e8e Merge branch 'develop' into gsouquet-e2ee-warning 2021-06-10 10:25:20 +01:00
Germain
4660101944
Merge pull request #6165 from matrix-org/gsouquet/react-17 2021-06-10 10:13:18 +01:00