Michael Telatynski b67256c7c2 post-merge fix

2020-01-24 16:41:43 +00:00

..

auth

Merge pull request #3916 from matrix-org/dbkr/security_dialog_noheader

2020-01-24 09:50:25 +00:00

AutoHideScrollbar.js

Bind the onWheel listener directly to props

2019-04-05 09:43:29 -06:00

CompatibilityPage.js

Convert CommonJS exports to ES6-compatible exports

2019-12-22 21:01:02 -07:00

ContextMenu.js

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

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

CustomRoomTagPanel.js

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

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

EmbeddedPage.js

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

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

FilePanel.js

FilePanel: Add comments to explain what's going on with the event index.

2020-01-24 14:23:43 +01:00

GenericErrorPage.js

Implement design and copy for errors

2019-06-05 11:32:02 -06:00

GroupView.js

Merge branch 'develop' into travis/sourcemaps

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

IndicatorScrollbar.js

Correct case of propTypes property in ES6 React Components. React 16

2019-09-06 14:27:33 +01:00

InteractiveAuth.js

Convert imports to ES6 from CommonJS

2019-12-22 21:16:06 -07:00

LeftPanel.js

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

2020-01-16 00:31:43 +00:00

LoggedInView.js

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

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

MainSplit.js

Reintroduce working resizer code for right panel

2019-12-23 19:26:59 -07:00

MatrixChat.js

Merge pull request #3912 from matrix-org/bwindels/verifyowndevicechecks

2020-01-23 17:02:00 +00:00

MessagePanel.js

Import haveTileForEvent() from the right place

2019-12-22 21:23:07 -07:00

MyGroups.js

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

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

NotificationPanel.js

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

2019-12-22 21:20:13 -07:00

RightPanel.js

post-merge fix

2020-01-24 16:41:43 +00:00

RoomDirectory.js

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

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

RoomStatusBar.js

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

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

RoomSubList.js

Fix roving room list for resizer and ff tabstop a11y

2020-01-22 10:36:20 +00:00

RoomView.js

Merge pull request #3910 from matrix-org/t3chguy/cross-signing-composer

2020-01-24 13:18:09 +00:00

ScrollPanel.js

Attempt to fix Safari + VoiceOver misunderstanding the timeline list

2020-01-23 14:53:41 +00:00

SearchBox.js

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

2020-01-16 00:31:43 +00:00

TabbedView.js

Fix tabbed view export for component index

2019-12-22 21:23:14 -07:00

TagPanel.js

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

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

TagPanelButtons.js

Convert many imports to handle ES6 exports

2019-12-22 21:04:42 -07:00

TimelinePanel.js

Merge branch 'poljar/seshat-filepanel' into develop

2020-01-24 14:44:24 +01:00

ToastContainer.js

Toasts for new, unverified sessions

2020-01-17 11:43:35 +00:00

TopLeftMenuButton.js

Fix MatrixClientPeg imports

2019-12-22 21:15:54 -07:00

UploadBar.js

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

2019-12-22 21:20:13 -07:00

UserView.js

Fix MatrixClientPeg imports

2019-12-22 21:15:54 -07:00

ViewSource.js

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

2019-12-22 21:20:13 -07:00