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

..

BaseDialog.js

move Dialog analytics to Modal controller

2017-05-29 17:39:03 +01:00

ChatCreateOrReuseDialog.js

Add more translations..

2017-06-08 09:44:58 +01:00

ChatInviteDialog.js

don't track error messages

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

ConfirmRedactDialog.js

More i18n strings (#963)

2017-05-30 15:09:57 +01:00

ConfirmUserActionDialog.js

Bulk change counterpart imports

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

CreateGroupDialog.js

PR feedback

2017-07-07 18:34:40 +01:00

DeactivateAccountDialog.js

un-i18n Modal Analytics

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

DeviceVerifyDialog.js

More i18n strings (#963)

2017-05-30 15:09:57 +01:00

ErrorDialog.js

don't track error messages

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

InteractiveAuthDialog.js

Everything but src/components/views/rooms

2017-06-08 12:33:29 +01:00

KeyShareDialog.js

un-i18n Modal Analytics

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

QuestionDialog.js

Add remaining strings for vector-im/riot-web#4151

2017-06-02 10:47:08 +01:00

SessionRestoreErrorDialog.js

un-i18n Modal Analytics

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

SetEmailDialog.js

make string more human-friendly

2017-08-10 13:51:47 +01:00

SetMxIdDialog.js

add comment

2017-08-09 16:37:38 +01:00

TextInputDialog.js

Bulk change counterpart imports

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

UnknownDeviceDialog.js

Everything but src/components/views/rooms

2017-06-08 12:33:29 +01:00