mirror of
https://github.com/strapi/strapi.git
synced 2025-07-18 22:45:47 +00:00
481550a0d4
# Conflicts: # .github/actions/check-pr-status/package.json # docs/docs/docs/01-core/admin/05-features/authentication.md # docs/docusaurus.config.js # docs/yarn.lock # examples/getstarted/package.json # examples/kitchensink-ts/package.json # examples/kitchensink/package.json # examples/plugins/workspace-plugin/package.json # lerna.json # package.json # packages/admin-test-utils/package.json # packages/cli/create-strapi-app/package.json # packages/cli/create-strapi-starter/package.json # packages/cli/create-strapi/package.json # packages/core/admin/admin/src/App.tsx # packages/core/admin/admin/src/components/AuthenticatedApp.tsx # packages/core/admin/admin/src/components/Context.tsx # packages/core/admin/admin/src/components/LeftMenu.tsx # packages/core/admin/admin/src/components/PrivateRoute.tsx # packages/core/admin/admin/src/content-manager/pages/ListSettingsView/index.jsx # packages/core/admin/admin/src/content-manager/pages/ListView/components/BulkActions/PublishAction.tsx # packages/core/admin/admin/src/content-manager/pages/ListView/components/TableCells/CellContent.tsx # packages/core/admin/admin/src/features/Configuration.tsx # packages/core/admin/admin/src/index.ts # packages/core/admin/admin/src/pages/ProfilePage.tsx # packages/core/admin/admin/src/pages/UseCasePage.tsx # packages/core/admin/ee/server/src/services/metrics.ts # packages/core/admin/package.json # packages/core/admin/server/src/bootstrap.ts # packages/core/content-manager/package.json # packages/core/content-releases/admin/src/components/CMReleasesContainer.tsx # packages/core/content-releases/admin/src/components/ReleaseListCell.tsx # packages/core/content-releases/admin/src/index.ts # packages/core/content-releases/admin/src/pages/ReleaseDetailsPage.tsx # packages/core/content-releases/admin/src/pages/tests/ReleaseDetailsPage.test.tsx # packages/core/content-releases/admin/src/services/release.ts # packages/core/content-releases/package.json # packages/core/content-releases/server/src/controllers/release.ts # packages/core/content-type-builder/package.json # packages/core/core/.gitignore # packages/core/data-transfer/package.json # packages/core/database/package.json # packages/core/database/src/query/helpers/populate/apply.ts # packages/core/email/package.json # packages/core/helper-plugin/package.json # packages/core/permissions/package.json # packages/core/strapi/package.json # packages/core/types/package.json # packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/__snapshots__/index.test.jsx.snap # packages/core/upload/admin/src/pages/App/ConfigureTheView/components/tests/__snapshots__/Settings.test.jsx.snap # packages/core/upload/admin/src/pages/App/ConfigureTheView/tests/__snapshots__/ConfigureTheView.test.jsx.snap # packages/core/upload/package.json # packages/core/upload/server/services/provider.js # packages/core/upload/server/services/upload.js # packages/core/upload/server/src/services/image-manipulation.ts # packages/core/upload/server/tsconfig.eslint.json # packages/core/utils/package.json # packages/generators/app/package.json # packages/generators/app/src/utils/db-client-dependencies.ts # packages/generators/generators/package.json # packages/plugins/cloud/package.json # packages/plugins/color-picker/package.json # packages/plugins/documentation/package.json # packages/plugins/graphql/package.json # packages/plugins/i18n/admin/src/components/LocaleListCell.tsx # packages/plugins/i18n/admin/src/contentReleasesHooks/releaseDetailsView.ts # packages/plugins/i18n/admin/src/index.ts # packages/plugins/i18n/package.json # packages/plugins/sentry/package.json # packages/plugins/users-permissions/package.json # packages/providers/email-amazon-ses/package.json # packages/providers/email-mailgun/package.json # packages/providers/email-nodemailer/package.json # packages/providers/email-sendgrid/package.json # packages/providers/email-sendmail/package.json # packages/providers/upload-aws-s3/package.json # packages/providers/upload-cloudinary/package.json # packages/providers/upload-local/package.json # packages/utils/api-tests/package.json # packages/utils/eslint-config-custom/package.json # packages/utils/logger/package.json # packages/utils/tsconfig/package.json # packages/utils/typescript/package.json # packages/utils/upgrade/LICENSE # packages/utils/upgrade/bin/upgrade.js # packages/utils/upgrade/package.json # packages/utils/upgrade/packup.config.ts # scripts/front/package.json # tests/e2e/constants.ts # tests/e2e/tests/content-releases/releases-page.spec.ts # yarn.lock