OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
38,438 Commits
203 Branches
553 Tags
428 MiB
Commit Graph

38438 Commits (e470d7d030562d032f568296e29f5aaec6755950)

Author SHA1 Message Date
t6nisalt 2b904f2d44 Translated using Weblate (Estonian) 
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/et/
 2021-09-16 20:27:41 +00:00
Priit Jõerüüt 0eb4193ba6 Translated using Weblate (Estonian) 
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/et/
 2021-09-16 20:27:39 +00: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
Weblate 175cfac4b6 Merge branch 'origin/develop' into Weblate. 2021-09-16 13:29:35 +00:00
Besnik Bleta 4cac549e79 Translated using Weblate (Albanian) 
Currently translated at 99.7% (3156 of 3164 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-09-16 13:29:35 +00:00
sr093906 a06f93602b Translated using Weblate (Chinese (Simplified)) 
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/zh_Hans/
 2021-09-16 13:29:30 +00:00
Dariusz Niemczyk d026dce723
Merge pull request #6820 from matrix-org/palid/fix/invalid-property-ts 
Fix invalid accessor for  method.
 2021-09-16 15:29:21 +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
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 3da02f1546
Merge pull request #6819 from matrix-org/t3chguy/fix/build1 2021-09-16 11:33:20 +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
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 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