Commit Graph

33822 Commits (de95f3bc01a6e506f9751387e0b2d83cb83c4d0d)

Author SHA1 Message Date
Germain a3a6f3fa31
Merge pull request #6154 from matrix-org/gsouquet/fix-files-scroll-token 2021-06-07 12:44:59 +01:00
Michael Telatynski 7abf680e51
Merge pull request #6153 from matrix-org/t3chguy/ts/123 2021-06-07 12:40:41 +01:00
Germain ea6904ce2a
Fix local echo comment for scroll tokens
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-07 12:37:11 +01:00
Germain Souquet d111f4cbb1 Merge branch 'develop' into gsouquet/fix-files-scroll-token 2021-06-07 12:25:08 +01:00
Germain Souquet 6693c39709 make event list summary a list item 2021-06-07 12:17:29 +01:00
Michael Telatynski 4cc95dd184 Make skinning less upset 2021-06-07 11:20:35 +01:00
Michael Telatynski ae04b2ce4a Fix Dialog/Modal types defn 2021-06-07 11:06:30 +01:00
Michael Telatynski 2525db6fb1 Convert Resend to Typescript 2021-06-07 11:03:39 +01:00
Michael Telatynski f6e4943bef Convert RoomAliasCache to Typescript 2021-06-07 11:01:38 +01:00
Michael Telatynski 50d3e04bda Convert MatrixActionCreators to Typescript 2021-06-07 10:58:22 +01:00
Michael Telatynski c8b3acb7e4 Convert utils to Typescript 2021-06-07 10:57:46 +01:00
Michael Telatynski b2d9dd7214 Convert LifecycleStore to Typescript 2021-06-07 10:57:39 +01:00
Michael Telatynski 3431ebb995 Convert AsyncWrapper to Typescript 2021-06-07 10:57:25 +01:00
Michael Telatynski 9315a87ebf Convert EventIndex to Typescript 2021-06-07 10:57:11 +01:00
Michael Telatynski d2ce670d3e Remove unused code 2021-06-07 10:56:10 +01:00
David Baker 96ab920577
Merge pull request #6142 from matrix-org/dbkr/lint_ts_tests
Lint the typescript tests
2021-06-07 09:51:24 +01:00
Germain Souquet a6ddffe74c Add scroll token to file and notif event tiles 2021-06-07 09:26:42 +01:00
Michael Telatynski 31d308a1fb Fix Stickerpicker context menu 2021-06-07 09:22:47 +01:00
Germain 00dd6e878f
Merge pull request #6146 from robintown/fix-jump-to-bottom
Fix jumping to bottom without a highlighted event
2021-06-07 09:01:47 +01:00
Robin Townsend 21ff1f521f Fix i18n strings
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 23:14:26 -04:00
Robin Townsend 1e574307d0 Cache lowBandwidth setting to speed up BaseAvatar
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 23:08:47 -04:00
Robin Townsend 903d4d252a Add optimized function to determine whether event has text to display
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 23:06:56 -04:00
Šimon Brandner ba0f6766ca
Update curly braces styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-06 09:02:30 +02:00
Šimon Brandner c3fdd73357
Avoid multiple setState() calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-06 08:56:12 +02:00
Šimon Brandner 28be581af1
Take image rotation into account when zooming
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-06 08:51:07 +02:00
Šimon Brandner c0964b69b7
Remove redundant vars
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-06 08:14:43 +02:00
Šimon Brandner 1c8e341143
Reset all translation vars
Not doing this would result in jumps because everything would get out of sync

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-06 08:09:41 +02:00
Robin Townsend ea2120bdfd Fix timestamps
7f83590846 changed timestamps to be hidden
at the DOM level, not the CSS level. We can keep that approach, we just
need to ensure they still get shown at the right times.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 01:55:01 -04:00
Robin Townsend e891d18fa2 Add my email to my copyright notices
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 21:41:28 -04:00
Robin Townsend 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
Robin Townsend 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
Robin Townsend 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
Robin Townsend a06306d560 Merge branch 'develop' into improved-forwarding-ui 2021-06-05 11:04:17 -04:00
Robin Townsend 0f64f4d692 Fix MessagePanel tests
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 10:49:44 -04:00
dependabot[bot] 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
Robin Townsend 3bf8e54d7f Use cached RoomContext settings values throughout rooms
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 01:25:43 -04:00
Robin Townsend 13196b8146 Prefer cached settings values in shouldHideEvent
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 01:25:01 -04:00
Robin Townsend 48d3e41351 Cache frequently used settings values in RoomContext
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 01:23:51 -04:00
Robin Townsend 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
David Baker 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
J. Ryan Stinnett 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
J. Ryan Stinnett 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
Michael Telatynski 93f41ce0ab Actually finish the empty state for the pinned messages card 2021-06-04 11:35:17 +01:00
Michael Telatynski 48bd6583ed Fix unpinning of pinned messages 2021-06-04 11:34:54 +01:00
Aaron Raimist c99c42f341 Merge branch 'develop' into share-room 2021-06-04 01:08:09 -05:00
Travis Ralston 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
Michael Telatynski f22fd7aa3b
Merge pull request #6096 from matrix-org/t3chguy/fix/6606 2021-06-04 00:00:31 +01:00
Michael Telatynski 5d0d81e79a not sure how I butchered this merge conflict resolution this much. 2021-06-03 19:37:26 +01:00
Michael Telatynski 93010d34fd
Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
David Baker 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