manuroe 33edeccb43 Merge branch 'develop' into push-rules-settings ...

# Conflicts:
#	src/component-index.js
#	src/components/views/rooms/RoomSettings.js

2016-01-18 18:00:41 +01:00

..

EventTile.js

update copyright for 2016

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

MemberInfo.js

reindent promises as per dave's PR feedback

2016-01-18 13:38:40 +00:00

MemberList.js

merge develop

2016-01-17 23:31:21 +00:00

MemberTile.js

merge develop

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

MessageComposer.js

Fix typo

2016-01-18 14:25:23 +00:00

PresenceLabel.js

Factor out presence text. Do prep work for displaying 3pid invites on memberlist.

2016-01-13 15:55:28 +00:00

RoomHeader.js

Merge branch 'develop' into matthew/roomsettings2

2016-01-18 10:49:45 +00:00

RoomList.js

update copyright for 2016

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

RoomPreviewBar.js

Add a RoomPreviewBar which asks if you'd like to join a peeked room

2016-01-12 14:11:15 +00:00

RoomSettings.js

Merge branch 'develop' into push-rules-settings

2016-01-18 18:00:41 +01:00

RoomTile.js

Make RoomAvatar use BaseAvatar

2016-01-15 16:13:25 +00:00

SearchResultTile.js

Address review comments

2016-01-06 16:46:29 +00:00

TabCompleteBar.js

apply CSS to slashcommand autocompletes

2016-01-14 16:29:49 +00:00