wmwragg 6a4d02ffc5 Merge branch 'develop' into wmwragg/direct-chat-sublist

2016-08-23 12:49:21 +01:00

..

login

Merge pull request #410 from matrix-org/rav/use_server_device_id

2016-08-12 11:40:55 +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

MatrixChat.js

defaultDeviceDisplayName should be a prop

2016-08-12 11:41:45 +01:00

MessagePanel.js

Updated the MessagePanel to now take account of /me messages when working out if an event is a continuation message or not

2016-08-18 22:15:53 +01:00

RoomStatusBar.js

reskindex and use sdk.getComponent for EmojiText

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

RoomView.js

Cancel calls to rate-limited funcs on unmount

2016-08-10 13:39:47 +01:00

ScrollPanel.js

Remove relayoutOnUpdate prop on gemini-scrollbar

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

TimelinePanel.js

many stupid thinkos and bugfixes; make it work

2016-07-20 12:03:13 +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