element-portable/src/components/views/rooms
Michael Telatynski c77807bd22
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json
#	src/i18n/strings/eu.json
#	src/i18n/strings/fr.json
#	src/i18n/strings/lv.json
#	src/i18n/strings/ru.json
#	src/i18n/strings/zh_Hant.json
2018-04-12 09:48:06 +01:00
..
AppsDrawer.js Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot 2018-02-23 15:37:33 +00:00
Autocomplete.js Merge branch 'develop' into travis/granular-settings 2017-11-03 22:00:07 -06:00
AuxPanel.js Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot 2018-02-23 15:37:33 +00:00
EntityTile.js Option to remove the presence feature by HS 2018-03-19 16:47:12 +00:00
EventTile.js Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-04-12 09:48:06 +01:00
ForwardMessage.js Remove use of deprecated React.PropTypes 2017-12-26 14:03:18 +13:00
LinkPreviewWidget.js Remove use of deprecated React.PropTypes 2017-12-26 14:03:18 +13:00
MemberDeviceInfo.js Remove use of deprecated React.PropTypes 2017-12-26 14:03:18 +13:00
MemberInfo.js Wrap GeminiScrollbar in a component, enabled forceGemini 2018-03-27 13:04:26 +01:00
MemberList.js Wrap GeminiScrollbar in a component, enabled forceGemini 2018-03-27 13:04:26 +01:00
MemberTile.js Option to remove the presence feature by HS 2018-03-19 16:47:12 +00:00
MessageComposer.js Add warning to Upload Confirm prompt if replying, as can't reply with file 2018-04-04 11:19:13 +01:00
MessageComposerInput.js only clear reply_to_event if there was one to begin with 2018-04-07 12:18:53 +01:00
PinnedEventsPanel.js Remove use of deprecated React.PropTypes 2017-12-26 14:03:18 +13:00
PinnedEventTile.js Remove use of deprecated React.PropTypes 2017-12-26 14:03:18 +13:00
PresenceLabel.js Remove use of deprecated React.PropTypes 2017-12-26 14:03:18 +13:00
ReadReceiptMarker.js Indenting fix 2018-03-26 13:33:47 +01:00
ReplyPreview.js s/quote_event/reply_to_event/ 2018-02-19 23:41:07 +00:00
RoomDetailList.js make RoomDetailRow reusable for the Room Directory 2017-11-19 12:49:26 +00:00
RoomDetailRow.js init Linkify properly to make tests happy 2017-11-19 13:24:18 +00:00
RoomHeader.js Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot 2018-02-23 15:37:33 +00:00
RoomList.js Make sure to proxy special prop ref 2018-03-27 13:04:26 +01:00
RoomNameEditor.js Store component state for editors 2018-02-13 12:01:36 +00:00
RoomPreviewBar.js Remove use of deprecated React.PropTypes 2017-12-26 14:03:18 +13:00
RoomSettings.js Fix missing space between "...is a" and user ID 2018-03-08 16:34:19 +00:00
RoomTile.js Fix room tile badge not disappearing when receiving a read receipt 2018-03-20 17:19:49 +00:00
RoomTopicEditor.js Store component state for editors 2018-02-13 12:01:36 +00:00
SearchableEntityList.js Wrap GeminiScrollbar in a component, enabled forceGemini 2018-03-27 13:04:26 +01:00
SearchResultTile.js Remove use of deprecated React.PropTypes 2017-12-26 14:03:18 +13:00
SimpleRoomHeader.js Remove use of deprecated React.PropTypes 2017-12-26 14:03:18 +13:00
Stickerpicker.js Remove left and right menu padding 2018-04-04 13:38:48 +01:00
TopUnreadMessagesBar.js TopUnreadMessagesBar: turn clickables into accessible buttons and fix 2018-03-31 17:42:10 +02:00
UserTile.js Remove use of deprecated React.PropTypes 2017-12-26 14:03:18 +13:00