Richard van der Hoff 8be3862e68 Merge branch 'master' into develop		2017-11-28 10:29:40 +00:00
..
login	Merge branch 'master' into develop	2017-11-28 10:29:40 +00:00
ContextualMenu.js	Support more positioning options on context menus	2017-10-14 21:43:47 -06:00
CreateRoom.js	Run eslint --fix	2017-10-11 17:56:17 +01:00
FilePanel.js	Refactor i18n stuff a bit	2017-11-13 20:19:33 +01:00
GroupView.js	Pass plain components, rather than functions returning them	2017-11-14 20:09:52 +01:00
InteractiveAuth.js	Run eslint --fix	2017-10-11 17:56:17 +01:00
LoggedInView.js	Merge branch 'develop' into travis/granular-settings	2017-11-07 14:55:12 -07:00
MatrixChat.js	Pull the theme through the default process	2017-11-16 20:52:12 -07:00
MessagePanel.js	Convert synced settings to granular settings	2017-10-29 01:43:52 -06:00
MyGroups.js	Refactor i18n stuff a bit	2017-11-13 20:19:33 +01:00
NotificationPanel.js	Dramatically simplify use of mx_fadable	2017-10-25 15:15:49 +01:00
RoomStatusBar.js	Refactor i18n stuff a bit	2017-11-13 20:19:33 +01:00
RoomView.js	Run linting --fix	2017-11-16 13:19:36 +00:00
ScrollPanel.js	Run linting --fix	2017-11-16 13:19:36 +00:00
TimelinePanel.js	Run linting --fix	2017-11-16 13:19:36 +00:00
UploadBar.js	Run eslint --fix	2017-10-11 17:56:17 +01:00
UserSettings.js	Merge remote-tracking branch 'origin/master' into develop	2017-11-17 17:48:42 +00:00