Stefan Parviainen a96169e80e Fix merge conflict

2017-10-02 17:57:22 +02:00

..

login

Merge pull request #1348 from matrix-org/dbkr/fix_forgot_password_percent_encode

2017-08-29 15:02:26 +01:00

ContextualMenu.js

…

CreateRoom.js

…

FilePanel.js

…

GroupView.js

Add rule to enforce spacing in curly brackets in JSX children

2017-09-28 11:21:06 +01:00

InteractiveAuth.js

…

LoggedInView.js

Merge branch 'develop' into dbkr/group_userlist

2017-09-19 13:26:55 +01:00

MatrixChat.js

Add rule to enforce spacing in curly brackets in JSX children

2017-09-28 11:21:06 +01:00

MessagePanel.js

Merge pull request #1388 from matrix-org/t3chguy/start_mels_expanded

2017-09-17 22:09:44 +01:00

MyGroups.js

Merge branch 'develop' into luke/groups-button

2017-09-28 12:11:26 +01:00

NotificationPanel.js

…

RoomStatusBar.js

Hide read receipts and typing notifs for ignored users

2017-09-14 20:25:51 -06:00

RoomView.js

Fix RoomView stuck in 'accept invite' state

2017-09-15 15:07:09 +01:00

ScrollPanel.js

Don't always paginate when mounting a ScrollPanel

2017-09-08 15:41:19 +01:00

TimelinePanel.js

Hide events that were sent by ignored users

2017-09-14 20:16:56 -06:00

UploadBar.js

…

UserSettings.js

Fix merge conflict

2017-10-02 17:57:22 +02:00