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

Conflicts:
	src/component-index.js

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

..

avatars

*Avatar: Calculate thumbnail dimensions based on devicePixelRatio

2017-04-27 12:38:03 +02:00

create_room

Fix a bunch of linting errors

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

dialogs

Merge branch 'develop' into new-guest-access

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

elements

Fix Create Room button

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

login

Remove empty line

2017-04-25 11:57:03 +01:00

messages

Pass file name (as name) to the ImageView modal

2017-04-17 14:50:34 +01:00

room_settings

fix a bunch of dark-theme buttons

2017-01-20 21:00:22 +00:00

rooms

fixes vector-im/riot-web#3881

2017-05-10 15:16:49 +01:00

settings

Improve country dropdown UX and expose +prefix

2017-04-25 11:21:47 +01:00

voip

Fix a bunch of linting errors

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