Merge branch 'develop' into gsouquet/fix-backdrop-filter
This commit is contained in:
commit
36ba65b534
137 changed files with 1121 additions and 924 deletions
|
@ -220,6 +220,7 @@ const SpaceCreateMenu = ({ onFinished }) => {
|
|||
value={alias}
|
||||
placeholder={name ? nameToAlias(name, domain) : _t("e.g. my-space")}
|
||||
label={_t("Address")}
|
||||
disabled={busy}
|
||||
/>
|
||||
: null
|
||||
}
|
||||
|
|
|
@ -96,7 +96,7 @@ const SpaceSettingsGeneralTab = ({ matrixClient: cli, space, onFinished }: IProp
|
|||
|
||||
{ error && <div className="mx_SpaceRoomView_errorText">{ error }</div> }
|
||||
|
||||
<SpaceFeedbackPrompt onClick={() => onFinished(false)} />
|
||||
<SpaceFeedbackPrompt />
|
||||
|
||||
<div className="mx_SettingsTab_section">
|
||||
<SpaceBasicSettings
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue