Robert Swain d67e7289e8 Merge branch 'develop' into rob/apps

2017-06-13 15:50:43 +02:00

..

AddAppDialog.js

AddAppDialog: Support adding apps to room state

2017-06-13 15:31:37 +02: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

Only process user_directory response if it's for the current query

2017-06-13 11:03:22 +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

DeactivateAccountDialog.js

Add more translations..

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

DeviceVerifyDialog.js

More i18n strings (#963)

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

ErrorDialog.js

Put back default strings on dialogs

2017-05-25 18:20:48 +01:00

InteractiveAuthDialog.js

Everything but src/components/views/rooms

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

QuestionDialog.js

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

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

SessionRestoreErrorDialog.js

Linting

2017-06-08 14:58:54 +01:00

SetMxIdDialog.js

oops, fix more i18n var name typos

2017-06-07 18:28:49 +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