e8760736ba
Merge remote-tracking branch 'upstream/develop' into fix/file-label-behaviour
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 15:33:06 +02:00
0fb210cadb
Increase hit area for timestamp in message bubbles
2021-07-21 15:31:10 +02:00
c155382445
Improve new layout switcher UI
2021-07-21 14:55:30 +02:00
e4c6833085
Merge pull request #6425 from matrix-org/gsouquet/fix-18099
2021-07-21 12:02:51 +01:00
32e7c58747
Merge branch 'develop' into gsouquet/fix-18099
2021-07-21 11:57:29 +01:00
45967c80f3
Merge pull request #6426 from matrix-org/gsouquet/event-tile-null-guard
...
Add null guard for room prop in EventTile
2021-07-21 11:56:43 +01:00
a4ca52255d
Merge pull request #6421 from matrix-org/gsouquet/fix-18084
...
Fix font slider preview for message bubbles
2021-07-21 11:56:33 +01:00
e33163c837
Merge pull request #6419 from matrix-org/gsouquet/fix-18125
...
Add spoiler support for message bubbles
2021-07-21 11:54:30 +01:00
ae51653348
Add null guard for room prop in EventTile
2021-07-21 12:41:02 +02:00
5a7fe60d0e
Merge pull request #6416 from robintown/non-emoji-reactions
2021-07-21 11:30:15 +01:00
d147aaa984
delint and fix min-height issue
2021-07-21 11:27:36 +01:00
fd64d37305
Add iconography to Create Room Dialog dropdown
...
Remove unused old stale feather-customised/globe.svg
2021-07-21 11:20:41 +01:00
390b05617c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/dialogs/RoomUpgradeDialog.tsx
src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-07-21 10:46:41 +01:00
6308dabcfe
Remove forgotten code comment
2021-07-21 10:43:48 +01:00
a58edcb241
tweak copy
2021-07-21 10:43:12 +01:00
ef002a2e22
Fix replies line clamping
2021-07-21 11:41:52 +02:00
dfa85b00d0
Merge pull request #6423 from matrix-org/gsouquet/fix-18077
2021-07-21 09:43:15 +01:00
8e01080711
Merge pull request #6420 from matrix-org/gsouquet/fix-18079
...
Reintroduce grouped events padding on modern layout
2021-07-21 09:14:07 +01:00
b31b8f1b41
Remove old container sizing comment
...
Co-authored-by: James Salter <jamess@element.io>
2021-07-21 09:13:12 +01:00
a7cd5fc49b
Shift thumbnail dislay to use object-fit to preserve aspect-ratio
2021-07-21 10:03:10 +02:00
794c49c5db
Migrate MStickerBody to TypeScript
2021-07-21 09:52:09 +02:00
ae60692e88
Merge pull request #6412 from matrix-org/gsouqet/ts-migration-1
2021-07-21 08:36:08 +01:00
6d9ac1de17
Fix font slider preview for message bubbles
2021-07-21 09:34:30 +02:00
54841d63dc
Fix wrench-tests by importing EmbeddedPage through sdk.getComponent
2021-07-21 09:29:33 +02:00
1d1d93ed14
Apply code review suggestion
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-21 03:17:55 -04:00
fee69884a6
Reintroduce grouped events padding on modern layout
2021-07-21 08:57:09 +02:00
a6308229fb
Add spoiler support for message bubbles
2021-07-21 08:42:42 +02:00
0497e0864f
Fix types
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-21 02:42:30 -04:00
3911666c52
Zoom images to where the cursor points
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-21 02:25:34 -04:00
45f9f3e13e
Name functions better
2021-07-20 23:34:27 -06:00
a759d61ba0
Play only one audio file at a time
...
Fixes https://github.com/vector-im/element-web/issues/17439
2021-07-20 23:28:07 -06:00
aefdac1115
Fix error when hovering over non-emoji reactions
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-20 22:41:49 -04:00
e45b1a1e41
Missing license header
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 18:52:02 +02:00
862932cce5
Don't use require
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 18:48:18 +02:00
3372a77248
Remove grecaptcha from globals thanks to #6412
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-20 17:45:47 +01:00
efce2d16f1
Merge branch 'develop' into gsouqet/ts-migration-1
2021-07-20 18:43:08 +02:00
745a8d3860
Explain isSmall proper for CountryDropdown
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-20 17:18:33 +01:00
91cf27e252
Merge pull request #6401 from Palid/fix/15142/fix-grecaptcha-race-condition
2021-07-20 16:38:19 +01:00
44b8bace47
Merge branch 'develop' into fix/15142/fix-grecaptcha-race-condition
...
* develop: (141 commits)
delint
Doc some values
Remove useless image reference
Revert accidental renaming of dispatcherRef
Fix event highlighthing
Move some code around for clarity
Constrain emoji skins type even further
Delint
i18n irc and fix lint from merge conflict
Remove unwanted coma in EventTile
fix three lints
lint fix
not sure how these happened :/
remove unused prop
Update eslint-plugin-matrix-org
Fix placeholder centering
Make emoji skins type more specific
Rename some variables since their purpose has changed
Conform to new react and typescript eslint rules
Apply code review suggestions
...
2021-07-20 17:33:05 +02:00
7ea17aee3c
Merge pull request #6386 from matrix-org/travis/voice-messages/download
...
Move download button for media to the action bar
2021-07-20 09:08:50 -06:00
7892539a9b
delint
2021-07-20 09:03:26 -06:00
5994111e5d
Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download
2021-07-20 08:55:53 -06:00
44e240e12d
Doc some values
2021-07-20 08:55:07 -06:00
32d8da2c74
Remove useless image reference
2021-07-20 08:52:55 -06:00
4a877300da
Merge pull request #6405 from matrix-org/travis/files-hover
...
Remove hover effect from files in the files panel
2021-07-20 07:38:04 -06:00
340d09d457
Merge pull request #6415 from matrix-org/t3chguy-patch-1
...
Revert accidental renaming of dispatcherRef
2021-07-20 14:02:19 +01:00
ad50d23cc2
Revert accidental renaming of dispatcherRef
2021-07-20 13:56:49 +01:00
c47a05cc48
Merge pull request #6121 from SimonBrandner/feature/call-event-tile
...
Add VoIP event tiles
2021-07-20 13:31:53 +01:00
9e5b149291
Fix event highlighthing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 14:23:28 +02:00
d8c4ab53e0
Merge pull request #6347 from robintown/emojibase-updates
2021-07-20 12:57:00 +01:00
Šimon Brandner