PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
38159 commits 1 branch 0 tags 338 MiB
Commit graph

38159 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
53041ba4b8
Merge pull request #6816 from matrix-org/revert-6809-madlittlemods/10391-show-relations-in-new-edit-content 
Revert "Show updated relation reply from edited message"
 2021-09-15 14:35:05 -06: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
143eecf1e6 Merge branch 'origin/develop' into Weblate. 2021-09-15 16:53:09 +00:00
David Baker
9bff6afd11
Merge pull request #6814 from matrix-org/dbkr/yarnupgrade_20210914 
yarn upgrade
 2021-09-15 17:53:05 +01: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
David Baker
22500a2e29 yarn upgrade 
And also pin @types/react harder because yarn wanted to give
@types/flux a newer version meaning they conflicted.
 2021-09-15 16:59:13 +01:00
Weblate
5bb31d7d3f Merge branch 'origin/develop' into Weblate. 2021-09-15 15:21:38 +00:00
David Baker
2ffbf3aa72
Merge pull request #6813 from matrix-org/dbkr/pin_typescript 
Pin typescript/types version
 2021-09-15 16:21:34 +01: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
David Baker
16065e0a8b Pin react too... 2021-09-15 16:14:58 +01:00
David Baker
4e694df6b0 Pin typescript/types version 
type: task

Because we have a collection of usages of things and conflicts
that break with the new version: https://github.com/vector-im/element-web/issues?q=is%3Aissue+is%3Aopen+preventing+TypeScript+upgrade
 2021-09-15 16:04:26 +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
b09ebca688
Merge pull request #6812 from matrix-org/dbkr/fix_roomlist_prompt 
Fix checks to show prompt to start new chats
 2021-09-15 15:54:53 +01: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
839fdbca62 fix tests 2021-09-15 13:55:34 +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
1aabe4b535
Merge pull request #6807 from matrix-org/pseudonymous-analytics-id 
Replace Posthog user hash-based tracking with a UUID stored in account_data
 2021-09-15 12:50:59 +01: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