Matthew Hodgson a0bbe3a306 Merge branch 'develop' into matthew/postcss

2017-01-18 12:52:59 +00:00

..

avatars

Add read receipt times to the hovertip of read markers

2016-12-08 16:23:20 +00:00

create_room

update copyright for 2016

2016-01-07 04:06:52 +00:00

dialogs

spell out email invites better

2017-01-12 13:46:19 +00:00

elements

Use getStateKey instead of getSender

2017-01-11 17:03:14 +00:00

login

Implement simple team-based registration (#620)

2017-01-18 12:48:28 +01:00

messages

Fix scroll jumping when a video is decrypted

2016-12-20 12:33:07 +00:00

room_settings

fix race between setting canonical alias and creating aliases

2016-09-16 18:01:14 +01:00

rooms

switch to using <span/> for edit button

2017-01-17 14:11:15 +00:00

settings

Interactive auth for device delete

2016-10-12 08:23:08 +01:00

voip

Added incomingCallBox to header and removed from roomTile

2016-09-15 14:39:34 +01:00