imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases

Browse source
This commit is contained in:
David Baker 2020-06-02 18:53:54 +01:00
commit b83ecb1781
102 changed files with 2240 additions and 1410 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
View file

@ -199,7 +199,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
type: 'm.id.user',
user: MatrixClientPeg.get().getUserId(),
},
// https://github.com/matrix-org/synapse/issues/5665
// TODO: Remove `user` once servers support proper UIA
// See https://github.com/matrix-org/synapse/issues/5665
user: MatrixClientPeg.get().getUserId(),
password: this.state.accountPassword,
});