Bruno Windels 33925b2fd1 fix after merge conflict error

2018-10-26 15:57:57 +02:00

..

login

Communicate early that a 3pid is required during registration if needed

2018-09-27 11:53:45 -06: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

fix lint

2018-10-24 14:36:08 +02: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

Split long string over two lines

2018-10-23 17:20:57 -05: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

fix after merge conflict error

2018-10-26 15:57:57 +02:00

LoggedInView.js

dont cause rerender with anon func

2018-10-19 15:22:28 +02:00

LoginBox.js

Move the login box from the left sidebar to where the composer is

2018-10-15 14:26:24 -06:00

MatrixChat.js

Merge pull request #2237 from aaronraimist/camel-case

2018-10-22 22:44:14 -06:00

MessagePanel.js

allow read receipts without an existing member in MessagePanel

2018-10-10 16:15:20 +02: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

fix lint

2018-10-24 14:36:08 +02:00

RoomDirectory.js

Replace view_set_mxid with require_registration

2018-09-05 18:08:49 +01:00

RoomStatusBar.js

Don't show the invite nag bar when peeking

2018-10-15 14:35:36 -06:00

RoomSubList.js

Merge pull request #2234 from matrix-org/bwindels/roomsectionfixcollapsedsize

2018-10-24 12:23:05 +00:00

RoomView.js

Oh right, can't change these

2018-10-22 23:33:38 -05: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

also show spinner on new CATCHUP state

2018-08-30 15:39:48 +02:00

TimelinePanel.js

also show spinner on new CATCHUP state

2018-08-30 15:39:48 +02:00

TopLeftMenuButton.js

fix lint

2018-10-24 14:36:08 +02:00

UploadBar.js

Remove use of deprecated React.PropTypes

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

UserSettings.js

Merge branch 'develop' into experimental

2018-10-26 15:33:39 +02:00

ViewSource.js

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

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