ThreadNet-Web

actions

…

async-components/views/dialogs

Fix import merge conflicts, removing any that aren't needed anymore

2020-01-09 14:17:33 -07:00

autocomplete

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00

components

Appease the linter

2020-01-13 13:28:33 -07:00

contexts

…

editor

…

hooks

…

i18n/strings

Merge branch 'develop' into travis/sourcemaps

2020-01-13 11:19:41 -07:00

indexing

Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export

2020-01-08 09:09:11 -07:00

integrations

…

mjolnir

…

notifications

…

rageshake

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00

resizer

…

settings

Merge branch 'develop' into travis/sourcemaps

2020-01-13 11:19:41 -07:00

stores

Delete files that were conflicting in the merge and deleted on develop

2020-01-09 14:19:19 -07:00

utils

Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps

2020-01-09 16:06:46 -07:00

ActiveRoomObserver.js

…

AddThreepid.js

…

Analytics.js

Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export

2020-01-08 09:09:11 -07:00

Avatar.js

Appease the linter

2020-01-13 13:28:33 -07:00

BasePlatform.js

…

boundThreepids.js

…

CallHandler.js

Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export

2020-01-08 09:09:11 -07:00

CallMediaHandler.js

…

ContentMessages.js

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00

createRoom.js

Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export

2020-01-08 09:09:11 -07:00

CrossSigningManager.js

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00

cryptodevices.js

…

DateUtils.js

…

DecryptionFailureTracker.js

…

dispatcher.js

Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export

2020-01-08 09:09:11 -07:00

email.js

…

emoji.js

Use a regex that actually works

2020-01-07 20:41:19 +00:00

Entities.js

Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export

2020-01-08 09:09:11 -07:00

extend.js

…

FromWidgetPostMessageApi.js

…

GroupAddressPicker.js

…

groups.js

…

HtmlUtils.js

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00

IdentityAuthClient.js

…

ImageUtils.js

…

index.js

…

Keyboard.js

…

KeyRequestHandler.js

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00

languageHandler.js

Fix languageHandler's use of $webapp languages.json for Jest

2020-01-09 17:22:50 -07:00

Lifecycle.js

…

linkify-matrix.js

…

Login.js

…

Markdown.js

…

MatrixClientPeg.js

…

Modal.js

…

Notifier.js

Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export

2020-01-08 09:09:11 -07:00

ObjectUtils.js

…

PageTypes.js

…

PasswordReset.js

…

PhasedRollOut.js

…

phonenumber.js

…

PlatformPeg.js

…

Presence.js

Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export

2020-01-08 09:09:11 -07:00

ratelimitedfunc.js

…

Registration.js

…

Resend.js

Appease the linter

2020-01-13 13:28:33 -07:00

Roles.js

…

RoomAliasCache.js

…

RoomInvite.js

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00

RoomListSorter.js

…

RoomNotifs.js

…

Rooms.js

…

ScalarAuthClient.js

…

ScalarMessaging.js

Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export

2020-01-08 09:09:11 -07:00

SdkConfig.ts

…

Searching.js

…

SendHistoryManager.js

…

shouldHideEvent.js

…

Skinner.js

Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export

2020-01-08 09:09:11 -07:00

SlashCommands.js

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00

Terms.js

…

TextForEvent.js

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00

theme.js

…

Tinter.js

…

ToWidgetPostMessageApi.js

…

Unread.js

Merge branch 'travis/sourcemaps' into travis/babel7-wp-es6-fixes

2020-01-08 14:42:01 -07:00

UserActivity.js

…

UserAddress.js

…

VectorConferenceHandler.js

Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export

2020-01-08 09:09:11 -07:00

Velociraptor.js

…

VelocityBounce.js

…

WhoIsTyping.js

Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export

2020-01-08 09:09:11 -07:00

WidgetMessaging.js

…

WidgetMessagingEndpoint.js

…