6d2a7390d7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
2021-06-07 14:15:49 +01:00
bd8fd77d54
Merge pull request #6148 from robintown/fix-timestamps
2021-06-07 13:12:11 +01:00
b60feab7d2
Merge pull request #6147 from robintown/easier-image-panning
2021-06-07 12:47:43 +01:00
a3a6f3fa31
Merge pull request #6154 from matrix-org/gsouquet/fix-files-scroll-token
2021-06-07 12:44:59 +01:00
ea6904ce2a
Fix local echo comment for scroll tokens
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com >
2021-06-07 12:37:11 +01:00
d111f4cbb1
Merge branch 'develop' into gsouquet/fix-files-scroll-token
2021-06-07 12:25:08 +01:00
6693c39709
make event list summary a list item
2021-06-07 12:17:29 +01:00
ae04b2ce4a
Fix Dialog/Modal types defn
2021-06-07 11:06:30 +01:00
a6ddffe74c
Add scroll token to file and notif event tiles
2021-06-07 09:26:42 +01:00
8c34a8461e
Add way to specify address during public space creation
2021-06-07 08:57:39 +01:00
b2b95257a8
Convert RoomAliasField to Typescript
2021-06-07 08:54:41 +01:00
ea2120bdfd
Fix timestamps
...
7f83590846robin@robin.town >
2021-06-06 01:55:01 -04:00
17edfec3aa
Make it easier to pan images in the lightbox
...
Previously, if you were dragging an image and your cursor outpaced the
edge of the image as it was moving, panning would abruptly stop. This
moves a few of the lightbox event listeners one level up to the image
wrapper to ensure that all drag movements are detected, even if they
don't end over the image's current position.
Signed-off-by: Robin Townsend <robin@robin.town >
2021-06-05 21:08:44 -04:00
b06da16a85
Fix jumping to bottom without a highlighted event
...
Signed-off-by: Robin Townsend <robin@robin.town >
2021-06-05 13:20:27 -04:00
ab96d5f8af
Repair event status position in timeline
...
https://github.com/matrix-org/matrix-react-sdk/pull/6079 caused a regression in
the event status indicator. The `mx_EventTile_msgOption` container was folded
into the avatars code path, but the event status is a special case of this, so
it now needs to also have this container to preserve its positioning.
Fixes https://github.com/vector-im/element-web/issues/17552
2021-06-04 11:54:58 +01:00
12e013508d
Merge pull request #6132 from matrix-org/travis/ts-mtxcli
...
Adapt for js-sdk MatrixClient conversion to TS
2021-06-04 00:07:22 -06:00
5d0d81e79a
not sure how I butchered this merge conflict resolution this much.
2021-06-03 19:37:26 +01:00
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606
2021-06-03 19:33:09 +01:00
7421efe8f9
Merge pull request #6136 from matrix-org/dbkr/map_phone_number_lookup_to_native
...
Map phone number lookup results to their native rooms
2021-06-03 19:01:46 +01:00
a36063704d
Merge pull request #6138 from matrix-org/gsouquet/containment-event
...
Fix mx_Event containment rules and empty read avatar row
2021-06-03 16:38:55 +01:00
8ef95a6237
Interface dispatcher payload
...
& use constant in test
2021-06-03 14:38:13 +01:00
7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms
2021-06-03 08:44:01 +01:00
4f50727010
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606
...
Conflicts:
src/components/structures/RoomView.tsx
src/components/views/right_panel/UserInfo.tsx
2021-06-03 08:42:05 +01:00
83d223475b
delint imports
2021-06-03 08:41:22 +01:00
a34f8a29f4
fix mx_Event containment rules and empty read avatar row
2021-06-03 08:41:12 +01:00
4765216280
Merge branch 't3chguy/fix/6606' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606
2021-06-03 08:36:04 +01:00
42a3ace82a
Iterate PR based on feedback
2021-06-03 08:35:12 +01:00
53fc475539
Update src/components/views/rooms/PinnedEventTile.tsx
...
Co-authored-by: Travis Ralston <travisr@matrix.org >
2021-06-03 08:03:31 +01:00
2c4fa73a45
Map phone number lookup results to their native rooms
...
When dialing a phone number, also look to see if there's a corresponding
native user for the resulting user, and if so, go to the native room
for that user.
2021-06-02 17:39:13 +01:00
4290237bdf
Merge pull request #6135 from matrix-org/t3chguy/fix/17494
...
ignore hash/fragment when de-duplicating links for url previews
2021-06-02 15:08:41 +01:00
bc50028f70
Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash
2021-06-02 13:57:33 +01:00
bc89cf14dd
ignore hash/fragment when de-duplicating links for url previews
2021-06-02 11:53:47 +01:00
9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering
2021-06-02 11:41:59 +01:00
96f5d3af05
Merge pull request #6130 from matrix-org/gsouquet/member-list-sort
2021-06-02 11:40:52 +01:00
82fe9a5c7b
remove unused import
2021-06-02 10:48:18 +01:00
d7a5547d80
use Intl.Collator over String.prototype.localeCompare for better performance
2021-06-02 10:42:17 +01:00
3dc6cfbf34
Undo olmVersion handling
2021-06-01 22:31:08 -06:00
c9883f346c
Build pass 1
2021-06-01 22:21:04 -06:00
5b2dacd99e
Adapt for js-sdk MatrixClient conversion to TS
...
For https://github.com/matrix-org/matrix-js-sdk/pull/1718
2021-06-01 21:36:28 -06:00
a1ff060138
Merge pull request #6123 from matrix-org/t3chguy/fix/17517
...
Update way of checking for registration disabled
2021-06-01 15:20:21 +01:00
4e6f1e6294
add comment
2021-06-01 15:00:59 +01:00
591314141b
Add methods visibility for AutoHideScrollbar
2021-06-01 14:15:42 +01:00
73ca6b2ad0
Add passive flag to Tooltip scroll event listener
2021-06-01 14:14:02 +01:00
308ac505a8
Migrate AutoHideScrollbar to TypeScript
...
Also changed the way the React.RefObject is collected
2021-06-01 14:13:46 +01:00
c6c1e09cae
Merge pull request #6126 from matrix-org/t3chguy/fix/rs5384
...
Fix the ability to remove avatar from a space via settings
2021-06-01 12:11:10 +01:00
72fab80bb9
Merge pull request #6125 from matrix-org/t3chguy/fix/17521
...
Switch to stable endpoint/fields for MSC2858
2021-06-01 12:07:41 +01:00
173b0e9d78
Merge pull request #6117 from SimonBrandner/fix/down-arrow-edit/17491
...
Clear stored editor state when canceling editing using a shortcut
2021-06-01 12:07:23 +01:00
6e74ab0cf5
Fix the ability to remove avatar from a space via settings
2021-06-01 11:11:04 +01:00
f11a7083ae
Switch to stable endpoint/fields for MSC2858
2021-06-01 11:01:09 +01:00
e525d046c7
remove outdated TODO
2021-06-01 10:49:19 +01:00
Michael Telatynski