David Baker 74b443f0d3 Merge remote-tracking branch 'origin/develop' into aviraldg-babelrc

2016-10-13 09:49:26 +01:00

..

avatars

add debugging to MemberAvatar to try to kick jenkins...

2016-08-27 01:18:48 +01:00

create_room

update copyright for 2016

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

dialogs

InteractiveAuthDialog

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

elements

Move 'show join button' functionality out

2016-09-29 15:05:15 +01:00

login

Merge pull request #516 from matrix-org/rav/interactive_auth_dialog

2016-10-12 18:27:23 +01:00

messages

more s/Vector/Riot/

2016-10-03 10:18:43 +01:00

room_settings

fix race between setting canonical alias and creating aliases

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

rooms

Merge branch 'babelrc' of https://github.com/aviraldg/matrix-react-sdk into aviraldg-babelrc

2016-10-12 14:03:21 +01: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