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

5517 commits

Author SHA1 Message Date
Michael Telatynski
1ba601ba22 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/dialogs/BetaFeedbackDialog.tsx
 2021-07-23 18:28:21 +01:00
James Salter
5e0a397631 Refactor anonymity derivation 2021-07-23 17:58:31 +01:00
Michael Telatynski
dec2c48155 remove unused import and revert removing some needed css 2021-07-23 15:56:00 +01:00
Michael Telatynski
1d1a396c1f get rid of spurious hr 2021-07-23 15:51:59 +01:00
Michael Telatynski
9c7fa71a4a Remove spaces beta feedback prompts except a couple more strategic ones 2021-07-23 15:07:24 +01: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
358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686 2021-07-23 09:09:17 +01:00
Michael Telatynski
010baabfe6 Improve subspaces and some utilities around room/space creation 2021-07-23 08:46:20 +01:00
Germain Souquet
02b08888b5 Use modern layout in file and notification panel 2021-07-22 16:00:41 +02: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
Šimon Brandner
2df4f7b859
Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938 2021-07-22 07:51:58 +02:00
Šimon Brandner
e7c5711bb7
membershipTypes -> groupedEvents 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 07:45:48 +02:00
Travis Ralston
c384575375
Merge pull request #6261 from robintown/watch-show-timestamps 
Add alwaysShowTimestamps and others to RoomView setting watchers
 2021-07-21 19:44:04 -06:00
James Salter
c34afdb4bd Refactor platform properties loading 2021-07-21 18:35:25 +01:00
James Salter
f358deb6c4 Manually track page views 2021-07-21 16:52:57 +01:00
Germain Souquet
26ca41f699 Cache room member count on the messagePanel 2021-07-21 17:26:41 +02:00
James Salter
34f8c60b34 Hook analytics into the SDK 2021-07-21 16:15:18 +01:00
Germain Souquet
43d62aa8c1 Use more performant getMembersCount to decide to hide or show sender 2021-07-21 16:43:57 +02:00
Germain Souquet
e5bc5a933e Use cached value to read member count 2021-07-21 16:10:18 +02:00
Germain Souquet
ae51653348 Add null guard for room prop in EventTile 2021-07-21 12:41:02 +02:00
Michael Telatynski
390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/dialogs/RoomUpgradeDialog.tsx
	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-07-21 10:46:41 +01:00
Šimon Brandner
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:15:04 +02:00
Michael Telatynski
d3934ff7da
Merge branch 'develop' into t3chguy/eslint 2021-07-20 11:08:13 +01:00
Michael Telatynski
848b83015d not sure how these happened :/ 2021-07-20 09:37:54 +01:00
Michael Telatynski
e6869797d7 remove unused prop 2021-07-20 09:27:32 +01:00
Germain Souquet
06c9a060b4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-20 10:16:21 +02:00
Michael Telatynski
ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
Michael Telatynski
de42a00ca4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/avatars/RoomAvatar.tsx
	test/stores/SpaceStore-test.ts
	test/test-utils.js
 2021-07-19 16:47:31 +01:00
Robin Townsend
c0123f5dad Merge branch 'develop' into watch-show-timestamps 2021-07-18 11:47:44 -04:00
Šimon Brandner
5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 08:13:51 +02:00
Robin Townsend
092fdf5e5e Be consistent about MessagePanel setting lookups 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-16 18:46:29 -04:00
Robin Townsend
158e6fa61c Merge branch 'develop' into text-for-event-perf 2021-07-16 18:24:22 -04:00
Šimon Brandner
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 21:43:33 +02:00
Michael Telatynski
9d45a3760f Fix types of the various query params dicts, arrays can be included e.g via 2021-07-16 13:11:43 +01:00
James Salter
b55f69a74c
Merge pull request #6374 from matrix-org/copy-room 
Add "Copy Link" to room context menu
 2021-07-16 11:14:00 +01:00
James Salter
9cb3c71afe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room 2021-07-16 09:34:30 +01:00
James Salter
685b59235d Make error message consistent with menu title 2021-07-16 09:24:46 +01:00
Šimon Brandner
651f19fb9b
Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs 2021-07-16 10:21:30 +02:00
Michael Telatynski
1437188282 Also move effects handling from event to Room.timeline to wake up less 2021-07-15 18:02:02 +01:00
Michael Telatynski
b0053f36d3 Fix instances of event.sender being read for just the userId - this field may not be set in time 2021-07-15 17:43:24 +01:00
Michael Telatynski
ea20e041b1
Merge pull request #6382 from matrix-org/t3chguy/console 2021-07-15 13:50:13 +01:00
Michael Telatynski
7c3c04d340 Fix instances of setState calls after unmount 2021-07-15 12:10:54 +01:00
Michael Telatynski
50b6c5c557 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spacesperf 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-07-15 10:19:04 +01:00
Michael Telatynski
dcb9b9b777 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/elements/MiniAvatarUploader.tsx
	src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
	src/i18n/strings/en_EN.json
	src/settings/handlers/RoomSettingsHandler.ts
	src/stores/SpaceStore.tsx
 2021-07-15 10:04:48 +01:00
Michael Telatynski
ebfe38dc4a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete 
 Conflicts:
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
 2021-07-15 09:59:40 +01:00
Andrew Morgan
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements (#6363) 
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
 2021-07-15 09:55:58 +01:00
Michael Telatynski
90d380c8ae Cache value of feature_spaces* flags as they cause page refresh so are immutable 2021-07-15 08:26:49 +01:00
Germain
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming 2021-07-15 08:07:03 +01:00
Germain Souquet
dde58d449d Only hide sender when in bubble mode 2021-07-14 17:16:13 +02:00
James Salter
2fe5ad5d4b Slightly refine error message 2021-07-14 15:07:22 +01:00
James Salter
8bf5e61acc Add "Copy" to room context menu. 
This menu item creates a matrix.to link for the room and copies it to the clipboard.
 2021-07-14 14:58:18 +01:00
Šimon Brandner
226224b039
Allow sending hidden RRs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 15:12:35 +02:00
Robin Townsend
8e64b73bd6 Merge branch 'develop' into text-for-event-perf 2021-07-13 23:25:16 -04:00
Paulo Pinto
6884b2aa6d Standardise spelling of identity server 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-13 16:28:43 +01:00
Germain Souquet
ba3e7e24ba Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-13 10:15:27 +02:00
Michael Telatynski
ae6eaa5acc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1 
 Conflicts:
	src/components/structures/RoomDirectory.tsx
	src/components/views/room_settings/RoomPublishSetting.tsx
 2021-07-12 18:58:18 +01:00
Germain Souquet
8f345dc1ba Rework backdrop to draw one image with two different level of blur 2021-07-12 13:51:46 +02:00
Germain Souquet
36ba65b534 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-12 13:00:34 +02:00
Michael Telatynski
33dca81352 Update some more 2021-07-12 09:10:27 +01:00
Michael Telatynski
a645cebb49 Fix setTimeout/setInterval typing 2021-07-12 09:02:46 +01:00
Robin Townsend
b147bcd207 Merge branch 'develop' into text-for-event-perf 2021-07-11 11:35:12 -04:00
Šimon Brandner
f80f4620df
Add pinned messages to MELS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-11 10:35:20 +02:00
Michael Telatynski
9b7697c530 fix imports 2021-07-10 16:02:43 +01:00
Michael Telatynski
bd175c6f40 Improve and consolidate typing 2021-07-10 15:43:46 +01:00
J. Ryan Stinnett
4b9d4ad1e3 Centralise display alias getters 2021-07-09 17:06:54 +01:00
Michael Telatynski
2998018876
Merge pull request #6322 from SimonBrandner/feature/remember-server/17739 
Remember the last used server for room directory searches
 2021-07-09 12:36:54 +01:00
Šimon Brandner
046b3f325c
Iterate PR 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-09 12:31:44 +02:00
Šimon Brandner
6dcf860181
Refresh the room list only if validation failed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-09 10:44:20 +02:00
Šimon Brandner
84b00b5c38
Make the code more readable 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-09 10:39:02 +02:00
Šimon Brandner
f78ede9324
Merge remote-tracking branch 'upstream/develop' into feature/remember-server/17739 2021-07-09 10:33:24 +02:00
Michael Telatynski
f412fb44a7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/SlashCommands.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
 2021-07-09 08:13:39 +01:00
Šimon Brandner
7a1381135a
Simplifie some code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 18:31:47 +02:00
Šimon Brandner
27db0da437
Simpler code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 17:40:41 +02:00
Šimon Brandner
68d194444a
FocusComposer -> FocusSendMessageComposer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 17:36:31 +02:00
Šimon Brandner
7734f8aeef
Handle focusing multiple composers 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 17:33:49 +02:00
Šimon Brandner
9c67679b35
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-07-08 13:30:57 +02:00
David Baker
72acd5a611
Merge pull request #6330 from matrix-org/dbkr/tsify_secretstorage 
Update import location for types
 2021-07-08 09:18:31 +01:00
David Baker
086a8cbbb3 Update import location for types 
Apparently all the types themselves are fine, even though some of
the function signatures have been updated to return Promises... we
were alreaady await-ing on them.
 2021-07-07 20:19:52 +01:00
Šimon Brandner
14303a4ca8
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 17:20:31 +02:00
Šimon Brandner
f91b35a0a0
Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 17:12:19 +02:00
Germain Souquet
55896223aa unbubble some type of events 2021-07-07 15:13:58 +02:00
Šimon Brandner
5b5ef5e04c
Handle servers from settings 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 13:59:02 +02:00
Šimon Brandner
255ab49ccb
Handle edge cases 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 13:48:48 +02:00
Germain Souquet
10bdb3cefa Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-07 13:07:43 +02:00
Šimon Brandner
b94dc2d0e5
Remember the last used server for room directory searches 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 12:14:51 +02:00
Šimon Brandner
1220ad37ce
Remove the usage of symbol 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 12:14:44 +02:00
Michael Telatynski
b88d67bb00 Convert SearchResult, InteractiveAuth, PushProcessor and Scheduler to Typescript 2021-07-07 11:08:53 +01:00
Germain Souquet
7d946ee0db Restore action bar 2021-07-07 12:04:28 +02:00
Germain Souquet
fbac730c62 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 15:09:55 +02:00
Germain Souquet
a5cec34bad Merge branch 'develop' into t3chguy/fix/17686 2021-07-06 14:53:40 +02:00
Germain
7d6342fa40
Merge pull request #6315 from matrix-org/gsouquet/ts-1 2021-07-06 12:04:18 +01:00
Germain Souquet
edae9a4844 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 10:19:25 +02:00
Michael Telatynski
1b25ab930e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
 2021-07-05 13:06:22 +01:00
Germain Souquet
e7743e2a57 Migrate RoomScrollStateStore to TypeScript 2021-07-03 12:21:00 +01:00
Germain Souquet
f4ec197513 Migrate ForgotPassword to TypeScript 2021-07-03 11:55:10 +01:00
Germain Souquet
298a338676 Migrate CompleteSecurity to TypeScript 2021-07-03 11:38:51 +01:00
Germain Souquet
dbd102541e Migrate E2eSetup to TypeScript 2021-07-03 11:37:06 +01:00
Šimon Brandner
68011056cc
Eleventh and final batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 12:24:07 +02:00
Šimon Brandner
5d054519dc
Tenth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 11:57:05 +02:00
Šimon Brandner
d99874318c
Ninth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 11:51:23 +02:00
Šimon Brandner
916589e2b9
Eighth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 11:24:33 +02:00
Šimon Brandner
6702e68778
Revert some changes due to them breaking tests (and hope it will work now) 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 09:36:18 +02:00
Šimon Brandner
799d10b77e
Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire 2021-07-02 17:34:56 +02:00
Šimon Brandner
9d569c378e
Second batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 17:08:27 +02:00
Michael Telatynski
89949bd884 Add new in the spaces beta toast & explanatory modal 2021-07-02 16:07:17 +01:00
Šimon Brandner
9383ecc46f
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 13:20:02 +02:00
Šimon Brandner
85399e8edf
Match code style 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 13:16:45 +02:00
Šimon Brandner
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 13:14:14 +02:00
Michael Telatynski
82119a08f7
Merge branch 'develop' into t3chguy/ts/11 2021-07-02 11:03:54 +01:00
Michael Telatynski
0425b02982
Merge pull request #6295 from matrix-org/t3chguy/ts/10 2021-07-02 09:51:58 +01:00
Michael Telatynski
fb149c4ea2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 2021-07-02 09:06:19 +01:00
David Baker
80f5232217 Comply with new member-delimiter-style rule 
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
 2021-07-01 23:23:03 +01:00
Michael Telatynski
88f691776f Use sleep from js-sdk as no point duplicating it 2021-07-01 22:55:27 +01:00
Michael Telatynski
c0fab6647d Use defer from js-sdk as it has a better ts definition 2021-07-01 22:50:06 +01:00
David Baker
53b89bbcd9
Merge pull request #6302 from matrix-org/dbkr/tsify_roomheader 
Convert RoomHeader to TS
 2021-07-01 21:33:11 +01:00
Michael Telatynski
c80ba16ae9
Merge pull request #6296 from matrix-org/t3chguy/fix/17853 
Prevent RoomDirectory from exploding when filterString is wrongly nulled
 2021-07-01 21:07:35 +01:00
Michael Telatynski
c51e62a62b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/10 2021-07-01 21:01:06 +01:00
Michael Telatynski
1f337b28ac Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash 
 Conflicts:
	src/ContentMessages.tsx
	src/components/structures/UploadBar.tsx
	src/components/views/messages/MImageBody.js
	src/components/views/messages/MStickerBody.js
	src/components/views/messages/MVideoBody.tsx
 2021-07-01 20:48:34 +01:00
David Baker
8bbb768825 Convert RoomHeader to TS 
Also add a type of OOBData... possibly this should be in the js-sdk,
but threepid invites themselves have a type in react-sdk so it can
live alongside it I guess (also I'm not entirely sure we actually
use it anymore...)
 2021-07-01 19:54:05 +01:00
David Baker
9ea4ca39c6 Be more like other arrow functions 2021-07-01 18:54:51 +01:00
David Baker
ae16efcf5b Remove rateLimitedFunc 2021-07-01 18:35:38 +01:00
David Baker
c6d1dc7e8e lint 2021-07-01 15:11:18 +01:00
David Baker
16fb24fa09 Remove unused prop 2021-07-01 14:03:01 +01:00
David Baker
642405dbd0 Use new types 2021-07-01 13:55:57 +01:00
David Baker
70a3679d43 more ts 2021-07-01 13:49:58 +01:00
David Baker
46b2f0404a Basic ts-ification of SetupEncryptionBody 2021-07-01 13:45:33 +01:00
Michael Telatynski
4c42313f99 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
 2021-07-01 12:47:34 +01:00
Michael Telatynski
5c6466d824 use better types 2021-07-01 10:01:48 +01:00
Michael Telatynski
d354a0a23b Prevent RoomDirectory from exploding when filterString is wrongly nullified 2021-07-01 09:57:33 +01:00
Michael Telatynski
fcdb0a27d0 Convert EventTimeline, EventTimelineSet and TimelineWindow to TS 2021-07-01 09:53:54 +01:00
Germain Souquet
fdced3da1b Remove reminescent references to the tinter 2021-06-30 08:09:55 +01:00
Robin Townsend
2021650d77 Merge branch 'develop' into watch-show-timestamps 2021-06-29 22:43:46 -04:00
Robin Townsend
adb5df52a4 Merge branch 'develop' into text-for-event-perf 2021-06-29 22:13:18 -04:00
Michael Telatynski
a59e94b907 delint 2021-06-29 22:21:05 +01:00
Michael Telatynski
8f4879ea96 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 
 Conflicts:
	src/components/structures/MessagePanel.tsx
	src/components/structures/ScrollPanel.tsx
	src/components/structures/TimelinePanel.tsx
	src/components/views/elements/ErrorBoundary.tsx
	src/components/views/elements/EventListSummary.tsx
	src/components/views/messages/TileErrorBoundary.tsx
 2021-06-29 22:14:40 +01:00
J. Ryan Stinnett
782e793925 Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2 2021-06-29 15:27:24 +01:00
J. Ryan Stinnett
21b8c81eb8 Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2 2021-06-29 15:25:30 +01:00
Michael Telatynski
623317cd47 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 
 Conflicts:
	src/components/structures/MessagePanel.tsx
	src/components/structures/TimelinePanel.tsx
 2021-06-29 15:22:54 +01:00
Germain
640fc591bb
Merge pull request #6279 from matrix-org/gsouquet/deprecate-tinter 
Deprecate Tinter and TintableSVG
 2021-06-29 15:22:48 +01:00
J. Ryan Stinnett
0551becafd Fix long lines 2021-06-29 13:42:51 +01:00
J. Ryan Stinnett
bbdd93f592 Auto-fix more errors 2021-06-29 13:26:09 +01:00
J. Ryan Stinnett
b501665971 Fix parsing errors 2021-06-29 13:23:13 +01:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Michael Telatynski
88cd5aeaf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/elements/StyledRadioGroup.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-06-29 12:29:45 +01:00
Germain Souquet
db015519ed Code style changes for FilePanel 2021-06-29 12:19:27 +01:00
Germain
56e05041fd
Import curly spaces 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-06-29 12:13:41 +01:00
Germain Souquet
652f57371a Migrate FilePanel to TypeScript 2021-06-29 11:38:19 +01:00
J. Ryan Stinnett
14ef38e057
Merge pull request #6280 from robintown/group-acls 
Group ACLs with MELS
 2021-06-29 10:02:12 +01:00
Michael Telatynski
298bf30b18 Fix editState not getting passed through 2021-06-29 08:16:43 +01:00