Richard van der Hoff e01d61dfeb Merge branch 'rav/timeline_window' into rav/link_to_event ...

Conflicts:
	src/components/structures/MatrixChat.js
	src/components/structures/ScrollPanel.js

2016-02-03 14:12:28 +00:00

..

login

Don't show a spinner while we're waiting for the user to do something

2016-01-27 15:44:12 +00:00

CreateRoom.js

use getDomain()

2016-01-13 18:15:59 +00:00

MatrixChat.js

Merge branch 'rav/timeline_window' into rav/link_to_event

2016-02-03 14:12:28 +00:00

RoomView.js

Merge branch 'rav/timeline_window' into rav/link_to_event

2016-02-03 14:12:28 +00:00

ScrollPanel.js

Address review comments

2016-02-03 08:03:10 +00:00

UploadBar.js

Only show uploads that are going to the current room

2016-01-14 16:31:42 +00:00

UserSettings.js

Disable upgrade registration temporarily. Fixes https://github.com/vector-im/vector-web/issues/818.

2016-02-02 14:14:18 +00:00