OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
37,662 Commits
215 Branches
561 Tags
480 MiB
Commit Graph

37662 Commits (a103a2ceaafbec19ab9eaf289731835af3db4689)

Author SHA1 Message Date
Travis Ralston a103a2ceaa Revert "Show updated relation reply from edited message (#6809)" 
This reverts commit eaab8e1570.
 2021-09-15 14:34:28 -06:00
David Baker 9bff6afd11
Merge pull request #6814 from matrix-org/dbkr/yarnupgrade_20210914 
yarn upgrade
 2021-09-15 17:53:05 +01: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
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
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
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
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
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
Travis Ralston 1f1693cb09
Merge pull request #6781 from SimonBrandner/feature/media-handling 
Improve `MatrixCall` media handling
 2021-09-14 14:40:57 -06:00
Travis Ralston 30972c597d
Merge pull request #6777 from robintown/room-list-scroll-jumps 
Fix room list scroll jumps
 2021-09-14 13:40:20 -06: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
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
Travis Ralston fdb004b4e8
Merge pull request #6785 from robintown/message-bubble-misc 
Fix various message bubble alignment issues
 2021-09-14 13:26:03 -06:00
Travis Ralston c3ad978941
Merge pull request #6795 from robintown/message-bubble-font-size 
Make message bubble font size consistent
 2021-09-14 13:25:28 -06: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
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
David Baker f6b0b12c60 fix lockfile 2021-09-14 18:47:01 +01:00
Šimon Brandner 6972cb248f
Merge remote-tracking branch 'upstream/develop' into task/remove-message_send_failed 2021-09-14 19:31:12 +02: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
Robin Townsend 9b3da61ae4 Remove unnecessary unset 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-09-14 12:37:45 -04:00
Robin Townsend 8824b12064 Fix alignment of sender name in message bubble replies 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-09-14 12:35:51 -04:00
James Salter 7344a177e3 Fix tests, swallow errors 2021-09-14 17:35:32 +01:00
Robin Townsend c31fb79d46 Merge branch 'develop' into message-bubble-misc 2021-09-14 12:31:58 -04: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
Robin Townsend 2c0835ed9b Add comments to message bubble magic numbers 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-09-14 11:27:03 -04:00
RiotRobot 85fea9cfd0 Merge branch 'master' into develop 2021-09-14 16:02:04 +01:00
Robin Townsend 35171ccd23 Merge branch 'develop' into message-bubble-misc 2021-09-14 11:00:55 -04:00
RiotRobot 36e8af2978 Merge branch 'release-v3.30.0' 2021-09-14 15:59:56 +01:00
RiotRobot c3089a1097 v3.30.0 2021-09-14 15:56:23 +01:00
RiotRobot 2eeb3cecd9 Prepare changelog for v3.30.0 2021-09-14 15:56:22 +01:00
Michael Telatynski 9928079b82
Merge pull request #6797 from matrix-org/t3chguy/fix/19025 2021-09-14 15:56:20 +01:00
Michael Telatynski 1298fddebf
Merge pull request #6800 from matrix-org/t3chguy/fix/18694 
Simplify Space Panel layout and fix some edge cases
 2021-09-14 15:55:44 +01:00
RiotRobot 4ea0385061 Upgrade matrix-js-sdk to 12.5.0 2021-09-14 15:54:30 +01:00