Michael Telatynski b19c1010aa

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

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

# Conflicts:
#	src/Analytics.js

2017-08-10 13:54:55 +01:00

..

login

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

2017-08-10 13:54:55 +01:00

ContextualMenu.js

Fix a bunch of linting errors

2017-01-20 14:22:27 +00:00

CreateRoom.js

fix missing translations and typos in i18n

2017-06-07 18:24:35 +01:00

FilePanel.js

Translate src/components/structures

2017-06-07 11:40:46 +01:00

GroupView.js

un-i18n Modal Analytics

2017-07-27 17:19:18 +01:00

InteractiveAuth.js

remove unused imports

2017-06-02 21:35:55 +01:00

LoggedInView.js

Lint / comment out line correctly

2017-07-17 18:13:20 +01:00

MatrixChat.js

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

2017-08-10 13:54:55 +01:00

MessagePanel.js

change lastShownEventIndex -> lastShownEvent since some places

2017-07-26 12:17:05 +01:00

MyGroups.js

un-i18n Modal Analytics

2017-07-27 17:19:18 +01:00

NotificationPanel.js

Bulk change counterpart imports

2017-05-25 11:39:08 +01:00

RoomStatusBar.js

Remove references to tabComplete, which are now redundant

2017-07-13 10:16:59 +01:00

RoomView.js

don't track error messages

2017-08-10 13:49:11 +01:00

ScrollPanel.js

Manual fixup for remaining q incantaions

2017-07-12 18:05:40 +01:00

TimelinePanel.js

un-i18n Modal Analytics

2017-07-27 17:19:18 +01:00

UploadBar.js

Translate src/components/structures

2017-06-07 11:40:46 +01:00

UserSettings.js

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

2017-08-10 13:54:55 +01:00