David Baker 1dbdbc163b Cancel 'join room' action if 'log in' is clicked ...

or 'choose different server'

We canceled the deferred action in the MatrixChat SetMxId dialog
but not the one in roomview.

Fixes https://github.com/vector-im/riot-web/issues/4217

2017-06-07 11:55:24 +01:00

..

login

Merge branch 'develop' into luke/ilag-i18n

2017-06-05 16:08:03 +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' into luke/ilag-i18n

2017-06-05 16:08:03 +01:00

MatrixChat.js

comment

2017-06-06 11:43:07 +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

Cancel 'join room' action if 'log in' is clicked

2017-06-07 11:55:24 +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

Merge branch 'develop' into new-guest-access

2017-06-06 10:33:01 +01:00