94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071
2021-07-29 15:57:26 +01:00
3ee8f607c0
Switch dropdown out for radio interaction when leaving space
2021-07-29 15:50:18 +01:00
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
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
40493634ae
Iterate PR
2021-07-28 19:23:33 +01:00
5d9e421de0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
2021-07-28 17:58:34 +01:00
6123ccb2eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
2021-07-28 17:45:15 +01:00
9707797d45
Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163
...
Don't set `font-family` explicitly
2021-07-27 11:04:23 -06:00
39d9ec3ced
Merge branch 'develop' into t3chguy/fix/18071
2021-07-27 15:02:59 +01:00
2114e854f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
2021-07-26 12:36:00 +01:00
b89434fcbc
avoid abusing spans because you're too lazy to give things a class
2021-07-23 16:03:15 +01:00
7ccc429bea
Change spaces beta feedback to not be so beta-centric
2021-07-23 15:47:11 +01:00
358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686
2021-07-23 09:09:17 +01:00
010baabfe6
Improve subspaces and some utilities around room/space creation
2021-07-23 08:46:20 +01:00
8a9d89ae85
Fix event tile cut off in share preview
2021-07-22 15:05:44 +02: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
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
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
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
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
0cee0db9df
Fix icon size in passphrase prompt
2021-07-02 20:38:07 +01:00
e8f0412fe3
Add way to manage Restricted join rule in Room Settings
2021-07-02 14:51:55 +01:00
56514d51a6
Fix tiny scrollbar dot on chrome/electron in Forward Dialog
2021-06-28 15:37:28 +01: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
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
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
384bb3af2e
Fix layout regression in the invite dialog for few results
2021-06-16 10:37:34 +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
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
15132074e2
Restore copy button icon when sharing permalink
2021-06-09 13:44:31 +01: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
90bb7c1482
Switch Space Settings for a tabbed view with a bunch more settings exposed
2021-06-08 16:33:47 +01: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
e891d18fa2
Add my email to my copyright notices
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-05 21:41:28 -04:00
0c97d90fb9
Iterate PR based on feedback
2021-06-03 16:44:28 +01:00
8efbdd0406
Match forward dialog send failed indicator color with button
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-01 17:56:46 -04:00
caaef63077
delint1
2021-05-28 13:11:48 +01:00
36e43270ca
Apply suggestions from code review
2021-05-28 13:08:05 +01:00
e41645795c
Merge branch 't3chguy/fix/17365' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
2021-05-28 13:05:41 +01:00
ea26393709
Styling amends to accommodate the invite dialog footer
2021-05-28 13:00:18 +01:00
2c750fcb7a
Fix overflow issue in suggestion tiles
2021-05-28 12:48:12 +01:00
f75fb3b349
Add footer and privacy note to the start dm dialog
2021-05-27 15:51:25 +01:00
Michael Telatynski