Commit graph

11965 commits

Author SHA1 Message Date
Šimon Brandner
11e61075b4
Convert GenericTextContextMenu to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 19:23:18 +02:00
Šimon Brandner
8e4529d6ce
Convert GenericElementContextMenu to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 19:23:18 +02:00
Šimon Brandner
5baaa6b77e
Convert MemberStatusMessageAvatar to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 19:23:12 +02:00
Šimon Brandner
aab030d105
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts 2021-09-14 18:29:41 +02:00
Šimon Brandner
f5d8bb7cbe
Remove awaiting setState()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 18:15:27 +02:00
Šimon Brandner
ccc042b7d7
Where does that magic number come from?
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 18:06:01 +02:00
Šimon Brandner
047767bab0
Improve typing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 17:38:34 +02:00
Šimon Brandner
2f6239770a
Merge remote-tracking branch 'upstream/develop' into task/structures-ts 2021-09-14 17:32:00 +02:00
Michael Telatynski
b8ee2d2b5b Add warning that some spaces may not be relinked to the newly upgraded room 2021-09-14 16:14:25 +01:00
Michael Telatynski
e37f6b96d7 Fix RoomTile subscribing to wrong event emitter for room name 2021-09-14 14:36:11 +01:00
Michael Telatynski
e3ec00bcdf Fix space create menu eating first character of name in private space creation 2021-09-14 14:35:33 +01:00
Michael Telatynski
ff39f480bc
Merge pull request #6778 from matrix-org/t3chguy/fix/18891 2021-09-14 14:07:43 +01:00
Dariusz Niemczyk
74e4cc9680
Merge pull request #6793 from matrix-org/palid/fix/19012
Fix emoji picker and stickerpicker not appearing correctly when opened
2021-09-14 14:56:49 +02:00
Michael Telatynski
3c44969645 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19003
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
2021-09-14 11:42:51 +01:00
Michael Telatynski
be58a5e623
Merge pull request #6790 from matrix-org/t3chguy/fix/19007
Hide mute/unmute button in UserInfo for Spaces as it makes no sense
2021-09-14 09:07:37 +01:00
Dariusz Niemczyk
e913f03a67
Add missing types 2021-09-13 22:11:43 +02:00
Michael Telatynski
4a470e4341 Fix automatic field population in space create menu not validating 2021-09-13 17:15:52 +01:00
Šimon Brandner
29ff5f3f9c
Add IDialogAesthetics
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-13 18:12:47 +02:00
Šimon Brandner
27b9175ca3
Use defer
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-13 18:09:45 +02:00
Šimon Brandner
c9dea9948f
Use IAuthData
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-13 18:06:35 +02:00
Šimon Brandner
adb325b3bd
Use enums
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-13 18:05:59 +02:00
Šimon Brandner
71e84ccb75
Iterate PR first round
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-13 18:03:05 +02:00
Michael Telatynski
b6b099f6c8 Fix broken edge case with public space creation with no alias 2021-09-13 16:27:46 +01:00
Michael Telatynski
d75820a491 Hide mute/unmute button in UserInfo for Spaces as it makes no sense 2021-09-13 13:49:24 +01:00
Šimon Brandner
4673e1aa49
Convert SearchBox to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 08:24:17 +02:00
Šimon Brandner
1a128c3a00
Merge remote-tracking branch 'upstream/develop' into feature/image-view-load-anim/18186
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-11 15:32:44 +02:00
Šimon Brandner
f4ca073b4a
Don't auto replace if not enabled
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-11 10:26:15 +02:00
Šimon Brandner
fd022310b3
Merge remote-tracking branch 'upstream/develop' into fix/end-of-line-emoji
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-11 10:21:56 +02:00
Šimon Brandner
0defc4b14b
Don't show screensharing dialog on web
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-11 09:03:04 +02:00
Šimon Brandner
6e674b97c2
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts 2021-09-10 20:33:21 +02:00
Šimon Brandner
3fffbb0845
Use ISasEvent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-10 19:19:29 +02:00
Šimon Brandner
0efd599014
Fix types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-10 19:12:33 +02:00
Šimon Brandner
52d203dd8e
Add missing types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-10 19:07:55 +02:00
Šimon Brandner
6568e22d70
Add missing import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-10 19:06:09 +02:00
Šimon Brandner
f2b2a04a21
Make room optional
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-10 19:03:29 +02:00
Michael Telatynski
ca0d8116ad Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18908 2021-09-10 18:02:48 +01:00
Šimon Brandner
6e11f2478c
Use IDialogProps
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-10 19:01:05 +02:00
Šimon Brandner
ee90ff0b98
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-10 18:49:55 +02:00
Germain
1a4859ede8
Merge pull request #6727 from SimonBrandner/task/i-hate-my-code 2021-09-10 16:14:24 +01:00
Michael Telatynski
d15ea932f6 fix unrelated issues 2021-09-10 15:35:35 +01:00
Michael Telatynski
d46181385c Also default to PL invite=50 for private space creation 2021-09-10 13:05:04 +01:00
Michael Telatynski
6fcd930d0b fix unrelated issues 2021-09-10 11:54:25 +01:00
Michael Telatynski
41676b4a9b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18891 2021-09-10 11:09:52 +01:00
Michael Telatynski
aff9be6120 Surface unsent messages on the sublist notification badge too 2021-09-10 10:58:13 +01:00
Michael Telatynski
cd73bbf2f5
Merge pull request #6724 from matrix-org/t3chguy/fix/18798 2021-09-10 09:56:56 +01:00
Michael Telatynski
80fd960304 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-10 09:53:04 +01:00
Michael Telatynski
2a8e8b93aa add comment 2021-09-10 09:48:46 +01:00
Michael Telatynski
558b292c25 Adapt and re-use the RolesRoomSettingsTab for Spaces 2021-09-10 09:41:58 +01:00
Michael Telatynski
bbe714257e Show unsent message warning on Space panel button 2021-09-10 09:17:31 +01:00
Germain
d475b7f1ea
Merge pull request #6753 from matrix-org/revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-09 18:49:38 +01:00