David Baker 9f15e8e152 Merge branch 'master' into develop

2017-06-06 17:41:05 +01:00

..

login

Add remaining strings for vector-im/riot-web#4151

2017-06-02 10:47:08 +01:00

ContextualMenu.js

…

CreateRoom.js

Bulk change counterpart imports

2017-05-25 11:39:08 +01:00

FilePanel.js

More i18n strings (#963)

2017-05-30 15:09:57 +01:00

InteractiveAuth.js

Just return the promise if it's a bg request

2017-03-22 11:25:33 +00:00

LoggedInView.js

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings

2017-06-01 22:56:31 +01:00

MatrixChat.js

Merge branch 'master' into develop

2017-06-06 17:41:05 +01:00

MessagePanel.js

don't lose date seperator when the first event of the new day is redacted

2017-06-02 04:39:44 +01:00

NotificationPanel.js

Bulk change counterpart imports

2017-05-25 11:39:08 +01:00

RoomStatusBar.js

Bulk change counterpart imports

2017-05-25 11:39:08 +01:00

RoomView.js

change aux order so room settings is top most, forwarding could go weird

2017-05-30 11:22:27 +01:00

ScrollPanel.js

Separate predicates for RM/RR

2017-05-09 17:36:19 +01:00

TimelinePanel.js

allow hiding redactions. no point onAccountData as it'd cause a full

2017-06-02 04:23:07 +01:00

UploadBar.js

Unregister the UploadBar event listener on unmount

2017-03-16 14:19:17 +00:00

UserSettings.js

quick and dirty override to disable MD globally

2017-06-05 21:38:25 +01:00