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
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
6b4f63df2a
Merge pull request #6184 from matrix-org/t3chguy/rs/5566
2021-06-14 23:27:51 +01: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
f8eea2ae23
Fix word wrap in space descriptions
2021-06-14 22:18:02 +01:00
66fce64ee0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
...
Conflicts:
package.json
yarn.lock
2021-06-14 21:39:06 +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
801b5f9c1a
Merge pull request #6155 from matrix-org/t3chguy/spacesteammatewarning
...
Add warning to private space creation flow
2021-06-07 22:21:07 +01: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
a895b083a2
Fix notif panel timestamp padding
...
This restores some space around the timestamp in the notif panel. We were
previously relying somewhat randomly on the presence on empty flair elements to
create space.
Fixes https://github.com/vector-im/element-web/issues/17580
2021-06-07 16:21:53 +01:00
Šimon Brandner