Luke Barnard acde1f3db7 Merge branch 'develop' into luke/rts-welcome-pages ... Conflicts: src/components/views/avatars/BaseAvatar.js		2017-02-01 17:22:45 +00:00
..
login	Merge pull request #662 from matrix-org/luke/rts-handle-errors	2017-02-01 11:44:04 +00:00
ContextualMenu.js	Fix a bunch of linting errors	2017-01-20 14:22:27 +00:00
CreateRoom.js	Fix a bunch of linting errors	2017-01-20 14:22:27 +00:00
FilePanel.js	Fix a bunch of linting errors	2017-01-20 14:22:27 +00:00
LoggedInView.js	Merge branch 'develop' into luke/rts-welcome-pages	2017-02-01 17:22:45 +00:00
MatrixChat.js	Merge branch 'develop' into luke/rts-welcome-pages	2017-02-01 17:22:45 +00:00
MessagePanel.js	Merge branch 'develop' into luke/fix-join-part-collapsing-causality	2017-01-24 14:22:18 +00:00
NotificationPanel.js	layout for file & notif panel	2016-09-11 02:14:27 +01:00
RoomStatusBar.js	Fix linting warnings	2017-01-24 17:18:56 +00:00
RoomView.js	Expand status *area* unless status *bar* not visible (#655)	2017-01-26 18:07:42 +00:00
ScrollPanel.js	Make tests pass on Chrome again	2017-01-31 22:40:53 +00:00
TimelinePanel.js	Fix a bunch of linting errors	2017-01-20 14:22:27 +00:00
UploadBar.js	Fix a bunch of linting errors	2017-01-20 14:22:27 +00:00
UserSettings.js	Allow base referral URL to be configurable	2017-01-31 15:17:43 +00:00