Michael Telatynski 8967871b23 Merge branches 'develop' and 't3chguy/pl_control_e2e' of github.com:matrix-org/matrix-react-sdk into t3chguy/pl_control_e2e ... Conflicts: src/components/views/settings/tabs/room/RolesRoomSettingsTab.js src/i18n/strings/en_EN.json		2019-08-30 10:56:47 +01:00
..
account	Fix up remove threepid confirmation UX	2019-08-19 15:37:12 +01:00
discovery	Unused variables / imports	2019-08-15 12:07:59 +01:00
tabs	Merge branches 'develop' and 't3chguy/pl_control_e2e' of github.com:matrix-org/matrix-react-sdk into t3chguy/pl_control_e2e	2019-08-30 10:56:47 +01:00
ChangeAvatar.js	Remove use of deprecated React.PropTypes	2017-12-26 14:03:18 +13:00
ChangeDisplayName.js	delint	2018-06-19 07:57:28 +01:00
ChangePassword.js	Convert uncontrolled Field usages to controlled	2019-03-12 16:17:21 +00:00
DevicesPanel.js	Clarify that device names are publicly visible	2019-08-19 18:09:37 +01:00
DevicesPanelEntry.js	Refactor DateUtils to ES6	2018-01-10 12:00:11 +00:00
EnableNotificationsButton.js	Run eslint --fix	2017-10-11 17:56:17 +01:00
IntegrationsManager.js	Support multiple integration managers behind a labs flag	2019-08-23 09:12:40 -06:00
KeyBackupPanel.js	Move checkmark to the front of key backup message	2019-05-22 15:19:42 +01:00
Notifications.js	Merge pull request #2798 from matrix-org/travis/tombstone-notif	2019-05-02 09:47:41 -06:00
ProfileSettings.js	Add utm_campaign to the hosting links	2019-03-05 16:42:22 +00:00
SetIdServer.js	Allow connecting to an IS from address picker	2019-08-29 15:28:34 +01:00
SetIntegrationManager.js	Touch up settings: alignment, spacing, error states	2019-08-20 13:20:07 -06:00