Michael Telatynski 8e1db84bee Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-focus-steal		2017-05-27 14:29:06 +01:00
..
login	Merge remote-tracking branch 'origin/develop' into dbkr/translations	2017-05-26 18:15:32 +01:00
ContextualMenu.js	Fix a bunch of linting errors	2017-01-20 14:22:27 +00:00
CreateRoom.js	Bulk change counterpart imports	2017-05-25 11:39:08 +01:00
FilePanel.js	Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801	2017-05-23 15:16:31 +01:00
InteractiveAuth.js	Just return the promise if it's a bg request	2017-03-22 11:25:33 +00:00
LoggedInView.js	Revert "Merge pull request #765 from t3chguy/t3chguy/escape-closes-user-settings"	2017-05-16 16:12:57 +01:00
MatrixChat.js	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-focus-steal	2017-05-27 14:29:06 +01:00
MessagePanel.js	actually wire up alwaysShowTimestamps	2017-05-27 00:14:16 +01:00
NotificationPanel.js	Bulk change counterpart imports	2017-05-25 11:39:08 +01:00
RoomStatusBar.js	Bulk change counterpart imports	2017-05-25 11:39:08 +01:00
RoomView.js	Remove messages with HTML formatting	2017-05-25 20:04:28 +01:00
ScrollPanel.js	Separate predicates for RM/RR	2017-05-09 17:36:19 +01:00
TimelinePanel.js	actually wire up alwaysShowTimestamps	2017-05-27 00:14:16 +01:00
UploadBar.js	Unregister the UploadBar event listener on unmount	2017-03-16 14:19:17 +00:00
UserSettings.js	Translate Add Threepid labels	2017-05-26 18:03:24 +01:00