Stefan Parviainen 2c1618bc10 Fix conflict and update strings ...

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>

2017-11-15 20:40:51 +01:00

..

AddressPickerDialog.js

Rank rooms with shorter matching aliases first

2017-11-08 10:47:45 +00:00

BaseDialog.js

move Dialog analytics to Modal controller

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

ChatCreateOrReuseDialog.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

ConfirmRedactDialog.js

Add rule to enforce spacing in curly brackets in JSX children

2017-09-28 11:21:06 +01:00

ConfirmUserActionDialog.js

Add prop type

2017-11-10 11:41:36 +00:00

CreateGroupDialog.js

Open group settings when the group is created

2017-11-06 18:02:50 +00:00

CreateRoomDialog.js

remove redundant&stale onKeyDown

2017-10-05 08:08:39 +01:00

DeactivateAccountDialog.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

DeviceVerifyDialog.js

Add rule to enforce spacing in curly brackets in JSX children

2017-09-28 11:21:06 +01:00

ErrorDialog.js

Add rule to enforce spacing in curly brackets in JSX children

2017-09-28 11:21:06 +01:00

InteractiveAuthDialog.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

KeyShareDialog.js

Fix merge conflict

2017-10-02 17:57:22 +02:00

QuestionDialog.js

Add rule to enforce spacing in curly brackets in JSX children

2017-09-28 11:21:06 +01:00

SessionRestoreErrorDialog.js

Refactor i18n stuff a bit

2017-11-13 20:19:33 +01:00

SetEmailDialog.js

Add rule to enforce spacing in curly brackets in JSX children

2017-09-28 11:21:06 +01:00

SetMxIdDialog.js

Pass plain components, rather than functions returning them

2017-11-14 20:09:52 +01:00

TextInputDialog.js

Remove redundant stale onKeyDown

2017-10-05 08:26:57 +01:00

UnknownDeviceDialog.js

Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings

2017-11-08 17:43:38 -07:00