e891d18fa2
Add my email to my copyright notices
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 21:41:28 -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
bbd5fab7b5
Fix type check
...
As TypeScript points out, you can only set an id on HTML elements, not
arbitrary components.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 11:15:06 -04:00
a06306d560
Merge branch 'develop' into improved-forwarding-ui
2021-06-05 11:04:17 -04:00
0f64f4d692
Fix MessagePanel tests
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 10:49:44 -04:00
c24b239478
Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests
...
Bumps [ws](https://github.com/websockets/ws ) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/commits )
---
updated-dependencies:
- dependency-name: ws
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-05 13:36:25 +00:00
3bf8e54d7f
Use cached RoomContext settings values throughout rooms
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 01:25:43 -04:00
13196b8146
Prefer cached settings values in shouldHideEvent
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 01:25:01 -04:00
48d3e41351
Cache frequently used settings values in RoomContext
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 01:23:51 -04:00
40d2f8228f
Fix watching settings
...
An accidental variable shadowing was preventing setting watcher
callbacks from being fired.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 01:16:52 -04:00
31604c13c0
Lint the typescript tests
...
Turns out we hadn't told eslint to lint .ts in tests/
Also fix all the lint errors, including removing a use of assert that
had randomly crept in.
2021-06-04 16:52:50 +01:00
abfe6d85a0
Merge pull request #6141 from matrix-org/jryans/repair-event-status
...
Repair event status position in timeline
2021-06-04 14:16:59 +01: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
93f41ce0ab
Actually finish the empty state for the pinned messages card
2021-06-04 11:35:17 +01:00
48bd6583ed
Fix unpinning of pinned messages
2021-06-04 11:34:54 +01:00
c99c42f341
Merge branch 'develop' into share-room
2021-06-04 01:08:09 -05: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
f22fd7aa3b
Merge pull request #6096 from matrix-org/t3chguy/fix/6606
2021-06-04 00:00:31 +01: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
0c97d90fb9
Iterate PR based on feedback
2021-06-03 16:44:28 +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
5ef78f43a4
fix containment rule to keep height when resizing vertically
2021-06-03 16:26:20 +01:00
f2643151c6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
...
Conflicts:
src/components/views/dialogs/InviteDialog.tsx
2021-06-03 16:22:59 +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
430cfa9c06
Merge pull request #6127 from matrix-org/gsouquet/css-containment
...
Add CSS containment rules for shorter reflow operations
2021-06-03 08:10:29 +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
58652152c1
Strings are now in a different place...
2021-06-02 17:52:26 +01:00
0aeddea30f
Only do native lookup if it's supported
...
Also fix as bug where we were checking the wrong field to check
for native/virtual support: oops.
2021-06-02 17:47:29 +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
70e309f0de
Merge pull request #5823 from matrix-org/gsouquet-scroll-to-live-reset-hash
2021-06-02 14:10:16 +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
2d50325836
Merge pull request #6133 from matrix-org/jryans/event-tile-radius
...
Tweak event border radius to match action bar
2021-06-02 11:39:54 +01:00
f3431feaff
Remove unused memoize import
2021-06-02 11:25:32 +01:00
bc2f068e1e
Merge pull request #6131 from matrix-org/dbkr/log_when_already_a_call
...
Log when we ignore a second call in a room
2021-06-02 11:13:46 +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
234c65b331
Tweak event border radius to match action bar
...
This adjusts the `border-radius` used when hovering on an event to match the
recently changed value for the action bar (changed to `8px` in
https://github.com/matrix-org/matrix-react-sdk/pull/6066 ).
2021-06-02 10:25:29 +01:00
Robin Townsend