element-web

Files

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

Fix broken ForgotPassword component

2018-04-06 10:27:03 +01:00

ContextualMenu.js

Add missing PropType declarations.

2018-04-04 13:38:07 +01:00

CreateRoom.js

Remove use of deprecated React.PropTypes

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

FilePanel.js

Switch to 'm.sticker' message events. Allow whitelisting of wisget capabilities.

2018-03-12 13:56:02 +00:00

GroupView.js

Change comments

2018-04-10 15:56:57 +01:00

InteractiveAuth.js

Remove use of deprecated React.PropTypes

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

LoggedInView.js

Merge pull request #1652 from pvagner/dialog-a11y

2018-03-20 11:35:57 +00:00

MatrixChat.js

Init page change state in willMount

2018-03-28 11:25:28 +01:00

MessagePanel.js

Make stickers/messages continuations of each other

2018-04-06 17:47:44 +01:00

MyGroups.js

Wrap GeminiScrollbar in a component, enabled forceGemini

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

NotificationPanel.js

Dramatically simplify use of mx_fadable

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

RoomStatusBar.js

simplify the 'send anyway' text, as 'mark devices known' is meaningless to users

2018-01-18 09:57:29 +00:00

RoomView.js

Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to

2018-04-04 11:08:34 +01:00

ScrollPanel.js

Make sure to proxy special prop ref

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

TagPanel.js

rename createGroupButton to not be a total misnomer...

2018-04-09 23:02:59 +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

Wrap GeminiScrollbar in a component, enabled forceGemini

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