Skip to content

Commit

Permalink
Merge tag 'v3.42.0' into sc
Browse files Browse the repository at this point in the history 
* Fix a bug where URL previews could be enabled in the left-panel when they
should not have been.
* Add unexposed account setting for hiding poll creation ([\matrix-org#7972](matrix-org#7972)).
* Allow pinning polls ([\matrix-org#7922](matrix-org#7922)). Fixes element-hq/element-web#20152.
* Make trailing `:` into a setting ([\matrix-org#6711](matrix-org#6711)). Fixes element-hq/element-web#16682. Contributed by @SimonBrandner.
* Location sharing > back button ([\matrix-org#7958](matrix-org#7958)).
* use LocationAssetType ([\matrix-org#7965](matrix-org#7965)).
* Location share type UI ([\matrix-org#7924](matrix-org#7924)).
* Add a few more UIComponent flags, and ensure they are used in existing code ([\matrix-org#7937](matrix-org#7937)).
* Add support for overriding strings in the app ([\matrix-org#7886](matrix-org#7886)).
* Add support for redirecting to external pages after logout ([\matrix-org#7905](matrix-org#7905)).
* Expose redaction power level in room settings ([\matrix-org#7599](matrix-org#7599)). Fixes element-hq/element-web#20590. Contributed by @SimonBrandner.
* Update and expand ways to access pinned messages ([\matrix-org#7906](matrix-org#7906)). Fixes element-hq/element-web#21209 and element-hq/element-web#21211.
* Add slash command to switch to a room's virtual room ([\matrix-org#7839](matrix-org#7839)).
* Merge pull request from GHSA-qmf4-7w7j-vf23 ([\matrix-org#8059](matrix-org#8059)).
* Add another null guard for member ([\matrix-org#7984](matrix-org#7984)). Fixes element-hq/element-web#21319.
* Fix room account settings ([\matrix-org#7999](matrix-org#7999)).
* Fix missing summary text for pinned message changes ([\matrix-org#7989](matrix-org#7989)). Fixes element-hq/element-web#19823.
* Pass room to getRoomTombstone to avoid racing with setState ([\matrix-org#7986](matrix-org#7986)).
* Hide composer and call buttons when the room is tombstoned ([\matrix-org#7975](matrix-org#7975)). Fixes element-hq/element-web#21286.
* Fix bad ternary statement in autocomplete user pill insertions ([\matrix-org#7977](matrix-org#7977)). Fixes element-hq/element-web#21307.
* Fix sending locations into threads and fix i18n ([\matrix-org#7943](matrix-org#7943)). Fixes element-hq/element-web#21267.
* Fix location map attribution rendering over message action bar ([\matrix-org#7974](matrix-org#7974)). Fixes element-hq/element-web#21297.
* Fix wrongly asserting that PushRule::conditions is non-null ([\matrix-org#7973](matrix-org#7973)). Fixes element-hq/element-web#21305.
* Fix account & room settings race condition ([\matrix-org#7953](matrix-org#7953)). Fixes element-hq/element-web#21163.
* Fix bug with some space selections not being applied ([\matrix-org#7971](matrix-org#7971)). Fixes element-hq/element-web#21290.
* Revert "replace all require(.svg) with esm import" ([\matrix-org#7969](matrix-org#7969)). Fixes element-hq/element-web#21293.
* Hide unpinnable pinned messages in more cases ([\matrix-org#7921](matrix-org#7921)).
* Fix room list being laggy while scrolling 🐌 ([\matrix-org#7939](matrix-org#7939)). Fixes element-hq/element-web#21262.
* Make pinned messages more reliably reflect edits ([\matrix-org#7920](matrix-org#7920)). Fixes element-hq/element-web#17098.
* Improve accessibility of the BetaPill ([\matrix-org#7949](matrix-org#7949)). Fixes element-hq/element-web#21255.
* Autofocus correct composer after sending reaction ([\matrix-org#7950](matrix-org#7950)). Fixes element-hq/element-web#21273.
* Consider polls as message events for rendering redactions ([\matrix-org#7944](matrix-org#7944)). Fixes element-hq/element-web#21125.
* Prevent event tiles being shrunk/collapsed by flexbox ([\matrix-org#7942](matrix-org#7942)). Fixes element-hq/element-web#21269.
* Fix ExportDialog title on export cancellation ([\matrix-org#7936](matrix-org#7936)). Fixes element-hq/element-web#21260. Contributed by @luixxiul.
* Mandate use of js-sdk/src/matrix import over js-sdk/src ([\matrix-org#7933](matrix-org#7933)). Fixes element-hq/element-web#21253.
* Fix backspace not working in the invite dialog ([\matrix-org#7931](matrix-org#7931)). Fixes element-hq/element-web#21249. Contributed by @SimonBrandner.
* Fix right panel soft crashes due to missing room prop ([\matrix-org#7923](matrix-org#7923)). Fixes element-hq/element-web#21243.
* fix color of location share caret ([\matrix-org#7917](matrix-org#7917)).
* Wrap all EventTiles with a TileErrorBoundary and guard parsePermalink ([\matrix-org#7916](matrix-org#7916)). Fixes element-hq/element-web#21216.
* Fix changing space sometimes bouncing to the wrong space ([\matrix-org#7910](matrix-org#7910)). Fixes element-hq/element-web#20425.
* Ensure EventListSummary key does not change during backpagination ([\matrix-org#7915](matrix-org#7915)). Fixes element-hq/element-web#9192.
* Fix positioning of the thread context menu ([\matrix-org#7918](matrix-org#7918)). Fixes element-hq/element-web#21236.
* Inject sender into pinned messages ([\matrix-org#7904](matrix-org#7904)). Fixes element-hq/element-web#20314.
* Tweak info message padding in right panel timeline ([\matrix-org#7901](matrix-org#7901)). Fixes element-hq/element-web#21212.
* Fix another freeze on room switch ([\matrix-org#7900](matrix-org#7900)). Fixes element-hq/element-web#21127.
* Clean up error listener when location picker closes ([\matrix-org#7902](matrix-org#7902)). Fixes element-hq/element-web#21213.
* Fix edge case in context menu chevron positioning ([\matrix-org#7899](matrix-org#7899)).
* Fix composer format buttons on WebKit ([\matrix-org#7898](matrix-org#7898)). Fixes element-hq/element-web#20868.
* manage voicerecording state when deleting or sending a voice message ([\matrix-org#7896](matrix-org#7896)). Fixes element-hq/element-web#21151.
* Fix bug with useRoomHierarchy tight-looping loadMore on error ([\matrix-org#7893](matrix-org#7893)).
* Fix upload button & shortcut not working for narrow composer mode ([\matrix-org#7894](matrix-org#7894)). Fixes element-hq/element-web#21175 and element-hq/element-web#21142.
* Fix emoji insertion in thread composer going to the main composer ([\matrix-org#7895](matrix-org#7895)). Fixes element-hq/element-web#21202.
* Try harder to keep context menus inside the window ([\matrix-org#7863](matrix-org#7863)). Fixes element-hq/element-web#17527 and element-hq/element-web#18377.
* Fix edge case around event list summary layout ([\matrix-org#7891](matrix-org#7891)). Fixes element-hq/element-web#21180.
* Fix event list summary 1 hidden message pluralisation ([\matrix-org#7890](matrix-org#7890)). Fixes element-hq/element-web#21196.
* Fix vanishing recently viewed menu ([\matrix-org#7887](matrix-org#7887)). Fixes element-hq/element-web#20827.
* Fix freeze on room switch ([\matrix-org#7884](matrix-org#7884)). Fixes element-hq/element-web#21127.
* Check 'useSystemTheme' in quick settings theme switcher ([\matrix-org#7809](matrix-org#7809)). Fixes element-hq/element-web#21061.
* Fix 'my threads' filtering to include participated threads ([\matrix-org#7882](matrix-org#7882)). Fixes element-hq/element-web#20877.
* Remove log line to try to fix freeze on answering VoIP call ([\matrix-org#7883](matrix-org#7883)).
* Support social login & password on soft logout page ([\matrix-org#7879](matrix-org#7879)). Fixes element-hq/element-web#21099.
* Fix missing padding on server picker ([\matrix-org#7864](matrix-org#7864)).
* Throttle RoomState.members handlers ([\matrix-org#7876](matrix-org#7876)). Fixes element-hq/element-web#21127.
* Only show joined/invited in search dialog ([\matrix-org#7875](matrix-org#7875)). Fixes element-hq/element-web#21161.
* Don't pillify code blocks ([\matrix-org#7861](matrix-org#7861)). Fixes element-hq/element-web#20851 and element-hq/element-web#18687.
* Fix keyboard shortcut icons on macOS ([\matrix-org#7869](matrix-org#7869)).
  • Loading branch information
@su-ex
su-ex committed Mar 17, 2022
2 parents ad7e4ad + ac3a907 commit 3f94a5d
Show file tree
Hide file tree
Showing 353 changed files with 7,636 additions and 3,065 deletions.
115 changes: 92 additions & 23 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,36 @@ module.exports = {
),
],

// Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell.
"no-restricted-imports": ["error", {
"paths": [{
"name": "matrix-js-sdk",
"message": "Please use matrix-js-sdk/src/matrix instead",
}, {
"name": "matrix-js-sdk/",
"message": "Please use matrix-js-sdk/src/matrix instead",
}, {
"name": "matrix-js-sdk/src",
"message": "Please use matrix-js-sdk/src/matrix instead",
}, {
"name": "matrix-js-sdk/src/",
"message": "Please use matrix-js-sdk/src/matrix instead",
}, {
"name": "matrix-js-sdk/src/index",
"message": "Please use matrix-js-sdk/src/matrix instead",
}, {
"name": "matrix-react-sdk",
"message": "Please use matrix-react-sdk/src/index instead",
}, {
"name": "matrix-react-sdk/",
"message": "Please use matrix-react-sdk/src/index instead",
}],
"patterns": [{
"group": ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"],
"message": "Please use matrix-js-sdk/src/* instead",
}],
}],

// There are too many a11y violations to fix at once
// Turn violated rules off until they are fixed
"jsx-a11y/alt-text": "off",
Expand All @@ -57,32 +87,71 @@ module.exports = {
"jsx-a11y/role-supports-aria-props": "off",
"jsx-a11y/tabindex-no-positive": "off",
},
overrides: [{
files: [
"src/**/*.{ts,tsx}",
"test/**/*.{ts,tsx}",
],
extends: [
"plugin:matrix-org/typescript",
"plugin:matrix-org/react",
],
rules: {
// Things we do that break the ideal style
"prefer-promise-reject-errors": "off",
"quotes": "off",
"no-extra-boolean-cast": "off",
overrides: [
{
files: [
"src/**/*.{ts,tsx}",
"test/**/*.{ts,tsx}",
],
extends: [
"plugin:matrix-org/typescript",
"plugin:matrix-org/react",
],
rules: {
// Things we do that break the ideal style
"prefer-promise-reject-errors": "off",
"quotes": "off",
"no-extra-boolean-cast": "off",

// Remove Babel things manually due to override limitations
"@babel/no-invalid-this": ["off"],
// Remove Babel things manually due to override limitations
"@babel/no-invalid-this": ["off"],

// We're okay being explicit at the moment
"@typescript-eslint/no-empty-interface": "off",
// We disable this while we're transitioning
"@typescript-eslint/no-explicit-any": "off",
// We'd rather not do this but we do
"@typescript-eslint/ban-ts-comment": "off",
// We're okay being explicit at the moment
"@typescript-eslint/no-empty-interface": "off",
// We disable this while we're transitioning
"@typescript-eslint/no-explicit-any": "off",
// We'd rather not do this but we do
"@typescript-eslint/ban-ts-comment": "off",
},
},
}],
// temporary override for offending icon require files
{
files: [
"src/SdkConfig.ts",
"src/components/structures/FileDropTarget.tsx",
"src/components/structures/RoomStatusBar.tsx",
"src/components/structures/UserMenu.tsx",
"src/components/views/avatars/WidgetAvatar.tsx",
"src/components/views/dialogs/AddExistingToSpaceDialog.tsx",
"src/components/views/dialogs/CreateSpaceFromCommunityDialog.tsx",
"src/components/views/dialogs/ForwardDialog.tsx",
"src/components/views/dialogs/InviteDialog.tsx",
"src/components/views/dialogs/ModalWidgetDialog.tsx",
"src/components/views/dialogs/UploadConfirmDialog.tsx",
"src/components/views/dialogs/security/SetupEncryptionDialog.tsx",
"src/components/views/elements/AddressTile.tsx",
"src/components/views/elements/AppWarning.tsx",
"src/components/views/elements/SSOButtons.tsx",
"src/components/views/messages/MAudioBody.tsx",
"src/components/views/messages/MImageBody.tsx",
"src/components/views/messages/MFileBody.tsx",
"src/components/views/messages/MStickerBody.tsx",
"src/components/views/messages/MVideoBody.tsx",
"src/components/views/messages/MVoiceMessageBody.tsx",
"src/components/views/right_panel/EncryptionPanel.tsx",
"src/components/views/rooms/EntityTile.tsx",
"src/components/views/rooms/LinkPreviewGroup.tsx",
"src/components/views/rooms/MemberList.tsx",
"src/components/views/rooms/MessageComposer.tsx",
"src/components/views/rooms/ReplyPreview.tsx",
"src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx",
"src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx"
],
rules: {
"@typescript-eslint/no-var-requires": "off",
},
}
],
settings: {
react: {
version: "detect",
Expand Down
Loading

0 comments on commit 3f94a5d

Please sign in to comment.