nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
37,773 Commits 258 Branches 582 Tags
222427dae84d952ab746a6abce4bd0753f1afc0c
Commit Graph

15561 Commits

Author SHA1 Message Date
Šimon Brandner
222427dae8 Convert GeneralUserSettingsTab to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 13:45:38 +02:00
Šimon Brandner
e88227dac8 Convert LabsUserSettingsTab to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 13:19:13 +02:00
Šimon Brandner
f62e0795f0 Convert NotificationsSettingsTab to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:51:47 +02:00
Šimon Brandner
c5a1de961b Convert GeneralRoomSettingsTab to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:44:40 +02:00
Šimon Brandner
76f8543c22 Convert PhoneNumber to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:40:32 +02:00
Šimon Brandner
2ebbda482d Convert EmailAddress to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:33:11 +02:00
Šimon Brandner
39f92c4ddc Convert PhoneNumbers to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:22:14 +02:00
Šimon Brandner
a2ecf18096 Convert EmailAddresses to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:22:07 +02:00
Travis Ralston
5b8279dd16 Merge pull request #6837 from SimonBrandner/fix/ctrl-backspace 
Don't `fakeDeletion()` when `CTRL` is pressed
 2021-09-20 08:34:31 -06:00
Germain
e4e696f409 Merge pull request #6838 from SimonBrandner/task/room_settings-ts 2021-09-20 14:52:40 +01:00
David Baker
b69f3f2dff Merge pull request #6830 from matrix-org/t3chguy/fix/npe2 
Fix accessing field on oobData which may be undefined
 2021-09-20 13:38:20 +01:00
Šimon Brandner
6f004d219c Convert UrlPreviewSettings to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-19 09:59:53 +02:00
Šimon Brandner
a43e3450a5 Convert RoomProfileSettings to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-19 09:55:22 +02:00
Šimon Brandner
4eda5b186a Handle MacOS option key 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-19 07:37:25 +02:00
Šimon Brandner
649b655a48 Don't fake deletion when CTRL is pressed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-18 20:43:23 +02:00
Travis Ralston
eb0859c4a6 Merge pull request #6831 from SimonBrandner/fix/end-of-line-emoji-edit/19084 
Convert end-of-line emoji when editing
 2021-09-18 00:47:06 -06:00
Travis Ralston
45058dfde9 Merge pull request #6832 from SimonBrandner/fix/ff-esr-pills 
Fix pill deletion on Firefox 78
 2021-09-18 00:46:51 -06:00
Eric Eastwood
9c3439a1aa Show updated relation reply from edited message - v2 (#6817) 
Part of https://github.com/vector-im/element-web/issues/10391

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-17 15:18:52 -05:00
Šimon Brandner
36decbb6dd Fix pill deletion on FF 78 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 19:25:28 +02:00
Šimon Brandner
b1ba5fb48c Convert end-of-line emoji when editing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 19:13:46 +02:00
Michael Telatynski
1db2a745e8 Fix accessing field on oobData which may be undefined 2021-09-17 18:03:31 +01:00
Šimon Brandner
9a2d61bf20 Merge remote-tracking branch 'upstream/develop' into fix/emoji-dupe/19073 2021-09-17 17:54:07 +02:00
Michael Telatynski
b91ece1bcf Merge pull request #6828 from matrix-org/t3chguy/fix/a11y-label 2021-09-17 12:27:28 +01:00
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