Stefan Parviainen d6f1e12bee Fix merge conflict ...

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

2017-11-01 15:50:45 +01:00

..

AddressPickerDialog.js

Match on any alias

2017-10-25 12:42:58 +01: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

Don't hardcode ConfirmUserActionDialog title

2017-10-12 22:15:53 +02:00

CreateGroupDialog.js

Escape dash in regex

2017-10-31 11:48:56 +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

Add rule to enforce spacing in curly brackets in JSX children

2017-09-28 11:21:06 +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

Add rule to enforce spacing in curly brackets in JSX children

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

TextInputDialog.js

Remove redundant stale onKeyDown

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

UnknownDeviceDialog.js

Run eslint --fix

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