David Baker ffe892b4b1 Merge remote-tracking branch 'origin/develop' into dbkr/scalar

2016-05-17 10:30:32 +01:00

..

login

Fix password resetting

2016-04-07 12:59:30 +01:00

CreateRoom.js

Pass SimpleRoomHeader title in as a named property

2016-03-29 23:21:17 +01:00

MatrixChat.js

Add suport for showing the scalar UI

2016-05-06 14:19:56 +01:00

MessagePanel.js

Avoid rerendering during Room unmount

2016-04-22 17:06:53 +01:00

RoomStatusBar.js

Prettier, animated placeholder :D

2016-03-28 19:39:36 +05:30

RoomView.js

Whitespace fixes

2016-04-22 17:05:48 +01:00

ScrollPanel.js

Don't relayout scrollpanels every time something changes

2016-04-20 12:25:19 +01:00

TimelinePanel.js

Reduce timeline limit to 250 events

2016-04-22 11:08:39 +01:00

UploadBar.js

fix testing UI hack

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

UserSettings.js

Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs

2016-04-21 10:12:27 +01:00