OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
37,778 Commits
198 Branches
547 Tags
420 MiB
Commit Graph

37778 Commits (47250a1e17969c797603f2c1d494e6a34fb1d7e9)

Author SHA1 Message Date
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
Weblate c4b1a9c1e5 Merge branch 'origin/develop' into Weblate. 2021-09-14 15:02:22 +00: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
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
Weblate 9e73d8c976 Merge branch 'origin/develop' into Weblate. 2021-09-14 14:53:07 +00:00
Michael Telatynski 6900fb79c2
Merge pull request #6798 from matrix-org/t3chguy/fix/randoms 2021-09-14 15:53:02 +01:00
Weblate b0cb05bfe8 Merge branch 'origin/develop' into Weblate. 2021-09-14 14:52:45 +00:00
sr093906 d875e429cc Translated using Weblate (Chinese (Simplified)) 
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_Hans/
 2021-09-14 14:52:45 +00:00
Michael Telatynski 4a4c68b71c
Merge pull request #6803 from matrix-org/t3chguy/fix/19034 
Stop spinner on space preview if the join fails
 2021-09-14 15:52:37 +01:00
Michael Telatynski 919270ff0c
Update src/stores/SpaceStore.tsx 
Co-authored-by: Travis Ralston <travisr@matrix.org>
 2021-09-14 15:50:51 +01:00
David Baker 07d29f64fa
Merge pull request #6802 from matrix-org/dbkr/18997_rel 
Fix autocomplete not having y-scroll
 2021-09-14 15:32:50 +01:00
David Baker d081d3af9e
Merge pull request #6801 from matrix-org/dbkr/19012_rel_2 
Fix emoji picker and stickerpicker not appearing correctly when opened
 2021-09-14 15:32:32 +01:00
James Salter a43f5507a3 Use a UUID instead of hashed user ID for tracking 
Generate a UUID and save it to account data for cross device tracking.
 2021-09-14 15:30:42 +01:00
Michael Telatynski 60f43f0171 Stop spinner on space preview if the join fails 2021-09-14 15:12:25 +01:00
Dariusz Niemczyk cb6368f885 Fix autocomplete not having y-scroll 
After changing flex-order the children did not have a max-height which
ended up in the child growing to outside of the screen instead of
being properly constrained.

Fix https://github.com/vector-im/element-web/issues/18997
 2021-09-14 15:08:40 +01:00
Dariusz Niemczyk 769c9cd780 Add a better comment describing the behavior 2021-09-14 15:03:59 +01:00
Dariusz Niemczyk 8505f292b2 Fix invalid ContextualMenu positions 2021-09-14 15:03:52 +01:00
Michael Telatynski 6672be91a1 Simplify Space Panel layout 2021-09-14 15:00:44 +01:00
Michael Telatynski f59baf1efb Tidy some types 2021-09-14 14:41:55 +01:00
Michael Telatynski 5048e41e8b Space Hierarchy react to known local rooms changing names 2021-09-14 14:41:51 +01:00
Michael Telatynski e37f6b96d7 Fix RoomTile subscribing to wrong event emitter for room name 2021-09-14 14:36:11 +01:00
Michael Telatynski e3ec00bcdf Fix space create menu eating first character of name in private space creation 2021-09-14 14:35:33 +01:00
Weblate 3191fb51ac Merge branch 'origin/develop' into Weblate. 2021-09-14 13:07:47 +00:00
Michael Telatynski ff39f480bc
Merge pull request #6778 from matrix-org/t3chguy/fix/18891 2021-09-14 14:07:43 +01:00
Weblate 40280c995c Merge branch 'origin/develop' into Weblate. 2021-09-14 12:56:53 +00:00
Dariusz Niemczyk 74e4cc9680
Merge pull request #6793 from matrix-org/palid/fix/19012 
Fix emoji picker and stickerpicker not appearing correctly when opened
 2021-09-14 14:56:49 +02:00
Weblate 7ae1da15f2 Merge branch 'origin/develop' into Weblate. 2021-09-14 12:53:11 +00:00
Dariusz Niemczyk 42a1048fde
Merge pull request #6794 from matrix-org/palid/fix/18997 
Fix autocomplete not having y-scroll
 2021-09-14 14:53:06 +02:00
Dariusz Niemczyk 60174c9836
Add a better comment describing the behavior 2021-09-14 14:51:17 +02:00
Dariusz Niemczyk 527e1eb462
Fix autocomplete not having y-scroll 
After changing flex-order the children did not have a max-height which
ended up in the child growing to outside of the screen instead of
being properly constrained.

Fix https://github.com/vector-im/element-web/issues/18997
 2021-09-14 14:45:47 +02:00