Michael Telatynski b0b7472901 undo bad merge ...

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

2017-10-14 17:14:57 +01:00

..

async-components/views/dialogs

Run eslint --fix

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

autocomplete

Run eslint --fix

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

components

undo bad merge

2017-10-14 17:14:57 +01:00

i18n/strings

Merge pull request #1459 from matrix-org/luke/groups-invite-warm-fuzzy

2017-10-13 11:31:48 +02:00

stores

Modify the group store to include group rooms

2017-10-05 14:30:04 +01:00

utils

Run eslint --fix

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

wrappers

…

ActiveRoomObserver.js

…

AddThreepid.js

…

Analytics.js

…

Avatar.js

…

BasePlatform.js

…

CallHandler.js

Run eslint --fix

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

CallMediaHandler.js

…

ComposerHistoryManager.js

…

ContentMessages.js

Run eslint --fix

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

createRoom.js

…

DateUtils.js

…

dispatcher.js

…

email.js

…

Entities.js

…

extend.js

…

GroupAddressPicker.js

Add warm fuzzy dialog for inviting users to a group

2017-10-11 15:04:52 +01:00

groups.js

…

HtmlUtils.js

Run eslint --fix

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

ImageUtils.js

Run eslint --fix

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

index.js

…

KeyCode.js

…

KeyRequestHandler.js

…

languageHandler.js

Run eslint --fix

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

Lifecycle.js

…

linkify-matrix.js

Run eslint --fix

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

Login.js

Run eslint --fix

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

Markdown.js

Run eslint --fix

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

MatrixClientPeg.js

Run eslint --fix

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

Modal.js

Run eslint --fix

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

Notifier.js

Run eslint --fix

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

ObjectUtils.js

…

PageTypes.js

…

PasswordReset.js

…

phonenumber.js

…

PlatformPeg.js

…

Presence.js

Run eslint --fix

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

ratelimitedfunc.js

Run eslint --fix

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

Resend.js

…

RichText.js

Merge pull request #1458 from pafcu/emoji-fix2

2017-10-11 19:49:29 +02:00

Roles.js

…

RoomInvite.js

…

RoomListSorter.js

…

RoomNotifs.js

…

Rooms.js

Run eslint --fix

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

RtsClient.js

…

ScalarAuthClient.js

Run eslint --fix

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

ScalarMessaging.js

Run eslint --fix

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

SdkConfig.js

…

shouldHideEvent.js

…

Skinner.js

…

SlashCommands.js

…

stripped-emoji.json

…

TextForEvent.js

DRY map lookup

2017-10-06 12:16:54 +01:00

Tinter.js

Run eslint --fix

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

UiEffects.js

…

UnknownDeviceErrorHandler.js

…

Unread.js

Run eslint --fix

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

UserActivity.js

…

UserAddress.js

…

UserSettingsStore.js

Fix the enableLabs flag, again

2017-10-13 16:06:17 +01:00

Velociraptor.js

Run eslint --fix

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

VelocityBounce.js

Run eslint --fix

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

WhoIsTyping.js

Run eslint --fix

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

WidgetUtils.js

…