OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
37,905 Commits
218 Branches
563 Tags
448 MiB
Commit Graph

37905 Commits (fc210fe29777fac55ca48ad075e8b1e6a25005e2)

Author SHA1 Message Date
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 21743d8ad2 Merge branch 'origin/develop' into Weblate. 2021-09-14 19:40:25 +00: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
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 5ddbbfe7bd Merge branch 'origin/develop' into Weblate. 2021-09-14 19:26:08 +00: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
Weblate 8a430cfe5f Merge branch 'origin/develop' into Weblate. 2021-09-14 19:25:32 +00: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
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
Weblate 2fbdd737c9 Merge branch 'origin/develop' into Weblate. 2021-09-14 17:47:11 +00: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
Š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
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
Šimon Brandner 2f6239770a
Merge remote-tracking branch 'upstream/develop' into task/structures-ts 2021-09-14 17:32:00 +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
Š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
Weblate c4b1a9c1e5 Merge branch 'origin/develop' into Weblate. 2021-09-14 15:02:22 +00:00
Michael Telatynski c786ef9f69 Fix space keyboard shortcuts conflicting with native zoom shortcuts 2021-09-14 16:02:14 +01: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
Weblate 43fd8fa9f6 Merge branch 'origin/develop' into Weblate. 2021-09-14 14:56:25 +00: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
Weblate 7e5ba5101f Merge branch 'origin/develop' into Weblate. 2021-09-14 14:55:48 +00:00