element-web/src/components/structures
Michael Telatynski dcd99ac3de Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings
# Conflicts:
#	src/components/structures/UserSettings.js
#	src/i18n/strings/en_EN.json

First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 23:54:57 +01:00
..
login fix all missing translations picked up by check-i18n.pl 2017-05-27 18:20:44 +01:00
ContextualMenu.js Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
CreateRoom.js Bulk change counterpart imports 2017-05-25 11:39:08 +01:00
FilePanel.js More i18n strings (#963) 2017-05-30 15:09:57 +01:00
InteractiveAuth.js Just return the promise if it's a bg request 2017-03-22 11:25:33 +00:00
LoggedInView.js Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into forward_message 2017-05-19 00:33:36 +01:00
MatrixChat.js Merge branch 'develop' into t3chguy/piwik 2017-05-30 15:58:55 +01:00
MessagePanel.js actually wire up alwaysShowTimestamps 2017-05-27 00:14:16 +01:00
NotificationPanel.js Bulk change counterpart imports 2017-05-25 11:39:08 +01:00
RoomStatusBar.js Bulk change counterpart imports 2017-05-25 11:39:08 +01:00
RoomView.js change aux order so room settings is top most, forwarding could go weird 2017-05-30 11:22:27 +01:00
ScrollPanel.js Separate predicates for RM/RR 2017-05-09 17:36:19 +01:00
TimelinePanel.js actually wire up alwaysShowTimestamps 2017-05-27 00:14:16 +01:00
UploadBar.js Unregister the UploadBar event listener on unmount 2017-03-16 14:19:17 +00:00
UserSettings.js Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings 2017-05-30 23:54:57 +01:00