Jorik SchellekensandGitHub 15881fc7d0 Merge branch 'develop' into joriks/font-scaling-message-preview

2020-06-18 15:19:28 +01:00

..

AppearanceUserSettingsTab.tsx

Merge branch 'develop' into joriks/font-scaling-message-preview

2020-06-18 15:19:28 +01:00

FlairUserSettingsTab.js

Fix import merge conflicts, removing any that aren't needed anymore

2020-01-09 14:17:33 -07:00

GeneralUserSettingsTab.js

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider

2020-05-20 13:46:17 +01:00

HelpUserSettingsTab.js

Give contextual feedback for manual update check instead of banner

2020-05-29 18:24:45 +01:00

LabsUserSettingsTab.js

Remove labs option to cache 'passphrase'

2020-06-18 10:42:33 +01:00

MjolnirUserSettingsTab.js

s/alias/address/ in copy

2020-04-14 10:06:57 +01:00

NotificationUserSettingsTab.js

Convert imports to ES6 from CommonJS

2019-12-22 21:16:06 -07:00

PreferencesUserSettingsTab.js

Use componentDidMount in place of componentWillMount where possible

2020-03-31 14:14:17 -06:00

SecurityUserSettingsTab.js

Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault

2020-06-03 10:51:17 +01:00

VoiceUserSettingsTab.js

Field: make id optional, generate one if not provided

2020-03-29 22:59:15 +01:00