Jaiwanth
7207329c15
Apply review suggestions
2021-08-13 23:44:07 +05:30
Jaiwanth
e88edba650
Merge branch 'develop' into export-conversations
2021-08-12 17:10:13 +05:30
Michael Telatynski
9d3569a577
Iterate PR based on feedback
2021-08-12 10:58:56 +01:00
Michael Telatynski
54d85a3864
Iterate PR based on feedback
2021-08-11 16:32:48 +01:00
Michael Telatynski
f7818e0169
iterate PR based on feedback
2021-08-06 12:05:14 +01:00
Michael Telatynski
a6e5112be0
Offer a way to create a space based on existing community
2021-08-04 10:37:35 +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
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
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
6123ccb2eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
2021-07-28 17:45:15 +01:00
Travis Ralston
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
Michael Telatynski
39d9ec3ced
Merge branch 'develop' into t3chguy/fix/18071
2021-07-27 15:02:59 +01:00
Jaiwanth
b91309be82
Apply suggestions from review
2021-07-26 23:40:27 +05:30
Michael Telatynski
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
Jaiwanth
06d84a16d0
Delint
2021-07-26 12:58:17 +05:30
Jaiwanth
30a64a1b5a
Gray out and hide some options during export
2021-07-26 12:41:36 +05:30
Jaiwanth
b04bfeda33
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-07-26 00:18:56 +05:30
Jaiwanth
3d4d1d32d9
Modify design according to the design team
2021-07-26 00:09:59 +05:30
Michael Telatynski
b89434fcbc
avoid abusing spans because you're too lazy to give things a class
2021-07-23 16:03:15 +01:00
Michael Telatynski
7ccc429bea
Change spaces beta feedback to not be so beta-centric
2021-07-23 15:47:11 +01:00
Michael Telatynski
358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686
2021-07-23 09:09:17 +01:00
Michael Telatynski
010baabfe6
Improve subspaces and some utilities around room/space creation
2021-07-23 08:46:20 +01:00
Germain Souquet
8a9d89ae85
Fix event tile cut off in share preview
2021-07-22 15:05:44 +02:00
Michael Telatynski
d147aaa984
delint and fix min-height issue
2021-07-21 11:27:36 +01:00
Michael Telatynski
fd64d37305
Add iconography to Create Room Dialog dropdown
...
Remove unused old stale feather-customised/globe.svg
2021-07-21 11:20:41 +01:00
Michael Telatynski
880dc26847
don't force height if the height can't change (no children edge)
2021-07-21 10:39:04 +01:00
Michael Telatynski
1b2d70d816
Prompt user to leave rooms/subspaces in a space when leaving space
2021-07-21 09:57:10 +01:00
Jaiwanth
fe2cac56f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-19 12:57:27 +05:30
Michael Telatynski
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
Andrew Morgan
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
Jaiwanth
6a4e2672f6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-10 19:18:01 +05:30
Michael Telatynski
eb9f4c609a
Make CreateRoomDialog capable of creating restricted rooms in spaces
2021-07-06 10:10:47 +01:00
Michael Telatynski
c5ca98a3ad
Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog
2021-07-06 10:10:25 +01:00
Michael Telatynski
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
David Baker
0cee0db9df
Fix icon size in passphrase prompt
2021-07-02 20:38:07 +01:00
Michael Telatynski
e8f0412fe3
Add way to manage Restricted join rule in Room Settings
2021-07-02 14:51:55 +01:00
Jaiwanth
637e3afa48
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-29 11:31:30 +05:30
Jaiwanth
025a7eb9a5
Iterate PR
2021-06-29 10:36:24 +05:30
Michael Telatynski
56514d51a6
Fix tiny scrollbar dot on chrome/electron in Forward Dialog
2021-06-28 15:37:28 +01:00
Jaiwanth
e505646f21
Finish dialog implementation of export settings
2021-06-26 21:54:10 +05:30
Šimon Brandner
ffc6f96d45
Remove explicitly set font-family
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-26 09:12:45 +02:00
Šimon Brandner
fbe3eb7726
Remove unused class
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-26 09:00:42 +02:00
Michael Telatynski
6d3e7730ef
Fix two PRs duplicating the css attribute
2021-06-24 11:40:49 +01:00
Michael Telatynski
71414904fc
Merge pull request #6201 from matrix-org/t3chguy/fix/15051
2021-06-24 11:20:12 +01:00
Michael Telatynski
26d8c4d2e6
Improve design of the multi inviter error dialog
2021-06-24 10:03:32 +01:00
Michael Telatynski
0e2f617d94
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051
2021-06-24 09:33:39 +01:00
