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
d512a83a6c
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:37:57 +02:00
41d5865dd7
Cleanup _ReplyTile.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:26:04 +02:00
9cb3c71afe
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room
2021-07-16 09:34:30 +01:00
a1c658f187
Set Menu icon to link
2021-07-16 09:07:52 +01:00
a3792b75e2
Fix IRC layout replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 07:53:20 +02:00
5d0afdb706
Don't show line number in replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:38:07 +02:00
88da0f4dcf
Give audio and video replies an icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:17:41 +02:00
68640a4dbd
Fix icon postion
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:16:05 +02:00
7f9f2dbbcb
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 14:54:06 +02:00
dcb9b9b777
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/elements/MiniAvatarUploader.tsx
src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
src/i18n/strings/en_EN.json
src/settings/handlers/RoomSettingsHandler.ts
src/stores/SpaceStore.tsx
2021-07-15 10:04:48 +01:00
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements ( #6363 )
...
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2021-07-15 09:55:58 +01:00
51c5094ca4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-14 17:47:22 +02:00
acd37d2aad
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 16:53:05 +02:00
fe2eb5ebf0
Merge pull request #6370 from matrix-org/travis/voice_messages/right-panel
...
Fix voice messages in right panels
2021-07-14 08:46:55 -06:00
789d078814
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-14 16:26:22 +02:00
fc270b435c
fix group layout
2021-07-14 15:32:35 +02:00
782563af53
Override audio and video body with file body
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:47:29 +02:00
f26c75bdcc
Use margin instead of padding
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:23:10 +02:00
586e85cbff
Use MFileBody in replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:14:44 +02:00
18355599e8
Fix senderProfile getting cutoff
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:07:41 +02:00
6a285bed5a
Make the buttons easier to hit
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:06:41 +02:00
1f131db216
Set a max width on waveform-less tiles
2021-07-13 19:02:12 -06:00
0bbdfefd0d
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-07-13 13:21:27 +02:00
1bca5371d1
Fix redacted messages for the 100th #*&@*%^ time
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 13:18:01 +02:00
8e456b062a
More unused CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:32:17 +02:00
d149cead5f
Remove unused CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:27:03 +02:00
b4ae54dcce
Remove unused CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:15:22 +02:00
866a11d7e3
Fix image alignment issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 11:49:49 +02:00
fca5125c5b
Improve redacted body look
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 10:36:44 +02:00
290174b031
fix group layout and IRC layout regressions
2021-07-13 10:36:35 +02:00
ba3e7e24ba
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-13 10:15:27 +02:00
1061cb0ffb
Fix layout regressions in message bubbles
2021-07-13 10:15:12 +02:00
562d43e81c
Font
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:36:31 +02:00
43cf7bc611
Remove 0px
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:33:45 +02:00
5f81cfe9d9
Nicer formatting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:24:18 +02:00
ff7a18da56
Rewrite Notifications component for modern UI & processing
2021-07-12 23:57:54 -06:00
3ae76c84f6
Add a simple TagComposer for the keywords entry
2021-07-12 23:55:08 -06:00
4ddcb9a484
Make diffs look a bit better
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-12 16:59:16 +02:00
8a816bb096
Merge pull request #6331 from matrix-org/gsouquet/ghost-button-background
...
Make ghost button background transparent
2021-07-12 09:07:52 +01:00
829169ec87
Merge pull request #6342 from matrix-org/t3chguy/fix/vrlp
...
Fix small visual regression with the site name on url previews
2021-07-09 18:05:48 +01:00
8072007782
Fix small visual regression with the site name on url previews
2021-07-09 14:50:55 +01:00
f412fb44a7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/SlashCommands.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
src/createRoom.ts
2021-07-09 08:13:39 +01:00
91d208d514
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 08:26:19 +02:00
b7af39ffff
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:17:34 +02:00
722c360de0
Use the correct color for silence button
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:42:05 +02:00
1c2bdf3cf4
delint
2021-07-08 13:35:26 +01:00
2615ea7f3f
Add icons to buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:35:06 +02:00
00a3f5d469
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494
2021-07-08 13:29:10 +01:00
9ec3d93402
Better handling of call types
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:19:02 +02:00
1cdae54880
Fix text wrapping for Link Preview Widget
2021-07-08 13:16:58 +01:00
6f1fc3fc7e
Fix call button spacing issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 13:43:59 +02:00
9c67679b35
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-07-08 13:30:57 +02:00
6ef7ecbe08
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-08 13:22:56 +02:00
16dc3c47e1
Make ghost button background transparent
2021-07-08 10:37:40 +02:00
b9a539eaa2
Improve URL Previews
...
only show 2 by default with expand/collapse mechanism
show all hashes again, but dedup requests
clean up hide mechanism, instead of one `x` per preview have one per group
2021-07-07 18:04:30 +01:00
55896223aa
unbubble some type of events
2021-07-07 15:13:58 +02:00
6a03ab825f
Fix style linting
2021-07-07 13:15:25 +02:00
10bdb3cefa
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-07 13:07:43 +02:00
870857f321
Right hand side border radius
2021-07-07 13:00:31 +02:00
7d946ee0db
Restore action bar
2021-07-07 12:04:28 +02:00
b0a1fc7b97
Updated color scheme and spacing
2021-07-07 11:23:38 +02:00
fc239ffd01
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 10:53:22 +02:00
9d12439ee7
Give codeblocks a background color
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 09:22:56 +02:00
8c1721fc35
Remove the old codeblock code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 09:22:50 +02:00
eb9f4c609a
Make CreateRoomDialog capable of creating restricted rooms in spaces
2021-07-06 10:10:47 +01:00
c5ca98a3ad
Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog
2021-07-06 10:10:25 +01:00
82100df9ea
Bring dropdown styling into closer line with rest of our styling
2021-07-06 10:08:57 +01:00
de875bbe1d
fix avatar position and outline
2021-07-05 16:22:18 +02:00
1b25ab930e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-07-05 13:06:22 +01:00
1b95762910
Merge pull request #6310 from matrix-org/gsouquet/faster-animations
2021-07-05 12:21:49 +01:00
0cee0db9df
Fix icon size in passphrase prompt
2021-07-02 20:38:07 +01:00
df64a076d9
Deprecate unused PulsedAvatar
2021-07-02 15:24:30 +01:00
a093ea6357
Move RightPanel animation to compositor
2021-07-02 15:23:03 +01:00
aac0989005
Make beta dot animation run on the compositor
2021-07-02 14:58:59 +01:00
e8f0412fe3
Add way to manage Restricted join rule in Room Settings
2021-07-02 14:51:55 +01:00
0d8f84c769
Delete lozenge effect
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 15:35:52 +02:00
e582b1559b
Fix redacted messages (again)
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 15:09:02 +02:00
0fe10e4502
Fix replies to deleted messages
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 14:22:46 +02:00
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:14:14 +02:00
5240209529
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-07-02 12:39:51 +03:00
1f337b28ac
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
...
Conflicts:
src/ContentMessages.tsx
src/components/structures/UploadBar.tsx
src/components/views/messages/MImageBody.js
src/components/views/messages/MStickerBody.js
src/components/views/messages/MVideoBody.tsx
2021-07-01 20:48:34 +01:00
5e3c8fae5c
put this just on the buttons
2021-07-01 15:22:44 +01:00
d90d1ca8db
event list summary alignment in bubble layout
2021-07-01 14:56:34 +01:00
66d95ed7b2
Fix button styling in verification bubbles
2021-07-01 14:51:20 +01:00
223b40c9d6
Add dark theme support
2021-07-01 14:23:00 +01:00
da8a783ca0
lint
2021-06-30 14:51:18 -06:00
12d7be2b6a
Merge branch 'develop' into travis/new-audio
2021-06-30 13:25:41 -06:00
209344d443
improvements to bubble layout
2021-06-30 17:06:51 +01:00
d1c6cfe6b9
Improved message bubble layout (no reply)
2021-06-30 12:06:16 +01:00
d9eec1c03b
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-06-30 08:58:20 +01:00
fdced3da1b
Remove reminescent references to the tinter
2021-06-30 08:09:55 +01:00
26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu
2021-06-29 08:18:07 +01:00
d6cf2346fe
Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240
2021-06-28 21:00:36 -06:00
964a97d59e
Merge remote-tracking branch 'origin/develop' into travis/new-audio
2021-06-28 20:52:44 -06:00
b6d9ecde8b
Merge pull request #6240 from matrix-org/gsouquet/voice-messages-waveform-perf
...
Improve audio recording performance
2021-06-28 20:49:21 -06:00
52b578fb3f
Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648
...
Fix IRC layout regressions
2021-06-28 16:10:02 +01:00
494f4d3ab4
Merge pull request #6248 from matrix-org/t3chguy/fix/17731
2021-06-28 16:08:12 +01:00
56514d51a6
Fix tiny scrollbar dot on chrome/electron in Forward Dialog
2021-06-28 15:37:28 +01:00
6cb86057c5
Merge branch 'develop' into gsouquet/voice-messages-waveform-perf
2021-06-28 09:29:11 +01:00
ed78bd9096
Remove explicitly set font-family in place where comments talk about FF
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-26 09:12:51 +02:00
ffc6f96d45
Remove explicitly set font-family
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-26 09:12:45 +02:00
fbe3eb7726
Remove unused class
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-26 09:00:42 +02:00
1d374f6cbb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731
2021-06-25 14:50:24 +01:00
1f27049a5d
Merge pull request #6257 from SimonBrandner/feature/pinned-click
2021-06-25 14:42:18 +01:00
620e14eb4b
Fix space avatar management layout being broken
2021-06-25 11:10:37 +01:00
7a6ee7d918
I know how CSS works.
2021-06-25 00:22:05 -06:00
e0a73a583e
Increase clickable area of seek bar
2021-06-25 00:19:57 -06:00
dd53c25706
Fix right panel sizing
2021-06-24 20:37:34 -06:00
ebb6f1b602
Add seeking and notes about clock desync
2021-06-24 20:18:50 -06:00
086042f078
update message context texts and icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:53 +02:00
6ea79b297f
tweak message context icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:51 +02:00
8f6904ec1b
tweak the message menu cancel icon size
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:50 +02:00
74f61795eb
add _MessageContextMenu.scss license header
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:50 +02:00
62efea7e19
add message context menu icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:50 +02:00
e4eeafd485
migrate the message context menu to IconizedContextMenu
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:49 +02:00
9c752680ba
Tile styling and early behaviour
2021-06-24 13:56:11 -06:00
ffef2e58cb
Unify audio message types to new media body
2021-06-24 11:38:35 -06:00
8ce77e618f
Reduce pointless CSS vars by 2
2021-06-24 11:38:35 -06:00
470778cbb8
Move voice message components to audio-generic directory
2021-06-24 11:38:35 -06:00
9f2eba4351
Fix class identifiers
2021-06-24 11:38:35 -06:00
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click
2021-06-24 16:59:18 +02:00
6d3e7730ef
Fix two PRs duplicating the css attribute
2021-06-24 11:40:49 +01:00
71414904fc
Merge pull request #6201 from matrix-org/t3chguy/fix/15051
2021-06-24 11:20:12 +01:00
26d8c4d2e6
Improve design of the multi inviter error dialog
2021-06-24 10:03:32 +01:00
09c22c37ff
Add comment to specify variable origin
2021-06-24 10:01:44 +01:00
0fe6a28853
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click
2021-06-24 10:57:09 +02:00
56467485f5
Merge branch 'develop' into gsouquet/voice-messages-waveform-perf
2021-06-24 09:42:47 +01:00
8d47ea63c2
Make pinned message text clickable
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 10:41:55 +02:00
0e2f617d94
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051
2021-06-24 09:33:39 +01:00
47be728eb2
Fix invite dialog being cut off when it has limited results
2021-06-24 09:21:52 +01:00
5d93216c94
Decrease e2e shield fill mask size so that it doesn't overlap
2021-06-23 16:10:47 +01:00
cdb97d5494
Fix trashcan.svg by exporting it with its viewbox
...
then fix sizing and alignment of consumers
2021-06-23 12:30:23 +01:00
f0ad70f0e7
Merge pull request #5786 from DantrazTrev/DialPad
...
Dial Pad UI bug fixes
2021-06-23 11:41:41 +01:00
1286be1ffb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
...
Conflicts:
src/components/views/room_settings/AliasSettings.tsx
2021-06-22 22:02:09 +01:00
b3b9135b1f
Merge pull request #6134 from matrix-org/t3chguy/fix/17529
2021-06-22 21:28:51 +01:00
e3e6b74272
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
...
Conflicts:
src/stores/SpaceStore.tsx
2021-06-22 17:38:05 +01:00
27d255f30e
Reduce audio waveform layout trashing
2021-06-22 12:27:54 +01:00
202cb0f5d8
Fix styling of buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-21 17:05:36 +02:00
adb42b7927
Deprecate FormButton to use AccessibleButton everywhere
2021-06-21 14:16:37 +01:00
401fe1d05b
Add call silencing to CallEvent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 20:03:09 +02:00
21a960acc7
Fix timestamp issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 17:53:00 +02:00
c0f34c9a01
Merge remote-tracking branch 'upstream/develop' into fix/irc-layout-mxid/17648
2021-06-19 17:24:30 +02:00
c1bc4b0027
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-06-19 16:11:53 +03:00
6271c5c3d8
first iteration for message bubble layout
2021-06-18 18:59:22 +01:00
6fb3bdbcd0
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
2021-06-18 19:02:56 +02:00
f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:07:43 +02:00
707ecd8786
Don't highlight bubble events
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:03:48 +02:00
62de75ab00
Increase height
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 16:19:57 +02:00
9b6195317e
Improve padding
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 16:14:54 +02:00
88ba24f362
Fix bugs
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 18:34:58 +02:00
a781d6f128
Adjust padding and line-height a bit
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 18:13:52 +02:00
512c054656
Add call type icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 17:55:18 +02:00
71ff5248fe
Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591
2021-06-17 16:41:00 +01:00
7d90612371
Iterate PR
2021-06-17 16:22:40 +01:00
02e6559330
Set text color to secondary-fg-color
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 17:04:56 +02:00
7b6c3aec63
Change some styling to better match the designs
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 16:33:00 +02:00
949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-06-17 15:53:25 +02:00
d89392a1d9
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
2021-06-17 15:41:19 +02:00
dbdb61c820
Improve the mxid overlap situation
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-16 17:21:29 +02:00
384bb3af2e
Fix layout regression in the invite dialog for few results
2021-06-16 10:37:34 +01:00
b4fbc791bb
Add experimental options to the Spaces beta
2021-06-16 09:01:13 +01:00
5dc87869eb
Also override mx_SenderProfile_mxid
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-15 17:22:47 +02:00
cdd2773aa6
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-06-15 17:37:49 +03:00
a52dd57eb2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529
...
Conflicts:
package.json
yarn.lock
2021-06-15 13:59:54 +01:00
660a849cdd
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
...
Conflicts:
package.json
src/ContentMessages.tsx
yarn.lock
2021-06-15 12:58:29 +01:00
83c30b2280
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
...
Conflicts:
src/components/views/spaces/SpaceCreateMenu.tsx
2021-06-15 12:24:26 +01:00
d08495bde6
Fix display name overlap
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-15 06:30:22 +02:00
539465ecb4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
...
Conflicts:
src/components/views/dialogs/InviteDialog.tsx
2021-06-14 22:22:30 +01:00
91df392a2a
Merge pull request #5880 from SimonBrandner/show-username
2021-06-14 21:34:01 +01:00
60ab7aaed5
Support hiding sidebar
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 17:20:13 +02:00
9a67851479
Hide feeds with muted video in certain cases and fix colors
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 14:01:09 +02:00
6ae1f533e9
Add min-width
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 13:50:25 +02:00
c5ee2a6b32
Add share button and refoctor
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 13:43:42 +02:00
e5188a5258
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-06-12 13:32:49 +02:00
0c55a6c5bf
Add presenting text
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 11:50:16 +02:00
e431f41e11
Fix feeds misbehaving
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 10:48:32 +02:00
97b976b171
Adjust for sidebar
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 08:15:26 +02:00
5608e92885
Add styling for CallViewSidebar
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 08:09:51 +02:00
5343be7814
Fix buggy hovering/selecting of event tiles
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-10 18:53:56 +02:00
8174973cfe
Use the same styling as for mx_TextualEvent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-10 15:31:27 +02:00
fdda534053
Merge branch 'develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-09 19:23:14 +02:00
15132074e2
Restore copy button icon when sharing permalink
2021-06-09 13:44:31 +01:00
fccd71f82e
Update styling based on review
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-09 06:23:51 +02:00
f34a2e61bc
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
2021-06-08 16:54:49 +01:00
34cc494a8e
Merge pull request #6140 from matrix-org/t3chguy/fix/17553
2021-06-08 16:45:35 +01:00
90bb7c1482
Switch Space Settings for a tabbed view with a bunch more settings exposed
2021-06-08 16:33:47 +01:00
bf77a4a2ab
Merge remote-tracking branch 'upstream/develop' into show-username
2021-06-08 17:14:42 +02:00
372f24ff99
Hide download links from forward dialog preview
...
since trying to interact with them is pointless.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-07 19:19:14 -04:00
b97867271b
Merge branch 'develop' into improved-forwarding-ui
2021-06-07 19:09:36 -04:00
025148d9fc
Merge branch 'develop' into show-username
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:37:22 +02:00
059241b5cc
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-06-07 19:26:12 +03:00
6d2a7390d7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
2021-06-07 14:15:49 +01:00
bd8fd77d54
Merge pull request #6148 from robintown/fix-timestamps
2021-06-07 13:12:11 +01:00
8c34a8461e
Add way to specify address during public space creation
2021-06-07 08:57:39 +01:00
Travis Ralston