Commit graph

15683 commits

Author SHA1 Message Date
Michael Telatynski
8c08293654 Fix reactions aria-label not being a string and thus being read as [Object object] 2021-09-17 11:36:22 +01:00
Michael Telatynski
af42a31794 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19064 2021-09-17 10:22:57 +01:00
Michael Telatynski
68768002bb use more generic room type instead of boolean flag 2021-09-17 10:19:30 +01:00
Michael Telatynski
80caa5646f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/npe1 2021-09-17 09:39:55 +01:00
Dariusz Niemczyk
58ffa5138b
Merge pull request #6822 from matrix-org/palid/thread-typescriptify
Transcriptify thread events a bit
2021-09-17 10:19:20 +02:00
Šimon Brandner
a5ee20febf
Simplifie code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-16 21:04:55 +02:00
Šimon Brandner
f4f40ce558
Fix code to move end of range more simply and safely
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-16 21:02:28 +02:00
Dariusz Niemczyk
0be6073058
Fix PR comments 2021-09-16 17:13:41 +02:00
Dariusz Niemczyk
d6788b023b
Fix PR comments 2021-09-16 16:04:18 +02:00
Dariusz Niemczyk
78587558d8
Transcriptify thread events a bit 2021-09-16 16:02:06 +02:00
Michael Telatynski
1e91191fa2 Fix missing null guard in space hierarchy pagination 2021-09-16 14:28:55 +01:00
Dariusz Niemczyk
f7d8ae2b13
Fix invalid accessor for method. 2021-09-16 15:21:40 +02:00
Michael Telatynski
1e04dfa11d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19064 2021-09-16 11:46:00 +01:00
Michael Telatynski
ec4650c60d Fix abuse of MainSplit in LegacyCommunityPreview 2021-09-16 11:23:41 +01:00
Michael Telatynski
febd3df5ac Fix MainSplit IProps 2021-09-16 11:22:55 +01:00
Michael Telatynski
28bc8010a7 Say Joining space instead of Joining room where we know its a space 2021-09-16 11:20:01 +01:00
Michael Telatynski
4bb9eeb7a5 Convert RoomPreviewBar to Typescript 2021-09-16 11:09:58 +01:00
Michael Telatynski
fd24511d42
Merge pull request #6805 from matrix-org/t3chguy/fix/18858 2021-09-16 10:48:20 +01:00
Michael Telatynski
3b39ba6590
Merge pull request #6787 from SimonBrandner/task/structures-ts 2021-09-16 10:45:12 +01:00
Michael Telatynski
bbc8e4da23
Merge pull request #6594 from matrix-org/t3chguy/fix/18088 2021-09-16 10:16:33 +01:00
Michael Telatynski
b052d0730d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18858 2021-09-16 10:15:43 +01:00
Michael Telatynski
edf7764a3e
Merge pull request #6319 from SimonBrandner/fix/user-info-dm/17877 2021-09-16 10:09:22 +01:00
Michael Telatynski
e17318a364 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-16 10:05:20 +01:00
Travis Ralston
a103a2ceaa Revert "Show updated relation reply from edited message (#6809)"
This reverts commit eaab8e1570.
2021-09-15 14:34:28 -06:00
Eric Eastwood
eaab8e1570
Show updated relation reply from edited message (#6809)
Part of https://github.com/vector-im/element-web/issues/10391#issuecomment-906131724

When `m.relates_to` -> `m.in_reply_to` is provided in `m.new_content`
for an edited message, use the updated reply.

ex.

```json
{
  "type": "m.room.message",
  "content": {
    "body": " * foo bar",
    "msgtype": "m.text",
    "m.new_content": {
      "body": "foo bar",
      "msgtype": "m.text",
      "m.relates_to": {
        "m.in_reply_to": {
          "event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og"
        }
      }
    },
    "m.relates_to": {
      "rel_type": "m.replace",
      "event_id": "$lX9MRe9ZTFOOvnU8PRVbvr1wqGtYvNQ1rSot-iUTN5k"
    }
  }
}
```
2021-09-15 11:49:04 -05:00
David Baker
4f53e6cddd Merge remote-tracking branch 'origin/develop' into dbkr/fix_roomlist_prompt 2021-09-15 15:13:52 +01:00
David Baker
0f98c9127d Fix checks to show prompt to start new chats
We compared the length of the list rooms but not historical or favourite.

Caught by new version of typescript when I tried to upgrade.
2021-09-15 15:08:23 +01:00
Šimon Brandner
a571460871
Use a universal copy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-15 15:30:23 +02:00
Šimon Brandner
8094a34384
Merge remote-tracking branch 'upstream/develop' into fix/user-info-dm/17877
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-15 15:28:05 +02:00
Travis Ralston
34ce61862d
Merge pull request #6782 from SimonBrandner/fix/screensharing-dialog
Don't show screensharing dialog on web
2021-09-14 13:36:35 -06:00
Travis Ralston
7b9dc09cd4
Merge pull request #6784 from SimonBrandner/fix/end-of-line-emoji
Replace plain text emoji at the end of a line
2021-09-14 13:33:34 -06:00
Travis Ralston
18d406421b
Merge pull request #6806 from SimonBrandner/task/remove-message_send_failed
Remove `message_send_failed` dispatch
2021-09-14 13:10:07 -06:00
Travis Ralston
333418232d
Merge pull request #6808 from SimonBrandner/task/context_menus-ts
Convert `/context_menus` and `/avatars` to TS
2021-09-14 13:07:15 -06:00
Šimon Brandner
6972cb248f
Merge remote-tracking branch 'upstream/develop' into task/remove-message_send_failed 2021-09-14 19:31:12 +02:00
Šimon Brandner
67d328c7fd
Merge remote-tracking branch 'upstream/develop' into task/structures-ts 2021-09-14 19:30:52 +02:00
Eric Eastwood
fddc20dd89
Remove replies from hidden events when shown with messages.ViewSourceEvent (#6796)
As discovered in https://github.com/vector-im/element-web/issues/10391#is

Previously, if you turned on the `showHiddenEventsInTimeline` labs flag, edit (`m.replace`) events
that also have a `m.in_reply_to` field, will show the reply in the timeline.

ex.
```
{
  "type": "m.room.message",
  "content": {
    "body": " * foo",
    "msgtype": "m.text",
    "m.new_content": {
      "body": "foo",
      "msgtype": "m.text"
    },
    "m.relates_to": {
      "rel_type": "m.replace",
      "event_id": "$yvuev9bF2nLRf8fscG55njpVjY3FHJzWgZ4BKI9_0eg",
      "m.in_reply_to": {
        "event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og"
      }
    }
  }
}
```
2021-09-14 12:28:28 -05:00
Šimon Brandner
0f55fde03a
Convert StatusMessageContextMenu to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 19:23:19 +02:00
Š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
db25147a19
Remove message_send_failed as it was unused
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 17:49:18 +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
Šimon Brandner
b26bec949d
Use React.Children.count()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 17:19:57 +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
6900fb79c2
Merge pull request #6798 from matrix-org/t3chguy/fix/randoms 2021-09-14 15:53:02 +01:00
Michael Telatynski
60f43f0171 Stop spinner on space preview if the join fails 2021-09-14 15:12:25 +01:00
Michael Telatynski
5048e41e8b Space Hierarchy react to known local rooms changing names 2021-09-14 14:41:51 +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
Dariusz Niemczyk
60174c9836
Add a better comment describing the behavior 2021-09-14 14:51:17 +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
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
Šimon Brandner
ffb3e98e3e
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts 2021-09-14 06:22:53 +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
Š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
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
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
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
David Baker
bd5d02d690
Update comment too
Co-authored-by: Travis Ralston <travisr@matrix.org>
2021-09-09 18:15:51 +01:00
Travis Ralston
a6d2bb5e6c
Merge pull request #6693 from SimonBrandner/fix/guest/18776
Render guest settings only in public rooms/spaces
2021-09-09 10:42:38 -06:00
Travis Ralston
bdb29e96fa
Merge pull request #6766 from matrix-org/travis/measure-encryption-perf
Add config option to turn on in-room event sending timing metrics
2021-09-09 10:38:15 -06:00
Germain Souquet
672dab1998 Force refresh threads timeline
Fixes vector-im/element-web#18947

In the absence of a proper pending events / remote echo setup it seems fairly difficult to get the timeline to update

Adding a temporary helper to force refresh the timeline and not swallow local events when sending a message from the thread sidebar
2021-09-09 17:31:05 +01:00
David Baker
a4aa6dfcd7 Debounce read marker update on scroll
Reverts https://github.com/matrix-org/matrix-react-sdk/pull/6751 in
favour of debouncing the updates to read markers, because it seems
allowing the scroll to be 1px away from the bottom was important for
some browsers and meant they never got to the bottom.

We can fix the problem instead by debouncing the update to read
markers, because the scroll state gets reset back to the bottom when
componentDidUpdate() runs which happens after the read marker code
does a setState(). This should probably be debounced anyway since
it doesn't need to be run that frequently.

Fixes https://github.com/vector-im/element-web/issues/18961
Type: bugfix
2021-09-09 15:58:19 +01:00
Germain Souquet
07ebd85f7e Merge branch 'develop' into revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-09 13:30:35 +01:00
Germain Souquet
aa53444267 Improve narrow composer usability 2021-09-09 13:27:25 +01:00
Michael Telatynski
329bc8a89e Move unsent event badge handling into RoomNotificationState 2021-09-09 13:14:05 +01:00
Michael Telatynski
630835961b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798
 Conflicts:
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-09-09 11:01:11 +01:00
Michael Telatynski
2eb64de508 Tweak edge case behaviour 2021-09-09 10:54:31 +01:00
Michael Telatynski
fa60b24a9f fix react error in console 2021-09-09 10:50:12 +01:00
Michael Telatynski
e17a5328d2
Merge pull request #6764 from matrix-org/t3chguy/fix/18677 2021-09-08 23:00:01 +01:00
Michael Telatynski
d00c4d042b
Merge pull request #6760 from matrix-org/t3chguy/fix/18528
Improve tooltips on space quick actions and explore button
2021-09-08 22:59:52 +01:00
Michael Telatynski
086d36beb1
Merge pull request #6765 from matrix-org/t3chguy/fix/17018
Make space members and user info behave more expectedly
2021-09-08 22:59:44 +01:00
Travis Ralston
21e33362e5 Add config option to turn on in-room event sending timing metrics
This is intended to be hooked up to an external system. 

Due to the extra events and metadata concerns, this is only available if turned on from the config.

See `sendTimePerformanceMetrics.ts` for event schemas.
2021-09-08 11:28:19 -06:00
Michael Telatynski
22c5902ae4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18677 2021-09-08 17:21:42 +01:00
Michael Telatynski
2c134b2dfd
Merge pull request #6763 from matrix-org/t3chguy/ts1234
Improve types based on new TS in js-sdk
2021-09-08 17:09:17 +01:00
Michael Telatynski
600375cafe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798
 Conflicts:
	src/i18n/strings/en_EN.json
2021-09-08 15:38:13 +01:00
Michael Telatynski
911ca07da4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-08 15:28:58 +01:00
Michael Telatynski
d4bac4752d Make space members and user info behave more expectedly 2021-09-08 13:34:26 +01:00
Michael Telatynski
83912daced Improve the upgrade for restricted user experience 2021-09-08 13:16:31 +01:00
Michael Telatynski
1da65d459c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18597 2021-09-08 12:57:37 +01:00
Michael Telatynski
467fb55e8e improve typing & comment 2021-09-08 12:53:13 +01:00
Michael Telatynski
f3abb13dc9 Convert crypto/verification/* to Typescript 2021-09-08 12:34:44 +01:00
Michael Telatynski
8bd1f384b9 Improve tooltips on space quick actions and explore button 2021-09-08 10:16:20 +01:00
Michael Telatynski
92ad81ed76
Merge pull request #6744 from matrix-org/t3chguy/fix/18892 2021-09-08 10:04:07 +01:00
Travis Ralston
3217ab26ff
Merge pull request #5759 from panoschal/fix/call-search-areas
Compact call area, better ui when in call & searching messages
2021-09-07 12:31:56 -06:00
Germain Souquet
bbf66a0011 Make label clickable on narrow mode context menu 2021-09-07 17:10:09 +01:00
Germain Souquet
646ef197fe Fix PR UI defects 2021-09-07 16:02:26 +01:00
David Baker
495b6dcd97
Merge pull request #6705 from SimonBrandner/fix/call-tile-dispatch/18825
Use disptacher to answer/reject calls in call tiles
2021-09-07 15:45:40 +01:00
Germain Souquet
2d45bfb976 Merge branch 'develop' into revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-07 15:39:32 +01:00
Germain
94cef3bf13
Merge pull request #6755 from matrix-org/gsouquet/fix-thread-creation 2021-09-07 15:26:28 +01:00
Michael Telatynski
9d1e6dc18a
Merge pull request #6756 from matrix-org/t3chguy/ts/123
fix typing of olmVersion in settings
2021-09-07 14:27:54 +01:00
Germain
42f5efaa28
Merge pull request #6750 from matrix-org/gsouquet/migrate-messageactionbar 2021-09-07 14:11:20 +01:00
Michael Telatynski
93af6aafce fix typing of olmVersion in settings 2021-09-07 13:28:51 +01:00
Michael Telatynski
6cbdb58341 add comment 2021-09-07 12:01:18 +01:00
Michael Telatynski
51f1d21464
Merge pull request #6748 from matrix-org/t3chguy/fix/18764
Fix Space creation wizard go to my first room button behaviour
2021-09-07 11:08:53 +01:00