Travis Ralston e773585a02 Merge remote-tracking branch 'matrix-org/develop' into travis/presence ...

Signed-off-by: Travis Ralston <travpc@gmail.com>

2017-10-25 11:21:39 -06: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

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

2017-10-25 11:21:39 -06:00

i18n/strings

Undo i18n change to make merge easier

2017-10-25 11:21:12 -06:00

stores

When dispatching view_[my_]group[s], reset RoomViewStore

2017-10-24 16:32:52 +01:00

utils

Refresh group member lists after inviting users

2017-10-23 16:04:26 +01:00

wrappers

…

ActiveRoomObserver.js

Avoid re-rendering RoomList on room switch

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

AddThreepid.js

…

Analytics.js

Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics

2017-08-10 13:54:55 +01:00

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

Use plaintext when loading a markdown history item into RT mode

2017-08-14 16:48:29 +01:00

ContentMessages.js

Use object URLs to load Files in to images

2017-10-19 17:16:52 +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

Refresh group member lists after inviting users

2017-10-23 16:04:26 +01:00

groups.js

Use the correct property of the API room objects

2017-10-24 13:47:10 +01:00

HtmlUtils.js

Merge pull request #1301 from zeroware/develop

2017-10-14 23:48:43 +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

don't track error messages .2

2017-08-10 15:17:52 +01:00

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

Add MemberPresenceAvatar and control presence ourselves

2017-10-14 14:37:47 -06:00

Modal.js

Run eslint --fix

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

Notifier.js

Remove duplicate declaration that breaks the build

2017-10-14 16:41:02 -06:00

ObjectUtils.js

…

PageTypes.js

…

PasswordReset.js

…

phonenumber.js

…

PlatformPeg.js

…

Presence.js

Add MemberPresenceAvatar and control presence ourselves

2017-10-14 14:37:47 -06: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 creation of DM rooms

2017-10-20 10:16:51 +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

remove redundant check and add comment

2017-08-10 15:22:53 +01:00

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

Merge branch 'develop' into travis/pinned_messages

2017-10-14 16:10:32 -06: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

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

2017-10-25 11:21:39 -06: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

…