Merge branch 'develop' of github.com:element-hq/matrix-react-sdk into t3chguy/dedup-icons

Browse Source

# Conflicts:
#	res/css/views/rooms/_MessageComposerFormatBar.pcss
#	src/components/views/elements/Pill.tsx
#	src/components/views/messages/MessageActionBar.tsx
#	src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx

...

This commit is contained in:

Michael Telatynski

2024-10-04 14:37:25 +01:00

parent 2ccac7fe57 26b0e83ac4

commit 82d9e92427

49 changed files with 1354 additions and 199 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

playwright/snapshots/crypto/crypto.spec.ts/RoomSummaryCard-with-verified-e2ee-linux.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 24 KiB After Width:  |  Height:  |  Size: 24 KiB

playwright/snapshots/permalinks/permalinks.spec.ts/permalink-rendering-linux.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 57 KiB After Width:  |  Height:  |  Size: 57 KiB

playwright/snapshots/pinned-messages/pinned-messages.spec.ts/pinned-messages-list-empty-linux.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 79 KiB After Width:  |  Height:  |  Size: 73 KiB

playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-bubble-layout-linux.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 21 KiB

playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-group-layout-linux.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 21 KiB

playwright/snapshots/right-panel/file-panel.spec.ts/empty-linux.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 72 KiB After Width:  |  Height:  |  Size: 66 KiB

playwright/snapshots/right-panel/file-panel.spec.ts/file-tiles-list-linux.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 36 KiB After Width:  |  Height:  |  Size: 36 KiB

playwright/snapshots/right-panel/notification-panel.spec.ts/empty-linux.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 69 KiB After Width:  |  Height:  |  Size: 63 KiB

playwright/snapshots/right-panel/right-panel.spec.ts/with-name-and-address-linux.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 29 KiB After Width:  |  Height:  |  Size: 29 KiB

playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 18 KiB After Width:  |  Height:  |  Size: 17 KiB

playwright/snapshots/timeline/timeline.spec.ts/highlighted-search-results-linux.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 17 KiB

playwright/snapshots/timeline/timeline.spec.ts/search-aux-panel-linux.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.6 KiB After Width:  |  Height:  |  Size: 5.6 KiB

playwright/snapshots/timeline/timeline.spec.ts/search-results-with-TextualEvent-linux.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 19 KiB

playwright/snapshots/user-view/user-view.spec.ts/user-info-linux.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 19 KiB