Michael Telatynski f5519c21b9 Merge branches 'develop' and 't3chguy/hide_empty_sublist' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide_empty_sublist ...

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json

2018-06-26 07:51:16 +01:00

..

login

generate local errors for blank fields during login

2018-06-23 17:12:00 +01:00

BottomLeftMenu.js

point imports at the new locations

2018-04-13 00:43:44 +01:00

CompatibilityPage.js

point imports at the new locations

2018-04-13 00:43:44 +01:00

ContextualMenu.js

add XXX comment

2018-06-22 19:23:39 +01:00

CreateRoom.js

Remove use of deprecated React.PropTypes

2017-12-26 14:03:18 +13:00

FilePanel.js

given we also want to hide widget events, hide all except m.room.message

2018-06-16 19:52:15 +01:00

GroupView.js

Merge pull request #1973 from matrix-org/t3chguy/fix_react_proptypes_warnings

2018-06-18 10:47:20 +01:00

HomePage.js

displayName should be tracked as static

2018-04-18 16:19:37 +01:00

InteractiveAuth.js

Remove use of deprecated React.PropTypes

2017-12-26 14:03:18 +13:00

LeftPanel.js

Merge branch 'develop' into t3chguy/ctrl-k_tab

2018-06-18 18:01:41 +01:00

LoggedInView.js

Fix click on faded left/right/middle panel -> close settings

2018-05-29 13:16:39 +01:00

LoginBox.js

point imports at the new locations

2018-04-13 00:43:44 +01:00

MatrixChat.js

Merge pull request #1949 from matrix-org/luke/track-uisis-piwik

2018-06-18 10:12:26 +01:00

MessagePanel.js

delint

2018-06-16 09:48:57 +01:00

MyGroups.js

specify unique key to make react happy

2018-06-15 18:55:37 +01:00

NotificationPanel.js

Dramatically simplify use of mx_fadable

2017-10-25 15:15:49 +01:00

RightPanel.js

Refactor GroupStores into one global GroupStore

2018-05-01 11:24:17 +01:00

RoomDirectory.js

point imports at the new locations

2018-04-13 00:43:44 +01:00

RoomStatusBar.js

focus composer after interacting with e2ee statusbar/udd

2018-06-23 16:40:27 +01:00

RoomSubList.js

give Historical an emptyContent to make it look more consistent

2018-06-26 07:46:33 +01:00

RoomView.js

Merge pull request #2001 from matrix-org/t3chguy/default_url_previews_off_e2ee

2018-06-25 11:50:14 +01:00

ScrollPanel.js

Make sure to proxy special prop ref

2018-03-27 13:04:26 +01:00

SearchBox.js

point imports at the new locations

2018-04-13 00:43:44 +01:00

TagPanel.js

change cursor:pointer iff clicking TagPanel background does something

2018-06-14 11:42:21 +01:00

TimelinePanel.js

Improve room list performance when receiving messages

2018-03-14 14:29:55 +00:00

UploadBar.js

Remove use of deprecated React.PropTypes

2017-12-26 14:03:18 +13:00

UserSettings.js

fix a way to get stuck in set password/email flow

2018-06-18 18:14:48 +01:00

ViewSource.js

move non-Riot-specific components over from riot-web

2018-04-11 23:58:04 +01:00