Stefan Parviainen 53e983f9c7 Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>		2017-10-25 18:19:27 +02:00
..
login	Departify sending emails and text messages	2017-10-13 20:44:01 +02:00
ContextualMenu.js	Run eslint --fix	2017-10-11 17:56:17 +01:00
CreateRoom.js	Run eslint --fix	2017-10-11 17:56:17 +01:00
FilePanel.js	Dramatically simplify use of mx_fadable	2017-10-25 15:15:49 +01:00
GroupView.js	Merge pull request #1535 from matrix-org/luke/fix-interactable-greyed-ui	2017-10-25 15:47:18 +01:00
InteractiveAuth.js	Run eslint --fix	2017-10-11 17:56:17 +01:00
LoggedInView.js	Swap from ui_opacity to panel_disabled	2017-10-25 11:23:51 +01:00
MatrixChat.js	Swap from ui_opacity to panel_disabled	2017-10-25 11:23:51 +01:00
MessagePanel.js	Merge pull request #1535 from matrix-org/luke/fix-interactable-greyed-ui	2017-10-25 15:47:18 +01:00
MyGroups.js	Adjust wording on placeholder	2017-10-20 18:10:14 +01:00
NotificationPanel.js	Dramatically simplify use of mx_fadable	2017-10-25 15:15:49 +01:00
RoomStatusBar.js	Suggest to invite people when speaking in an empty room	2017-10-11 21:15:00 -06:00
RoomView.js	Dramatically simplify use of mx_fadable	2017-10-25 15:15:49 +01:00
ScrollPanel.js	Modify GroupView UI	2017-10-13 16:46:33 +01:00
TimelinePanel.js	Dramatically simplify use of mx_fadable	2017-10-25 15:15:49 +01:00
UploadBar.js	Run eslint --fix	2017-10-11 17:56:17 +01:00
UserSettings.js	Swap from ui_opacity to panel_disabled	2017-10-25 11:23:51 +01:00