Šimon Brandner
b6ea75b681
Merge remote-tracking branch 'upstream/develop' into task/colors-2
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 08:57:12 +02:00
Germain Souquet
edd4d42e7f
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-23 17:31:37 +01:00
Germain Souquet
9facb0d963
Polish UI
2021-08-23 14:44:44 +01:00
David Baker
b391ee0bbf
Merge pull request #6451 from SimonBrandner/fix/replies-bubble/18184
...
Fix replies on the bubble layout
2021-08-23 11:29:28 +01:00
Germain
1fad454fe0
Merge pull request #6655 from SimonBrandner/fix/autocomplete-scroll
2021-08-23 11:16:02 +01:00
Germain Souquet
393bd4871f
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-23 10:15:35 +01:00
Šimon Brandner
1c93e18c0a
Move CallPreview CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-22 15:22:21 +02:00
Šimon Brandner
d29a18b182
Fix some sizing issue on video feeds
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-22 10:10:05 +02:00
Šimon Brandner
61188561d2
Merge remote-tracking branch 'upstream/develop' into feature/voice-activity
2021-08-22 10:01:17 +02:00
Šimon Brandner
cb7e44f4f5
Always show a transparent border to avoid icon jumps
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-22 09:08:33 +02:00
Šimon Brandner
b58184d61e
Make autocomplete smaller
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-21 19:04:26 +02:00
Šimon Brandner
81d64bec58
Fix autocomplete scrollbar
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-21 18:18:53 +02:00
Travis Ralston
3e19fc1984
Merge pull request #6620 from SimonBrandner/feature/vertical-autocomplete/18558
...
Format autocomplete suggestions vertically
2021-08-20 09:10:36 -06:00
Germain Souquet
30a762944a
Implement a very low fidelity UI for threads
2021-08-20 12:11:04 +01:00
Jaiwanth
6a26154271
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-08-20 15:02:13 +05:30
David Baker
ea38990d94
Merge pull request #6647 from SimonBrandner/fix/call-tile-bubbles/18648
...
Fix call tiles on the bubble layout
2021-08-20 09:24:42 +01:00
Šimon Brandner
952fdd04c1
Fix call tiles on the bubble layout
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-20 10:04:40 +02:00
Travis Ralston
fcf47f6539
Merge pull request #6626 from SimonBrandner/fix/correct-colors-call-tiles
...
Adjust colors in call tiles
2021-08-20 00:02:56 -06:00
Germain Souquet
ffc7326b0c
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-19 10:44:32 +01:00
Šimon Brandner
abab31c33b
Add a speaking indicator
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-19 11:42:43 +02:00
Dariusz Niemczyk
7adfbf6f98
Show blurhash only after 150ms
...
Blurhash on every single room entrance was extremely annoying, to the
point where it wasn't really helpful, but distracting, even after
the animations was added.
This commit makes it so the blurhash is only shown after 150ms, and the
image will be animated as a quick fade-in if there's no blurhash.
Fixes https://github.com/vector-im/element-web/issues/18617
Fixes https://github.com/vector-im/element-web/issues/17879
2021-08-19 07:52:23 +02:00
David Baker
5fa0908752
Merge pull request #6624 from SimonBrandner/fix/call-tile-button/18565
...
Fix call tile buttons
2021-08-18 12:03:18 +01:00
David Baker
24e3a91f6f
Merge pull request #6618 from SimonBrandner/fix/long-names-call-tiles
...
Fix long display names in call tiles
2021-08-18 11:56:09 +01:00
David Baker
3a733d1604
Merge pull request #6616 from SimonBrandner/fix/access-token-overflow
...
Avoid access token overflow
2021-08-18 11:54:40 +01:00
Germain Souquet
95f4513bd2
Make UI respond to thread events
2021-08-17 17:42:47 +01:00
Germain Souquet
458f860a26
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-17 11:14:21 +01:00
Germain Souquet
d1dbfbd014
hide thread events from the timeline
2021-08-17 11:10:02 +01:00
Šimon Brandner
d8f58e95cb
Use the secondary color for all
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 18:41:21 +02:00
Šimon Brandner
93fee442e6
Fix call tile buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 15:30:45 +02:00
Šimon Brandner
2ca616c239
Format autocomplete suggestions vertically
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 10:15:54 +02:00
Šimon Brandner
c856d433d6
Trim long display names
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 10:08:16 +02:00
Šimon Brandner
ae19055734
Fix long display names in call toasts
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 09:34:28 +02:00
Šimon Brandner
84ad1bec6c
Avoid access token overflow
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-15 14:40:31 +02:00
Jaiwanth
0e3ad652af
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-08-14 00:04:30 +05:30
Jaiwanth
7207329c15
Apply review suggestions
2021-08-13 23:44:07 +05:30
Šimon Brandner
0ee59a17de
Fix PiP of held calls
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 18:42:55 +02:00
Michael Telatynski
5e38b8b3b3
try fix tests s'more
2021-08-13 13:29:25 +01:00
Šimon Brandner
cda91e44e0
Use new call state icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:37:17 +02:00
Šimon Brandner
c79852a9f0
Left align call tiles
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 10:59:59 +02:00
Šimon Brandner
5ac5640939
Add a little padding
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 10:35:31 +02:00
Šimon Brandner
39bb253d1f
Merge remote-tracking branch 'upstream/develop' into feature/narrow-voip-tiles/18398
2021-08-13 10:30:21 +02:00
Šimon Brandner
25a3a8ddfd
$roomlist-header-color -> $tertiary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:31 +02:00
Šimon Brandner
8e610e5947
$dialpad-button-bg-color -> $quinary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:31 +02:00
Šimon Brandner
0faedebb92
$roomheader-bg-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:30 +02:00
Šimon Brandner
a3a6f73049
$avatar-bg-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:30 +02:00
Šimon Brandner
8b59bf3d18
$tertiary-fg-color -> $tertiary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:29 +02:00
Šimon Brandner
10bc85724a
$secondary-fg-color -> $secondary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:26 +02:00
Šimon Brandner
e5fd19c332
$primary-fg-color -> $primary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:18:18 +02:00
Šimon Brandner
9ecd3b03f1
$quaternary-fg-color -> $quaternary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:17:37 +02:00
Šimon Brandner
2afee596a9
$primary-bg-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:17:34 +02:00
Michael Telatynski
0414ea27b8
Iterate PR based on feedback
2021-08-12 15:53:10 +01:00
Šimon Brandner
7ce88c9966
$toast-bg-color -> $system
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 16:20:30 +02:00
Jaiwanth
e88edba650
Merge branch 'develop' into export-conversations
2021-08-12 17:10:13 +05:30
Michael Telatynski
57bf64bd28
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
...
Conflicts:
src/components/views/spaces/SpacePanel.tsx
2021-08-12 12:05:55 +01:00
Dariusz Niemczyk
fbc5729daf
Merge pull request #6590 from matrix-org/palid/fix/images-loading-ux
...
Make loading encrypted images look snappier
2021-08-12 12:55:52 +02:00
Michael Telatynski
228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092
2021-08-12 11:28:14 +01:00
Michael Telatynski
9d3569a577
Iterate PR based on feedback
2021-08-12 10:58:56 +01:00
Travis Ralston
2e6da2dc6e
Merge pull request #6596 from SimonBrandner/fix/scrollbar-dot/18474
...
Remove tiny scrollbar dot from code blocks
2021-08-11 13:54:47 -06:00
Michael Telatynski
38dbe89316
Merge branch 't3chguy/fix/18092' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
...
Conflicts:
src/components/views/spaces/SpaceCreateMenu.tsx
src/i18n/strings/en_EN.json
2021-08-11 20:53:41 +01:00
Michael Telatynski
5f54abc7e5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
2021-08-11 20:51:47 +01:00
David Baker
abba7983ce
Merge pull request #6578 from SimonBrandner/task/export-call-view-buttons
...
Move Call View Buttons into a separate component
2021-08-11 18:09:48 +01:00
Travis Ralston
a149108a7d
Merge pull request #6353 from SimonBrandner/feature/improved-composer
...
Improve handling of pills in the composer
2021-08-11 10:55:13 -06:00
Šimon Brandner
5bc165f2ac
Make scrollbar dot transparent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-11 18:33:16 +02:00
Michael Telatynski
54d85a3864
Iterate PR based on feedback
2021-08-11 16:32:48 +01:00
Michael Telatynski
be85dcd1bf
Delabs Spaces, keeping it as a default-on preference for the time being
2021-08-11 14:52:40 +01:00
Dariusz Niemczyk
c872609ed3
Modify encrypted images loading for better UX
...
Adds proper react css transition to encrypted images placeholders, so
that we can animate it's entrance and exit properly.
In addition, adds simple css animations file to properly handle all of
the animations in one place, so that it's much easier to properly handle
prefers-reduced-motion media query.
2021-08-10 19:24:17 +02:00
Germain Souquet
d971802789
Create ThreadView phase in RightPanel
2021-08-10 14:30:12 +02:00
Michael Telatynski
77cf5bf613
Update space create menu copy and add link to community migrator
2021-08-10 11:30:00 +01:00
Michael Telatynski
195b8714fc
Iterate PR based on feedback
2021-08-10 09:55:51 +01:00
Michael Telatynski
db951b43a3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-10 09:48:22 +01:00
Jaiwanth
45ce352d02
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-08-09 10:44:13 +05:30
Šimon Brandner
d43eac7722
Add bubble highlight styling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-08 15:00:25 +02:00
Šimon Brandner
d0e76a0ecd
Use CallViewButtons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-08 11:20:17 +02:00
Šimon Brandner
0cad9ed14a
Add _CallViewButtons.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-08 11:15:18 +02:00
Travis Ralston
92a60497d2
Merge pull request #6572 from matrix-org/travis/voice-messages/stop-left
...
Move stop button to the left of the waveform
2021-08-07 09:09:21 -06:00
Šimon Brandner
54b5c8554a
Fix source picker sizing issues (again)
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-07 12:00:50 +02:00
Dariusz Niemczyk
b6f7c4fe95
Merge pull request #6475 from matrix-org/jitsi-picture-in-picture
...
Refactor Calls components into smaller pieces for future Widgets work
2021-08-06 18:03:30 +02:00
Travis Ralston
fbe8f04942
Fix height jump of recording states
...
Fixes https://github.com/vector-im/element-web/issues/18431
2021-08-06 09:04:36 -06:00
Travis Ralston
cab4f2e402
Move stop button to the left of the waveform
...
Fixes https://github.com/vector-im/element-web/issues/18416
2021-08-06 09:00:18 -06:00
Dariusz Niemczyk
4328083ea7
Rename css
2021-08-06 16:31:04 +02:00
Germain
3153e11761
Merge pull request #6566 from SimonBrandner/task/export-layout
2021-08-06 14:45:54 +01:00
Michael Telatynski
381108a9c2
Merge pull request #6227 from SimonBrandner/feature/copy-version/17603
2021-08-06 12:56:38 +01:00
Dariusz Niemczyk
35386078a4
Post-merge changes
2021-08-06 13:25:27 +02:00
Dariusz Niemczyk
3b002c4c1f
Merge remote-tracking branch 'origin/develop' into jitsi-picture-in-picture
...
* origin/develop: (100 commits)
Add comments to isRegionalIndicator
Stop voice messages that are playing when starting a recording
Properly set style attribute on shared usercontent iframe
Fix in-call context menus when in PiP mode (#6552 )
Extract tooltipYOffset to a const
Increase yOffset by 4px away
i18n
Post-merge conflict resolution and improve alignment of tooltips
Fix image & blurhash info when skipping thumbnail due to thresholds
Skip sending a thumbnail if it is not a sufficient saving over the original
Null guard space inviter to prevent the app exploding
Remove seams from pin icon
Appease Jest
Fix worklet reference for new webpack pipeline
i18n
Update copy
Fix wrong cursor being used in PiP
Fix voice feed cut-off
Use flex-start as it has more universal support
Wrap cases in {}
...
2021-08-06 13:25:14 +02:00
Michael Telatynski
f7818e0169
iterate PR based on feedback
2021-08-06 12:05:14 +01:00
Michael Telatynski
64995dfae7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-06 11:39:24 +01:00
Šimon Brandner
6afd75ac3c
Update/fix licenses
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 10:40:26 +02:00
Šimon Brandner
25c6b216b0
Move LayoutSwitcher CSS to a separate file
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 10:37:42 +02:00
Šimon Brandner
3c0ac487da
Remove comment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 09:06:24 +02:00
Šimon Brandner
f57bffad3c
Soften border color
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 09:05:33 +02:00
Šimon Brandner
3677d0c5f2
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer
2021-08-06 08:02:28 +02:00
Šimon Brandner
4f0c800cad
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:45:17 +02:00
Travis Ralston
27d7daeceb
Merge pull request #6550 from SimonBrandner/fix/voice-cutoff
...
Fix voice feed being cut-off
2021-08-05 15:46:42 -06:00
Travis Ralston
9ad72d6daf
Merge pull request #6549 from SimonBrandner/fix/dont-use-start
...
Use `flex-start` instead of `start`
2021-08-05 15:46:12 -06:00
Travis Ralston
4dcf2c7038
Merge pull request #6498 from SimonBrandner/fix/screen-picker-sizing/18281
...
Fix sizing issues of the screen picker
2021-08-05 15:39:12 -06:00
Travis Ralston
280c017238
Merge pull request #6530 from matrix-org/travis/voice-messages/uploading
...
Improve voice messages uploading state
2021-08-05 08:36:53 -06:00
Travis Ralston
51bd740936
Merge pull request #6538 from matrix-org/travis/voice-messages/ui-polish-aug3-21
...
Polish up more of the voice messages UI
2021-08-05 08:34:31 -06:00
Šimon Brandner
443db125a9
Merge remote-tracking branch 'upstream/develop' into fix/replies-bubble/18184
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 14:36:55 +02:00
Šimon Brandner
efeae3a84c
Top align the avatar
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 13:39:39 +02:00
Šimon Brandner
5fa6ef83d2
Fix button alighnment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 12:35:44 +02:00
Šimon Brandner
9e4f5719a4
Handle narrow layouts
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 11:47:58 +02:00
Šimon Brandner
91b4b50969
Fix wrong cursor being used in PiP
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:25:12 +02:00
Šimon Brandner
e2bc76a129
Fix voice feed cut-off
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:17:21 +02:00
Šimon Brandner
fe643b2401
Use flex-start as it has more universal support
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:09:48 +02:00
Michael Telatynski
2d3211ccf6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-04 12:14:29 +01:00
Michael Telatynski
a6e5112be0
Offer a way to create a space based on existing community
2021-08-04 10:37:35 +01:00
Germain Souquet
b4b788e8d5
Fix right margin for events on IRC layout
...
Fixes vector-im/element-web#18354
2021-08-04 11:21:52 +02:00
Šimon Brandner
d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 09:21:45 +02:00
Travis Ralston
24da0291a0
Re-center recording LED
...
Fixes https://github.com/vector-im/element-web/issues/18375
2021-08-03 13:34:04 -06:00
Travis Ralston
7b565db02d
Update uploading state designs
2021-08-03 12:52:21 -06:00
Dariusz Niemczyk
3ab54bce6e
Move CallViewHeader css to separate file
2021-08-03 15:21:14 +02:00
James Salter
1b87ffb7cb
Merge pull request #6527 from SimonBrandner/fix/font-topic/18339
...
Fix the wrong font being used in the room topic field
2021-08-03 10:06:58 +01:00
Travis Ralston
c5d11a9f17
Improve voice messages uploading state
...
Fixes https://github.com/vector-im/element-web/issues/18226
Fixes https://github.com/vector-im/element-web/issues/18224
2021-08-02 23:29:46 -06:00
Jaiwanth
46e2f67f54
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-08-03 10:03:16 +05:30
David Baker
3ea0571c5f
Merge pull request #6486 from SimonBrandner/feature/muting
...
Show an avatar/a turned off microphone icon for muted users
2021-08-02 17:20:55 +01:00
Šimon Brandner
2dc13dedf0
Fix font
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 15:38:45 +02:00
Šimon Brandner
9ef70f027e
Make the version box smaller
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 11:36:53 +02:00
Šimon Brandner
44258fd278
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603
2021-08-02 11:32:57 +02:00
Andrew Morgan
442992b30e
Fix symbol entry in the in-call dialpad ( #6521 )
...
The field had RTL direction set on it, which meant symbols, like *,
appeared at the beginning of the field instead of the end.
RTL was introduced in
https://github.com/matrix-org/matrix-react-sdk/pull/5786 ,
however its removal seems to have had no adverse affects
from testing.
2021-08-02 10:18:17 +01:00
Travis Ralston
dd53324981
Merge pull request #6509 from matrix-org/travis/voice-messages/download-2
...
Improve download interactions
2021-07-30 10:50:27 -06:00
Jano Garcia
27e432df4b
Merge pull request #6513 from matrix-org/jano/fix-link-decoration
...
Fix inconsistent styling for links on hover
2021-07-30 14:08:15 +02:00
Michael Telatynski
42d6afd4b1
Merge pull request #6497 from matrix-org/t3chguy/fix/18093
2021-07-30 12:25:44 +01:00
janogarcia
adfbcdce40
Fix the inconsistent styling between non-markdown and markdown parsed links on hover.
...
It also improves accessibility by not relying exclusively on color for the hover state. That is even more evident for links that are contained within a parent block link (e.g., a quoted message block linking to the source message).
https://webaim.org/techniques/hypertext/link_text#underlining
2021-07-30 09:54:28 +02:00
Germain Souquet
11322b8999
Appease linter
2021-07-30 09:19:34 +02:00
Germain
375f7b670a
Merge branch 'develop' into gsouquet/fix-18144
2021-07-30 08:10:15 +01:00
Jaiwanth
17e9cf4d2a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-30 12:17:31 +05:30
Travis Ralston
fb89b45c06
Unify and improve download interactions
...
With help from Palid.
This does two major things:
1. Makes the tile part of a file body clickable to trigger a download.
2. Refactors a lot of the recyclable code out of the DownloadActionButton in favour of a utility. It's not a perfect refactoring, but it sets the stage for future work in the area (if needed).
The refactoring still has a heavy reliance on being supplied an iframe, but simplifies the DownloadActionButton and a hair of the MFileBody download code. In future, we'd probably want to make the iframe completely managed by the FileDownloader rather than have it only sometimes manage a hidden iframe.
2021-07-29 15:36:50 -06:00
Michael Telatynski
02dbdc5c0a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
...
Conflicts:
src/components/views/spaces/SpaceTreeLevel.tsx
src/dispatcher/actions.ts
src/i18n/strings/en_EN.json
2021-07-29 16:11:16 +01:00
Michael Telatynski
94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071
2021-07-29 15:57:26 +01:00
Michael Telatynski
3ee8f607c0
Switch dropdown out for radio interaction when leaving space
2021-07-29 15:50:18 +01:00
Michael Telatynski
493cd01ed3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
...
Conflicts:
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
src/utils/space.tsx
2021-07-29 15:22:52 +01:00
Michael Telatynski
efd8a2f9b0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/spaces/SpaceCreateMenu.tsx
src/i18n/strings/en_EN.json
2021-07-29 15:16:53 +01:00
Michael Telatynski
f69b4549dd
Re-add top border stroke in space create menu
2021-07-29 15:13:02 +01:00
Germain
dac3eda9e3
Merge pull request #6499 from matrix-org/gsouquet/fix-18195
...
Prevent timeline flickering on hover
2021-07-29 14:33:34 +01:00
Šimon Brandner
cb89dd408c
Use mic mute icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 15:05:26 +02:00
Michael Telatynski
ab56a16907
Merge pull request #6458 from matrix-org/t3chguy/fix/18091
2021-07-29 13:20:19 +01:00
Germain
3bd393f16b
Merge pull request #6501 from matrix-org/gsouquet/fix-18249
...
Restore pointer cursor for SenderProfile in message bubbles
2021-07-29 12:20:56 +01:00
Germain Souquet
6c68f779ec
Restore pointer cursor for SenderProfile in message bubbles
2021-07-29 11:58:32 +02:00
Germain Souquet
9c4101fa89
Align event list summary read receipts when using message bubbles
2021-07-29 11:48:22 +02:00
Germain Souquet
78a9117598
Prevent timeline flickering on hover
2021-07-29 11:12:07 +02:00
Germain Souquet
e140dd6ba1
Merge branch 'develop' into gsouquet/fix-18132
2021-07-29 10:27:00 +02:00
Germain Souquet
ee7f3c000d
Merge branch 'develop' into gsouquet/fix-18144
2021-07-29 10:04:47 +02:00
Šimon Brandner
f16b1d46b7
Fix sizing issue of the screen picker
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 20:58:24 +02:00
Michael Telatynski
ac800ad94d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
2021-07-28 19:24:26 +01:00
Michael Telatynski
40493634ae
Iterate PR
2021-07-28 19:23:33 +01:00
Michael Telatynski
5d9e421de0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
2021-07-28 17:58:34 +01:00
Michael Telatynski
a5606c72de
Update feedback prompt to match designs
2021-07-28 17:56:57 +01:00
Michael Telatynski
6123ccb2eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
2021-07-28 17:45:15 +01:00
Michael Telatynski
cdf0d98c3f
Fix IconizedContextMenuCheckbox layout
2021-07-28 17:39:02 +01:00
Michael Telatynski
07b9d6b30b
Fix styling of setting flag descriptions in preferences
...
and add description to spaces all/home setting
and make it an account setting rather than device one
and hide it from the Beta card
2021-07-28 14:39:19 +01:00