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

29952 commits

Author SHA1 Message Date
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
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
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
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
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