Michael Telatynski 04aed416d2 Merge branches 'develop' and 't3chguy/reset_favicon_on_logout' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout ...

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

# Conflicts:
#	src/components/structures/MatrixChat.js

2017-06-20 15:37:05 +01:00

..

async-components/views/dialogs

Improve error logging/reporting in megolm import/export

2017-06-08 16:55:50 +01:00

autocomplete

remove unused imports

2017-06-02 21:35:55 +01:00

components

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

2017-06-20 15:37:05 +01:00

i18n/strings

Merge branch 'develop' into luke/feature-user-settings-password-warning

2017-06-20 13:40:34 +01:00

stores

Merge branch 'develop' into t3chguy/fix_forwarding

2017-06-19 01:53:35 +01:00

utils

Factor createMatrixClient out from MatrixClientPeg

2017-06-13 12:46:49 +01:00

wrappers

…

AddThreepid.js

…

Analytics.js

track the action of opt-out

2017-06-07 11:26:52 +01:00

Avatar.js

…

BasePlatform.js

add concept of platform handling loudNotifications (bings/pings/whatHaveYou)

2017-05-31 23:49:55 +01:00

CallHandler.js

allow forcing of TURN, pass account val per-call until UX is designed.

2017-06-12 20:20:27 +01:00

CallMediaHandler.js

remove unused imports

2017-06-02 21:35:55 +01:00

ContentMessages.js

…

createRoom.js

Remove unnecessary if

2017-06-19 16:45:40 +01:00

DateUtils.js

Support 12hr time in full date

2017-05-30 13:12:27 -06:00

dispatcher.js

Remove sarcastic comments

2017-06-14 23:03:40 +01:00

email.js

…

Entities.js

…

extend.js

…

HtmlUtils.js

Add comments & remove redundant check

2017-06-08 14:53:21 +01:00

ImageUtils.js

…

index.js

Allow fetch() to be stubbed for the RtsClient

2017-06-15 01:52:24 +01:00

Invite.js

…

KeyCode.js

move KEY_M to KeyCode

2017-06-02 21:46:08 +01:00

KeyRequestHandler.js

Address review comments

2017-06-05 17:58:11 +01:00

languageHandler.js

Avoid React warning from _tJsx (#1078)

2017-06-12 16:45:36 +01:00

Lifecycle.js

Fix race in registration for pusher config

2017-06-19 10:22:18 +01:00

linkify-matrix.js

…

Login.js

Avoid getting stuck in a loop in CAS login

2017-06-16 13:06:28 +01:00

Markdown.js

…

MatrixClientPeg.js

Factor createMatrixClient out from MatrixClientPeg

2017-06-13 12:46:49 +01:00

Modal.js

Ask for email address after setting password for the first time

2017-06-14 09:31:16 +01:00

Notifier.js

add concept of platform handling loudNotifications (bings/pings/whatHaveYou)

2017-05-31 23:49:55 +01:00

ObjectUtils.js

…

PageTypes.js

…

PasswordReset.js

More translations..

2017-06-01 15:18:06 +01:00

phonenumber.js

…

PlatformPeg.js

…

Presence.js

…

ratelimitedfunc.js

…

Resend.js

…

RichText.js

…

Roles.js

…

RoomListSorter.js

…

RoomNotifs.js

…

Rooms.js

DM guessing: prefer oldest joined member

2017-06-13 17:35:09 +01:00

RtsClient.js

Allow fetch() to be stubbed for the RtsClient

2017-06-15 01:52:24 +01:00

ScalarAuthClient.js

…

ScalarMessaging.js

Add get_membership_count scalar API (#1043)

2017-06-06 16:41:08 +01:00

SdkConfig.js

…

Skinner.js

Throw errors when components don't look like components (#980)

2017-06-01 09:26:35 +01:00

SlashCommands.js

Add translations for slash command failures

2017-06-01 15:44:56 +01:00

TabComplete.js

…

TabCompleteEntries.js

…

TextForEvent.js

Add text for invite_timeout and fix message for ice_failed.

2017-06-11 07:19:19 +01:00

Tinter.js

…

UiEffects.js

…

UnknownDeviceErrorHandler.js

…

Unread.js

…

UserActivity.js

…

UserSettingsStore.js

Find a way to translate the name of RTE in user settings

2017-06-01 15:53:08 +01:00

Velociraptor.js

…

VelocityBounce.js

…

WhoIsTyping.js

…