Stefan Parviainen 45137f030b Fix merge conflict ...

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

2017-10-12 22:18:50 +02: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

Fix merge conflict

2017-10-12 22:18:50 +02:00

i18n/strings

Fix merge conflict

2017-10-12 22:18:50 +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

Avoid re-rendering RoomList on room switch

2017-09-11 16:59:09 +01:00

AddThreepid.js

…

Analytics.js

…

Avatar.js

…

BasePlatform.js

Add setupScreenSharingForIframe to BasePlatform

2017-09-25 17:12:37 +02:00

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

Display spinner not room preview after room create

2017-09-14 22:22:21 +01:00

DateUtils.js

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-dateutils

2017-09-13 13:24:48 +01:00

dispatcher.js

…

email.js

…

Entities.js

…

extend.js

…

GroupAddressPicker.js

Factor-out GroupStore and create GroupStoreCache

2017-10-04 16:56:35 +01:00

groups.js

Implement button to remove a room from a group

2017-09-29 17:59:24 +01:00

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

Fix merge-conflict

2017-10-11 20:02:14 +02: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

Fix ability to invite existing mx users

2017-09-28 10:55:09 +01:00

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

Add more doc

2017-09-08 17:43:41 +01:00

SlashCommands.js

Add rule to enforce spacing in curly brackets in JSX children

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

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

Implement adding rooms to a group (or group summary) by room ID

2017-09-27 15:30:58 +01:00

UserSettingsStore.js

redundant code is redundant

2017-10-12 17:28:53 +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

…