22375e2108
Update res/css/views/rooms/_EventBubbleTile.scss
2021-07-21 15:11:49 +01:00
be52eba027
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-21 15:56:08 +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
32e7c58747
Merge branch 'develop' into gsouquet/fix-18099
2021-07-21 11:57:29 +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
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
ef002a2e22
Fix replies line clamping
2021-07-21 11:41:52 +02:00
880dc26847
don't force height if the height can't change (no children edge)
2021-07-21 10:39:04 +01:00
1b2d70d816
Prompt user to leave rooms/subspaces in a space when leaving space
2021-07-21 09:57:10 +01:00
dfa85b00d0
Merge pull request #6423 from matrix-org/gsouquet/fix-18077
2021-07-21 09:43:15 +01:00
a7cd5fc49b
Shift thumbnail dislay to use object-fit to preserve aspect-ratio
2021-07-21 10:03:10 +02:00
6d9ac1de17
Fix font slider preview for message bubbles
2021-07-21 09:34:30 +02: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
1ed316851a
Merge upstream and resolve conflicts
2021-07-21 11:35:27 +05:30
3993e698bd
Put the call controls close togather
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-20 17:22:36 +02:00
5994111e5d
Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download
2021-07-20 08:55:53 -06:00
0af64504b1
Reverse sidebar order
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-20 16:53:53 +02:00
15406eaff2
Put the sidebar to the bottom rather than the top
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-20 16:18:48 +02:00
fadb13e9fb
Center all buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-20 16:02:02 +02:00
c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-20 15:48:25 +02: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
9e5b149291
Fix event highlighthing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-20 14:23:28 +02:00
66a3b0fe5f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-20 13:24:05 +02:00
c16827272d
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-20 13:19:31 +02:00
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-20 13:15:04 +02:00
53ae7817bc
Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635
2021-07-20 10:22:41 +01:00
06c9a060b4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-20 10:16:21 +02:00
5db20d9431
Fix placeholder centering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-20 08:54:32 +02:00
097cc858ce
Remove hover effect from files in the files panel
2021-07-19 10:07:16 -06:00
de42a00ca4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
2021-07-19 16:47:31 +01:00
863f4d4f9f
Merge pull request #6394 from matrix-org/dbkr/exorcise_homeserver_checkbox
...
Fix bug where 'other homeserver' would unfocus
2021-07-19 10:09:03 +01:00
fe2cac56f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-19 12:57:27 +05:30
e3eac48d05
Cleanup _ReplyPreview.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-17 15:25:54 +02:00
96acd6c9ef
Cleanup _ReplyThread.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-17 15:06:31 +02:00
75fc1299fb
Merge remote-tracking branch 'upstream/develop' into task/cleanup-replies
2021-07-17 08:26:28 +02:00
5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-17 08:13:51 +02:00
d2de9b432c
Apply suggestions from code review
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com >
2021-07-16 23:50:06 -06:00
942cadc8a3
Merge branch 'develop' into travis/notifications-2
2021-07-16 16:20:23 -06:00
31d7de628e
Small tweaks
2021-07-16 16:04:23 -06:00
b57fff5739
Update visual style and sandbox properly
2021-07-16 15:55:07 -06:00
f9b45677d6
Fix bug where 'other homeserver' would unfocus
...
It turns out the answer to this was not all that complex: we had
two nested <label>s: one for the radio button and one for the Field,
which presumably causes both of them to generate click events and
focus something and what ends up focused is some kind of race condition
depending on, apparently, how fast you click.
Notes: Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked.
2021-07-16 22:27:31 +01:00
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-16 21:43:33 +02:00
18ba7a280d
Give sources a little padding
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-16 21:30:50 +02:00
31f5d012b8
Improve the look and feel of the picker
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-16 21:16:07 +02:00
Germain