Matthew Hodgson 83209197f4 Merge branch 'develop' into matthew/notif-panel

2016-09-11 02:38:16 +01:00

..

login

Merge pull request #459 from VShell/fix-cas

2016-09-09 21:19:19 +01:00

ContextualMenu.js

Bugifx: 'background-color' in react should be 'backgroundColor'

2016-08-11 17:34:05 +01:00

CreateRoom.js

CreateRoom: remove reference to encryption module

2016-06-23 14:08:45 +01:00

FilePanel.js

layout for file & notif panel

2016-09-11 02:14:27 +01:00

MatrixChat.js

Merge branch 'develop' into wmwragg/one-to-one-chat

2016-09-07 17:22:10 +01:00

MessagePanel.js

layout for file & notif panel

2016-09-11 02:14:27 +01:00

NotificationPanel.js

layout for file & notif panel

2016-09-11 02:14:27 +01:00

RoomStatusBar.js

reskindex and use sdk.getComponent for EmojiText

2016-08-11 07:55:12 +05:30

RoomView.js

null checks on room in onRoomTimeline

2016-09-09 02:09:12 +01:00

ScrollPanel.js

Remove relayoutOnUpdate prop on gemini-scrollbar

2016-07-27 11:35:48 +01:00

TimelinePanel.js

layout for file & notif panel

2016-09-11 02:14:27 +01:00

UploadBar.js

fix testing UI hack

2016-04-14 19:11:20 +01:00

UserSettings.js

Merge pull request #393 from matrix-org/dbkr/enable_labs

2016-08-05 17:25:25 +01:00