Luke Barnard 5151264f60 Merge branch 'develop' into new-guest-access ...

Conflicts:
	src/component-index.js

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

..

login

Validate phone number on login

2017-05-02 18:30:46 +01:00

ContextualMenu.js

Fix a bunch of linting errors

2017-01-20 14:22:27 +00:00

CreateRoom.js

Fix a bunch of linting errors

2017-01-20 14:22:27 +00:00

FilePanel.js

show placeholder of timeline empty

2017-02-02 16:32:10 +00:00

InteractiveAuth.js

Just return the promise if it's a bg request

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

LoggedInView.js

Show password nag bar when user is PWLU

2017-05-05 16:31:33 +01:00

MatrixChat.js

Merge branch 'develop' into new-guest-access

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

MessagePanel.js

Combine data-scroll-token and -contained-scroll-tokens

2017-05-04 10:00:13 +01:00

NotificationPanel.js

show placeholder of timeline empty

2017-02-02 16:32:10 +00:00

RoomStatusBar.js

consolidate call onPageUnload handler into RoomView

2017-05-03 16:39:19 +01:00

RoomView.js

Merge branch 'develop' into new-guest-access

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

ScrollPanel.js

Typo

2017-05-04 13:03:04 +01:00

TimelinePanel.js

Fix the spinner to actually appear

2017-05-05 10:48:54 +01:00

UploadBar.js

Unregister the UploadBar event listener on unmount

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

UserSettings.js

Improve regex to ignore trailing -dirty and for rc tags

2017-05-04 16:22:39 +01:00