OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
38,171 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

30170 Commits (073c5307f83459c32a0607d127795fc98bb182f8)

Author SHA1 Message Date
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
Weblate 1cfa8eddef Merge branch 'origin/develop' into Weblate. 2021-09-16 10:33:33 +00:00
waclaw66 76fae6459b Translated using Weblate (Czech) 
Currently translated at 100.0% (3164 of 3164 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-09-16 10:33:32 +00:00
random 0319892cc6 Translated using Weblate (Italian) 
Currently translated at 99.9% (3163 of 3164 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-09-16 10:33:29 +00: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
Weblate 7492238673 Merge branch 'origin/develop' into Weblate. 2021-09-16 09:48:25 +00:00
Michael Telatynski fd24511d42
Merge pull request #6805 from matrix-org/t3chguy/fix/18858 2021-09-16 10:48:20 +01:00
Weblate bb0199b776 Merge branch 'origin/develop' into Weblate. 2021-09-16 09:45:21 +00:00
sr093906 3fda3ae9a0 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3151 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-16 09:45:20 +00:00
Michael Telatynski 3b39ba6590
Merge pull request #6787 from SimonBrandner/task/structures-ts 2021-09-16 10:45:12 +01:00
Weblate e100f5bd70 Merge branch 'origin/develop' into Weblate. 2021-09-16 09:16:39 +00: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
Weblate a81f231045 Merge branch 'origin/develop' into Weblate. 2021-09-16 09:09:26 +00: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
Weblate 472563bfd9 Merge branch 'origin/develop' into Weblate. 2021-09-16 09:03:16 +00:00
XoseM c0f87c0c05 Translated using Weblate (Galician) 
Currently translated at 100.0% (3163 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-09-16 09:03:15 +00:00
Ihor Hordiichuk c226b4d1b7 Translated using Weblate (Ukrainian) 
Currently translated at 66.0% (2090 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-09-16 09:03:13 +00:00
Timo Gurr 17ec6d5610 Translated using Weblate (German) 
Currently translated at 99.1% (3135 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-09-16 09:02:14 +00:00
Michael Telatynski 8921e25815
Merge pull request #6804 from matrix-org/t3chguy/fix/18481 2021-09-16 10:02:06 +01:00
Weblate abebe52481 Merge branch 'origin/develop' into Weblate. 2021-09-15 20:35:10 +00: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
Weblate 47250a1e17 Merge branch 'origin/develop' into Weblate. 2021-09-15 16:49:11 +00:00
Alexandre Franke 68c64c63ff Translated using Weblate (French) 
Currently translated at 99.6% (3151 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-09-15 16:49:11 +00: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
Weblate 60b4fd8a36 Merge branch 'origin/develop' into Weblate. 2021-09-15 15:20:52 +00:00
jelv f593a1aff4 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3163 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-09-15 15:20:52 +00:00
James Salter 5c2467df7e
Merge pull request #6810 from matrix-org/redact-all-rooms 
Redact all room data in tracking
 2021-09-15 16:20:45 +01:00
Weblate 450d5dee19 Merge branch 'origin/develop' into Weblate. 2021-09-15 14:55:02 +00:00
random 1114d4a22c Translated using Weblate (Italian) 
Currently translated at 99.9% (3162 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-09-15 14:55:02 +00:00
jelv fab788a709 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3163 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-09-15 14:55:00 +00: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
James Salter 73f9e48c11 Fix comment 2021-09-15 14:17:52 +01:00
James Salter 93321d96f0 lint 2021-09-15 14:10:15 +01:00
James Salter 8f1204c32e Update comment reflecting tracking scheme via analytics ID 2021-09-15 13:00:59 +01:00
James Salter 76c782c64c Remove all room data from tracking 
Always redact room fragments entirely; remove room utils
 2021-09-15 12:58:26 +01:00
Weblate 6155d114ef Merge branch 'origin/develop' into Weblate. 2021-09-15 11:51:15 +00:00
waclaw66 f6f4daec00 Translated using Weblate (Czech) 
Currently translated at 100.0% (3163 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-09-15 11:51:14 +00:00
Jeff Huang 714af54be4 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3163 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-09-15 11:51:12 +00:00
jelv b24ad3a447 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3163 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-09-15 11:51:10 +00:00
Szimszon dd7253e848 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3163 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-09-15 11:51:08 +00:00
James Salter 79f03dfec3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into pseudonymous-analytics-id 2021-09-15 09:52:15 +01:00
James Salter 48fbbf2f44 Fix import, convert event type to constant 2021-09-15 09:48:48 +01:00
Weblate 391b34ebd7 Merge branch 'origin/develop' into Weblate. 2021-09-14 20:41:01 +00:00
Travis Ralston 1f1693cb09
Merge pull request #6781 from SimonBrandner/feature/media-handling 
Improve `MatrixCall` media handling
 2021-09-14 14:40:57 -06:00
Weblate 2e476db30c Merge branch 'origin/develop' into Weblate. 2021-09-14 19:36:39 +00: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
Weblate 6b55ba8afb Merge branch 'origin/develop' into Weblate. 2021-09-14 19:33:42 +00:00
Priit Jõerüüt f56afe219c Translated using Weblate (Estonian) 
Currently translated at 99.9% (3161 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-09-14 19:33:41 +00: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
Weblate bffd3b4f13 Merge branch 'origin/develop' into Weblate. 2021-09-14 19:10:12 +00: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
Weblate fc1da27d49 Merge branch 'origin/develop' into Weblate. 2021-09-14 19:07:19 +00: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
Weblate 1059643d3e Merge branch 'origin/develop' into Weblate. 2021-09-14 17:28:32 +00: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
James Salter c2192a78bc More lint 2021-09-14 18:16:48 +01:00
James Salter 6c1dea09e8 lint 2021-09-14 17:46:56 +01:00
James Salter 7344a177e3 Fix tests, swallow errors 2021-09-14 17:35:32 +01: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 c786ef9f69 Fix space keyboard shortcuts conflicting with native zoom shortcuts 2021-09-14 16:02:14 +01:00
Weblate 43fd8fa9f6 Merge branch 'origin/develop' into Weblate. 2021-09-14 14:56:25 +00:00
Michael Telatynski 9928079b82
Merge pull request #6797 from matrix-org/t3chguy/fix/19025 2021-09-14 15:56:20 +01:00
Weblate 9e73d8c976 Merge branch 'origin/develop' into Weblate. 2021-09-14 14:53:07 +00:00
Michael Telatynski 6900fb79c2
Merge pull request #6798 from matrix-org/t3chguy/fix/randoms 2021-09-14 15:53:02 +01:00
Weblate b0cb05bfe8 Merge branch 'origin/develop' into Weblate. 2021-09-14 14:52:45 +00:00
sr093906 d875e429cc Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3163 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-14 14:52:45 +00:00
Michael Telatynski 919270ff0c
Update src/stores/SpaceStore.tsx 
Co-authored-by: Travis Ralston <travisr@matrix.org>
 2021-09-14 15:50:51 +01:00
James Salter a43f5507a3 Use a UUID instead of hashed user ID for tracking 
Generate a UUID and save it to account data for cross device tracking.
 2021-09-14 15:30:42 +01:00
Michael Telatynski 60f43f0171 Stop spinner on space preview if the join fails 2021-09-14 15:12:25 +01:00
Michael Telatynski f59baf1efb Tidy some types 2021-09-14 14:41:55 +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
Weblate 3191fb51ac Merge branch 'origin/develop' into Weblate. 2021-09-14 13:07:47 +00:00
Michael Telatynski ff39f480bc
Merge pull request #6778 from matrix-org/t3chguy/fix/18891 2021-09-14 14:07:43 +01:00
Weblate 40280c995c Merge branch 'origin/develop' into Weblate. 2021-09-14 12:56:53 +00: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
Weblate 7bdae36a4c Merge branch 'origin/develop' into Weblate. 2021-09-14 10:48:31 +00: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
Weblate 5a57406441 Merge branch 'origin/develop' into Weblate. 2021-09-14 08:07:41 +00: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
Weblate e2f1846a10 Merge branch 'origin/develop' into Weblate. 2021-09-14 08:06:59 +00:00
random d3b175f1df Translated using Weblate (Italian) 
Currently translated at 99.9% (3161 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-09-14 08:06:59 +00:00
jelv 71462b49df Translated using Weblate (Dutch) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-09-14 08:06:57 +00: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
waclaw66 152f946eed Translated using Weblate (Czech) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-09-14 02:57:52 +00:00
Kaede ec6b61e623 Translated using Weblate (Japanese) 
Currently translated at 71.2% (2254 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
 2021-09-14 02:57:49 +00: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
Weblate 46f669737a Merge branch 'origin/develop' into Weblate. 2021-09-13 13:11:40 +00: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
Priit Jõerüüt d83d5563de Translated using Weblate (Estonian) 
Currently translated at 99.9% (3160 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-09-13 12:02:33 +00:00
Besnik Bleta cd7ab56cb5 Translated using Weblate (Albanian) 
Currently translated at 99.7% (3154 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-09-13 12:02:30 +00:00
XoseM 5442f7483a Translated using Weblate (Galician) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-09-13 12:02:26 +00:00
random d9235108fd Translated using Weblate (Italian) 
Currently translated at 99.9% (3161 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-09-13 12:02:21 +00:00
Ihor Hordiichuk d4c3aeebb8 Translated using Weblate (Ukrainian) 
Currently translated at 54.7% (1732 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-09-13 12:02:18 +00:00
Jeff Huang 20ab0067ff Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-09-13 12:02:13 +00:00
sr093906 13b2c70947 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-13 12:02:09 +00:00
LinAGKar bfd3d9d8ec Translated using Weblate (Swedish) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2021-09-13 12:02:06 +00:00
Nikita Epifanov 588a6d1c41 Translated using Weblate (Russian) 
Currently translated at 98.2% (3107 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2021-09-13 12:02:00 +00:00
jelv 3d14015404 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-09-13 12:01:45 +00:00
Szimszon 574ec26ee8 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-09-13 12:01:41 +00:00
iaiz 8b3ff8096d Translated using Weblate (Spanish) 
Currently translated at 99.9% (3160 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-09-13 12:01:37 +00:00
libexus e49aac9802 Translated using Weblate (German) 
Currently translated at 99.1% (3135 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-09-13 12:01:32 +00: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 4c8c64a1cb
Use MediaHandler 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-11 08:19:41 +02:00
Šimon Brandner 6e674b97c2
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts 2021-09-10 20:33:21 +02:00
Weblate 942dabc199 Merge branch 'origin/develop' into Weblate. 2021-09-10 18:32:08 +00: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
Weblate 92082cb92b Merge branch 'origin/develop' into Weblate. 2021-09-10 15:14:29 +00:00
Germain 1a4859ede8
Merge pull request #6727 from SimonBrandner/task/i-hate-my-code 2021-09-10 16:14:24 +01:00
Weblate 02b3b7be51 Merge branch 'origin/develop' into Weblate. 2021-09-10 14:42:10 +00:00
Priit Jõerüüt ae9726abb6 Translated using Weblate (Estonian) 
Currently translated at 99.9% (3154 of 3157 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-09-10 14:42:10 +00:00
Besnik Bleta bb6ccfa65a Translated using Weblate (Albanian) 
Currently translated at 99.7% (3149 of 3157 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-09-10 14:42:07 +00:00
random 48460349a5 Translated using Weblate (Italian) 
Currently translated at 99.9% (3156 of 3157 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-09-10 14:42:04 +00:00
sr093906 c1b8efd530 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3157 of 3157 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-10 14:42:01 +00: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
Weblate a26a81d725 Merge branch 'origin/develop' into Weblate. 2021-09-10 08:57:28 +00:00
Priit Jõerüüt 54a899b4fc Translated using Weblate (Estonian) 
Currently translated at 99.9% (3155 of 3158 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-09-10 08:57:28 +00:00
Besnik Bleta 880d7ecc07 Translated using Weblate (Albanian) 
Currently translated at 99.7% (3150 of 3158 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-09-10 08:57:25 +00:00
Ihor Hordiichuk 1e36cebfd8 Translated using Weblate (Ukrainian) 
Currently translated at 54.2% (1713 of 3158 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-09-10 08:57:22 +00:00
Jeff Huang b28688f0c6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3158 of 3158 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-09-10 08:57:13 +00:00
sr093906 2c61e237de Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3158 of 3158 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-10 08:57:10 +00:00
LinAGKar 4b91976f27 Translated using Weblate (Swedish) 
Currently translated at 99.7% (3150 of 3158 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2021-09-10 08:57:07 +00:00
Szimszon ed22539385 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3158 of 3158 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-09-10 08:57:05 +00: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
Weblate 9951f541e7 Merge branch 'origin/develop' into Weblate. 2021-09-09 21:43:40 +00:00
Glandos 13fd5c6555 Translated using Weblate (French) 
Currently translated at 99.9% (3155 of 3158 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-09-09 21:43:40 +00: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
Weblate 602468ccfb Merge branch 'origin/develop' into Weblate. 2021-09-09 17:56:53 +00:00
Germain 051e166c68
Merge pull request #6772 from matrix-org/gsouquet/fix-18947 2021-09-09 18:56:49 +01:00
Weblate d279490d23 Merge branch 'origin/develop' into Weblate. 2021-09-09 17:49:42 +00: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
Weblate 890b40f056 Merge branch 'origin/develop' into Weblate. 2021-09-09 17:24:13 +00: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
Weblate c053c83709 Merge branch 'origin/develop' into Weblate. 2021-09-09 16:42:43 +00: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
Weblate 85058f997e Merge branch 'origin/develop' into Weblate. 2021-09-09 16:38:25 +00:00
Priit Jõerüüt 2e290b2e9d Translated using Weblate (Estonian) 
Currently translated at 99.9% (3149 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-09-09 16:38:25 +00:00
jelv 74a67ab2b6 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-09-09 16:38:22 +00: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
iaiz 03160a968d Translated using Weblate (Spanish) 
Currently translated at 99.9% (3150 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-09-09 12:53:50 +00:00
Germain Souquet b5bed32973 Fix i18n 2021-09-09 13:40:07 +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
Besnik Bleta 2e4fca1414 Translated using Weblate (Albanian) 
Currently translated at 99.7% (3144 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-09-09 09:10:18 +00:00
random 1159aa4037 Translated using Weblate (Italian) 
Currently translated at 99.9% (3151 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-09-09 09:10:15 +00:00
waclaw66 05f8960170 Translated using Weblate (Czech) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-09-09 08:30:45 +00:00
Jeff Huang 48b3009c73 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-09-09 08:30:43 +00:00
sr093906 1ad653e6cc Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-09 08:30:41 +00:00
Szimszon e14caf8084 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-09-09 08:30:39 +00:00
Weblate 43799167ac Merge branch 'origin/develop' into Weblate. 2021-09-08 22:00:07 +00:00
Michael Telatynski e17a5328d2
Merge pull request #6764 from matrix-org/t3chguy/fix/18677 2021-09-08 23:00:01 +01:00
Weblate 06de309e57 Merge branch 'origin/develop' into Weblate. 2021-09-08 21:59:58 +00:00
Weblate 8b68f92664 Merge branch 'origin/develop' into Weblate. 2021-09-08 21:59:56 +00:00
waclaw66 d87a1967a8 Translated using Weblate (Czech) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-09-08 21:59:55 +00:00
Ihor Hordiichuk 5bd369f8d4 Translated using Weblate (Ukrainian) 
Currently translated at 52.7% (1664 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-09-08 21:59:54 +00: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
Szimszon f634e6544d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-09-08 21:59:52 +00: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 b4f42e1103 Appease the linter 2021-09-08 11:35:25 -06:00
Travis Ralston 70e28e7e13 Move fields into consistent location for js-sdk to target 2021-09-08 11:31:37 -06: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 17e0a4b3d7 iterate PR based on feedback 2021-09-08 17:14:51 +01:00
Weblate 0821e30b1e Merge branch 'origin/develop' into Weblate. 2021-09-08 16:09:25 +00:00
sr093906 6119ec1751 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-08 16:09:25 +00: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
Weblate 28accfbf1b Merge branch 'origin/develop' into Weblate. 2021-09-08 13:37:31 +00: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
Weblate 1fcfd3e858 Merge branch 'origin/develop' into Weblate. 2021-09-08 11:55:50 +00:00
Michael Telatynski 0d0eea392c
Merge pull request #6746 from matrix-org/t3chguy/fix/10935 2021-09-08 12:55:45 +01:00