This repository has been archived by the owner on Oct 22, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Loading status checks…
Merge branch 'develop' of github.com:element-hq/matrix-react-sdk into…
… t3chguy/dedup-icons Signed-off-by: Michael Telatynski <[email protected]> # Conflicts: # playwright/snapshots/file-upload/image-upload.spec.ts/image-upload-preview-linux.png # playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-with-user-pill-linux.png # playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-without-user-linux.png # playwright/snapshots/permalinks/permalinks.spec.ts/permalink-rendering-linux.png # playwright/snapshots/polls/polls.spec.ts/Polls-Timeline-tile-no-votes-linux.png # playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-bubble-layout-linux.png # playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-group-layout-linux.png # playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Threads-Activity-Centre-linux.png # playwright/snapshots/right-panel/file-panel.spec.ts/file-tiles-list-linux.png # playwright/snapshots/room-directory/room-directory.spec.ts/filtered-no-results-linux.png # playwright/snapshots/room-directory/room-directory.spec.ts/filtered-one-result-linux.png # playwright/snapshots/room/room-header.spec.ts/encrypted-room-header-linux.png # playwright/snapshots/room/room-header.spec.ts/room-header-highlighted-linux.png # playwright/snapshots/room/room-header.spec.ts/room-header-linux.png # playwright/snapshots/room/room-header.spec.ts/room-header-long-name-linux.png # playwright/snapshots/room/room-header.spec.ts/room-header-video-room-linux.png # playwright/snapshots/room/room-header.spec.ts/room-header-with-apps-button-highlighted-linux.png # playwright/snapshots/room/room-header.spec.ts/room-header-with-apps-button-not-highlighted-linux.png # playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/appearance-tab-linux.png # playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/window-12px-linux.png # playwright/snapshots/settings/general-room-settings-tab.spec.ts/General-room-settings-tab-should-be-rendered-properly-1-linux.png # playwright/snapshots/settings/general-user-settings-tab.spec.ts/general-linux.png # playwright/snapshots/settings/general-user-settings-tab.spec.ts/general-smallscreen-linux.png # playwright/snapshots/settings/preferences-user-settings-tab.spec.ts/Preferences-user-settings-tab-should-be-rendered-properly-1-linux.png # playwright/snapshots/settings/security-user-settings-tab.spec.ts/Security-user-settings-tab-with-posthog-enable-b5d89-csLearnMoreDialog-should-be-rendered-properly-1-linux.png # playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png # playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-button-expanded-linux.png # playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-hovered-expanded-linux.png # playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png # playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-and-messages-irc-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/collapsed-gels-bubble-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/configured-room-irc-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/event-line-inline-start-margin-irc-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/event-tiles-bubble-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/event-tiles-compact-modern-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/event-tiles-irc-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/event-tiles-modern-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-and-messages-irc-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-bubble-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-emote-irc-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-irc-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-modern-layout-linux.png # playwright/snapshots/timeline/timeline.spec.ts/expanded-gels-redaction-placeholder-linux.png # playwright/snapshots/user-onboarding/user-onboarding-new.spec.ts/User-Onboarding-new-user-page-is-shown-and-preference-exists-1-linux.png # playwright/snapshots/user-view/user-view.spec.ts/user-info-linux.png # res/css/_common.pcss # res/css/structures/_SearchBox.pcss # res/css/structures/_UserMenu.pcss # res/css/views/dialogs/_UserSettingsDialog.pcss # res/css/views/elements/_ImageView.pcss # res/css/views/right_panel/_RoomSummaryCard.pcss # res/css/views/rooms/_PinnedEventTile.pcss # src/components/structures/RoomStatusBar.tsx # src/components/views/beacon/DialogSidebar.tsx # src/components/views/beacon/RoomLiveShareWarning.tsx # src/components/views/messages/MessageActionBar.tsx # src/components/views/right_panel/PinnedMessagesCard.tsx # src/components/views/rooms/RoomKnocksBar.tsx # src/components/views/settings/tabs/room/PeopleRoomSettingsTab.tsx # src/voice-broadcast/components/atoms/VoiceBroadcastHeader.tsx # src/voice-broadcast/components/molecules/VoiceBroadcastSmallPlaybackBody.tsx
Showing
2,677 changed files
with
27,357 additions
and
39,392 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This CODEOWNERS file is valid.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,18 @@ | ||
* @matrix-org/element-web-reviewers | ||
/.github/workflows/** @matrix-org/element-web-team | ||
/package.json @matrix-org/element-web-team | ||
/yarn.lock @matrix-org/element-web-team | ||
* @element-hq/element-web-reviewers | ||
/.github/workflows/** @element-hq/element-web-team | ||
/package.json @element-hq/element-web-team | ||
/yarn.lock @element-hq/element-web-team | ||
|
||
/src/SecurityManager.ts @matrix-org/element-crypto-web-reviewers | ||
/test/SecurityManager-test.ts @matrix-org/element-crypto-web-reviewers | ||
/src/async-components/views/dialogs/security/ @matrix-org/element-crypto-web-reviewers | ||
/src/components/views/dialogs/security/ @matrix-org/element-crypto-web-reviewers | ||
/test/components/views/dialogs/security/ @matrix-org/element-crypto-web-reviewers | ||
/src/stores/SetupEncryptionStore.ts @matrix-org/element-crypto-web-reviewers | ||
/test/stores/SetupEncryptionStore-test.ts @matrix-org/element-crypto-web-reviewers | ||
/src/SecurityManager.ts @element-hq/element-crypto-web-reviewers | ||
/test/SecurityManager-test.ts @element-hq/element-crypto-web-reviewers | ||
/src/async-components/views/dialogs/security/ @element-hq/element-crypto-web-reviewers | ||
/src/components/views/dialogs/security/ @element-hq/element-crypto-web-reviewers | ||
/test/components/views/dialogs/security/ @element-hq/element-crypto-web-reviewers | ||
/src/stores/SetupEncryptionStore.ts @element-hq/element-crypto-web-reviewers | ||
/test/stores/SetupEncryptionStore-test.ts @element-hq/element-crypto-web-reviewers | ||
|
||
# Ignore translations as those will be updated by GHA for Localazy download | ||
/src/i18n/strings | ||
# Ignore the synapse plugin as this is updated by GHA for docker image updating | ||
/playwright/plugins/homeserver/synapse/index.ts | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
- name: "A-Timesheet-1" | ||
description: "Log any time spent on this into the A-Timesheet-1 project" | ||
color: "5319E7" | ||
- name: "backport staging" | ||
description: "Label to automatically backport PR to staging branch" | ||
color: "B60205" | ||
- name: "Dependencies" | ||
description: "Pull requests that update a dependency file" | ||
color: "0366d6" | ||
- name: "Sponsored" | ||
color: "b506d8" | ||
- name: "T-Deprecation" | ||
description: "A pull request that makes something deprecated" | ||
color: "98e6ae" | ||
- name: "X-Blocked" | ||
description: "The PR cannot move forward in any capacity until an action is made" | ||
color: "ff7979" | ||
- name: "X-Breaking-Change" | ||
color: "ff7979" | ||
- name: "X-Upcoming-Release-Blocker" | ||
description: "This does not affect the current release cycle but will affect the next one" | ||
color: "e99695" | ||
- name: "Z-Community-PR" | ||
description: "Issue is solved by a community member's PR" | ||
color: "ededed" | ||
- name: "Z-Experiment" | ||
description: "Experimental PR, primarily up for its Netlify build, high likelihood of never making it beyond here." | ||
color: "b60205" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
name: Sync labels | ||
on: | ||
workflow_dispatch: {} | ||
schedule: | ||
- cron: "0 1 * * *" # 1am every day | ||
push: | ||
branches: | ||
- develop | ||
paths: | ||
- .github/labels.yml | ||
jobs: | ||
sync-labels: | ||
uses: element-hq/element-meta/.github/workflows/sync-labels.yml@develop | ||
with: | ||
LABELS: | | ||
element-hq/element-meta | ||
.github/labels.yml | ||
DELETE: true | ||
WET: true | ||
secrets: | ||
ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
#!/usr/bin/env sh | ||
. "$(dirname "$0")/_/husky.sh" | ||
|
||
npx lint-staged --concurrent false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"*": "prettier --write", | ||
"*.(ts|tsx|js|jsx)": ["eslint --fix"], | ||
"*.pcss": ["stylelint"] | ||
} |
File renamed without changes.
Oops, something went wrong.