Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
33,735 Commits 1 Branch 646 Tags
b97867271bd26b148165e9bd182f0ea4a4eff2ae
Commit Graph

13762 Commits

Author SHA1 Message Date
Robin Townsend b97867271b Merge branch 'develop' into improved-forwarding-ui 2021-06-07 19:09:36 -04:00
Michael Telatynski ced6c43147 Merge pull request #6152 from matrix-org/t3chguy/fix/17571 
Fix Stickerpicker context menu
 2021-06-07 22:21:19 +01:00
Michael Telatynski 801b5f9c1a Merge pull request #6155 from matrix-org/t3chguy/spacesteammatewarning 
Add warning to private space creation flow
 2021-06-07 22:21:07 +01:00
Germain Souquet 187a367111 Add prop to alwaysShowTimestamps on TimelinePanel 2021-06-07 17:11:14 +01:00
Michael Telatynski 6d80cd5913 Merge pull request #6149 from SimonBrandner/fix/jumps-image-view 2021-06-07 15:19:45 +01:00
Šimon Brandner 20a3dd67d6 Some more styling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-07 16:12:06 +02:00
Šimon Brandner 255f996710 landscape -> imageIsNotFlipped 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-07 15:46:03 +02:00
Šimon Brandner b5d271759f Why would I format this myself if eslint can do it for me? 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-07 15:43:43 +02:00
Šimon Brandner 2e47a1176f Get rid of weird rotation prop 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-07 15:39:11 +02:00
Šimon Brandner 0918ebad0a calculateZoomAndRotate -> setZoomAndRotation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-07 15:28:37 +02:00
Šimon Brandner 5880cb3b5f Better wording 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-07 15:26:54 +02:00
Šimon Brandner 67c9fe1e07 Revert "Update curly braces styling" 
This reverts commit ba0f6766ca.
 2021-06-07 15:25:57 +02:00
Michael Telatynski f3aa505673 Add warning to private space creation flow 2021-06-07 14:14:31 +01:00
Michael Telatynski bd8fd77d54 Merge pull request #6148 from robintown/fix-timestamps 2021-06-07 13:12:11 +01:00
Michael Telatynski b60feab7d2 Merge pull request #6147 from robintown/easier-image-panning 2021-06-07 12:47:43 +01:00
Germain a3a6f3fa31 Merge pull request #6154 from matrix-org/gsouquet/fix-files-scroll-token 2021-06-07 12:44:59 +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 ae04b2ce4a Fix Dialog/Modal types defn 2021-06-07 11:06:30 +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
Š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
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
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 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
Germain 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
David Baker 8ef95a6237 Interface dispatcher payload 
& use constant in test
 2021-06-03 14:38:13 +01:00
Germain 7f83590846 Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski 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
Michael Telatynski 83d223475b delint imports 2021-06-03 08:41:22 +01:00
Germain Souquet a34f8a29f4 fix mx_Event containment rules and empty read avatar row 2021-06-03 08:41:12 +01:00
Michael Telatynski 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
Michael Telatynski 42a3ace82a Iterate PR based on feedback 2021-06-03 08:35:12 +01:00
Michael Telatynski 53fc475539 Update src/components/views/rooms/PinnedEventTile.tsx 
Co-authored-by: Travis Ralston <travisr@matrix.org>
 2021-06-03 08:03:31 +01:00
David Baker 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
Michael Telatynski 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
Germain Souquet bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-06-02 13:57:33 +01:00