Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
Files
e6ab18c9baf774007182ad5097120dc76c361c17
element-web/src
T
History
Michael Telatynski e6ab18c9ba Merge branches 'develop' and 't3chguy/roving' of github.com:matrix-org/matrix-react-sdk into t3chguy/roving 
 Conflicts:
	src/components/views/rooms/RoomList.js
2020-01-16 00:31:43 +00:00
..
actions
Convert imports to ES6 from CommonJS
2019-12-22 21:16:06 -07:00
async-components/views/dialogs
Merge pull request #3839 from matrix-org/travis/sourcemaps
2020-01-15 10:11:33 -07:00
autocomplete
[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop
2020-01-09 14:15:09 -07:00
components
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
contexts
Iterate to get rid of the magic group and just provide a generic functional render wrapper
2020-01-15 11:37:14 +00:00
editor
Convert many imports to handle ES6 exports
2019-12-22 21:04:42 -07:00
hooks
null-guard useIsEncrypted
2019-12-17 14:05:51 +00:00
i18n/strings
Merge branch 'develop' into travis/ftue/user-lists/5.2-i18n
2020-01-15 10:49:38 -07:00
indexing
Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export
2020-01-08 09:09:11 -07:00
integrations
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
mjolnir
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
notifications
Convert CommonJS exports to ES6-compatible exports
2019-12-22 21:01:02 -07:00
rageshake
[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop
2020-01-09 14:15:09 -07:00
resizer
Convert resizer to ES6
2019-12-22 20:57:46 -07:00
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 branch 'develop' into travis/ftue/user-lists/5.2-i18n
2020-01-15 10:49:38 -07:00
ActiveRoomObserver.js
…
AddThreepid.js
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
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
Convert many imports to handle ES6 exports
2019-12-22 21:04:42 -07:00
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
Convert CommonJS exports to ES6-compatible exports
2019-12-22 21:01:02 -07:00
emoji.js
Use a regex that actually works
2020-01-08 10:52:03 +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
Convert CommonJS exports to ES6-compatible exports
2019-12-22 21:01:02 -07:00
FromWidgetPostMessageApi.js
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
GroupAddressPicker.js
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
groups.js
…
HtmlUtils.js
[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop
2020-01-09 14:15:09 -07:00
IdentityAuthClient.js
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
ImageUtils.js
Convert CommonJS exports to ES6-compatible exports
2019-12-22 21:01:02 -07:00
index.js
Convert the more complicated CommonJS exports to ES6-style
2019-12-22 21:01:03 -07:00
Keyboard.js
Stop using KeyboardEvent.keyCode as it is deprecated
2019-12-16 17:14:03 +00:00
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
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
linkify-matrix.js
…
Login.js
…
Markdown.js
…
MatrixClientPeg.js
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
Modal.js
Convert many imports to handle ES6 exports
2019-12-22 21:04:42 -07:00
Notifier.js
Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export
2020-01-08 09:09:11 -07:00
ObjectUtils.js
Convert the more complicated CommonJS exports to ES6-style
2019-12-22 21:01:03 -07:00
PageTypes.js
…
PasswordReset.js
Convert CommonJS exports to ES6-compatible exports
2019-12-22 21:01:02 -07:00
PhasedRollOut.js
…
phonenumber.js
…
PlatformPeg.js
Convert CommonJS exports to ES6-compatible exports
2019-12-22 21:01:02 -07:00
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
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
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
Convert CommonJS exports to ES6-compatible exports
2019-12-22 21:01:02 -07:00
RoomNotifs.js
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
Rooms.js
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
ScalarAuthClient.js
Convert imports to ES6 from CommonJS
2019-12-22 21:16:06 -07:00
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
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
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
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
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
Convert imports to ES6 from CommonJS
2019-12-22 21:16:06 -07:00
VelocityBounce.js
Convert imports to ES6 from CommonJS
2019-12-22 21:16:06 -07:00
WhoIsTyping.js
Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export
2020-01-08 09:09:11 -07:00
WidgetMessaging.js
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
WidgetMessagingEndpoint.js
…