Commit graph

29802 commits

Author SHA1 Message Date
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
Dariusz Niemczyk
60174c9836
Add a better comment describing the behavior 2021-09-14 14:51:17 +02:00
Michael Telatynski
87c9551507 Fix edge cases around joining new room which does not belong to active space 2021-09-14 12:49:18 +01: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
Michael Telatynski
73a2225b10
Merge pull request #6792 from matrix-org/t3chguy/fix/19005
Fix automatic field population in space create menu not validating
2021-09-14 09:06:49 +01:00
Šimon Brandner
c460d56e50
Remove unused import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 06:37:08 +02:00
Šimon Brandner
eae45d8a7e
Merge remote-tracking branch 'upstream/develop' into task/structures-ts 2021-09-14 06:31:43 +02:00
Dariusz Niemczyk
ceafa83392
Fix invalid ContextualMenu positions 2021-09-13 22:11:58 +02:00
Dariusz Niemczyk
e913f03a67
Add missing types 2021-09-13 22:11:43 +02:00
Šimon Brandner
8a86407a4c
Use MatrixClientContext
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-13 18:28:52 +02:00
Šimon Brandner
807792dc69
Revert some changes that are unncessary due to js-sdk changes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-13 18:24:53 +02:00
Šimon Brandner
44141bf048
Iterate PR first round
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-13 18:23:37 +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
e4cf7314f5
Fix init value
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-13 18:14:55 +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
1590fe32cf
Convert RoomStatusBar to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 10:15:34 +02:00
Šimon Brandner
e48407a1d6
Convert ViewSource to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 10:15:34 +02:00
Šimon Brandner
9a7e2b31d4
Convert IndicatorScrollbar to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 10:15:28 +02:00
Šimon Brandner
ff7e32cdd1
Convert UserView to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 09:24:55 +02:00
Šimon Brandner
a6a56b455b
Convert GenericErrorPage to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 08:56:29 +02:00
Šimon Brandner
e882576f86
Convert EmbeddedPage to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 08:56:00 +02:00
Šimon Brandner
716aba2a0e
Convert MainSplit to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 08:40:56 +02: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
Aaron Raimist
354d0cfba4
Redirect from /#/welcome to /#/home if already logged in
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-09-11 10:52:33 -05: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
4c8c64a1cb
Use MediaHandler
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-11 08:19:41 +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
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
9a8a453827 tidy 2021-09-10 11:09:46 +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
Robin Townsend
def1c68c16 Fix message bubble corners being wrong in the presence of hidden events
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-09 16:11:36 -04:00
Germain
051e166c68
Merge pull request #6772 from matrix-org/gsouquet/fix-18947 2021-09-09 18:56:49 +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
David Baker
3f28454a8e
Merge pull request #6771 from matrix-org/dbkr/debounce_read_marker_update
Debounce read marker update on scroll
2021-09-09 18:24:08 +01:00