yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-11 10:18:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,487 Commits 114 Branches 488 Tags
Commit Graph

28487 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc
fbad5cd13c
Merge branch 'main' into fix/publish-webhook-with-publishedAt 2023-03-03 10:25:01 +01:00
Fernando Chávez
6b493cd023
Merge pull request #15963 from strapi/docs/useCustomFields 
Add new page to helper-plugin's storybook about useCustomFields hook
 2023-03-02 14:30:58 +01:00
Fernando Chavez
a6a9fc1648 improves to useCustomFields typescript 2023-03-02 13:59:10 +01:00
Alexandre BODIN
97536d9a3f
Merge pull request #15473 from strapi/dependabot/npm_and_yarn/vscode/sqlite3-5.1.2 2023-03-02 13:36:17 +01:00
Alexandre BODIN
61824d2eeb
Merge pull request #15888 from strapi/dependabot/npm_and_yarn/tar-and-types/tar-6.1.13 2023-03-02 13:35:32 +01:00
Fernando Chávez
24fa0fbf32
Update packages/core/helper-plugin/lib/src/hooks/useCustomFields/useCustomFields.stories.mdx 
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
 2023-03-02 13:25:14 +01:00
Fernando Chávez
ac15879247
Update packages/core/helper-plugin/lib/src/hooks/useCustomFields/useCustomFields.stories.mdx 
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
 2023-03-02 13:24:44 +01:00
dependabot[bot]
a4bd8b57b2
chore(deps): bump tar and @types/tar 
Bumps [tar](https://github.com/npm/node-tar) and [@types/tar](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/tar). These dependencies needed to be updated together.

Updates `tar` from 6.1.12 to 6.1.13
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v6.1.12...v6.1.13)

Updates `@types/tar` from 6.1.3 to 6.1.4
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/tar)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: "@types/tar"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-02 10:58:42 +00:00
Josh
63c0993e93
Merge pull request #15968 from strapi/chore/add-all-undeclared-packages 2023-03-02 10:54:55 +00:00
Alexandre BODIN
492849255f
Merge pull request #15869 from strapi/dependabot/npm_and_yarn/ci-info-3.8.0 2023-03-02 11:28:13 +01:00
Sora Morimoto
930a3afec7 chore: Add all undeclared packages to package.json 
This reverts commit 6c283862daa0c8846a544c183e72623b65907cc3.

chore: Add all undeclared packages to package.json

Add all undeclared packages to package.json (Round 2)

Signed-off-by: Sora Morimoto <sora@morimoto.io>

chore: move core deps to peer

codemirror5

Signed-off-by: Sora Morimoto <sora@morimoto.io>

Add all undeclared packages to `package.json` (Round 2)

Signed-off-by: Sora Morimoto <sora@morimoto.io>

_

Signed-off-by: Sora Morimoto <sora@morimoto.io>

Add all undeclared "safe" packages to `package.json`

Signed-off-by: Sora Morimoto <sora@morimoto.io>

Add all undeclared "unsafe" packages to `package.json`

Signed-off-by: Sora Morimoto <sora@morimoto.io>

helper-plugin: remove `fs-extra`

Signed-off-by: Sora Morimoto <sora@morimoto.io>

https://github.com/strapi/strapi/pull/15797

i18n-plugin: move redux from devDependencies to dependencies

Signed-off-by: Sora Morimoto <sora@morimoto.io>

database: sqlite3 was a false-detected dependency

Signed-off-by: Sora Morimoto <sora@morimoto.io>

generators: revert changes

Signed-off-by: Sora Morimoto <sora@morimoto.io>

Regenerate yarn.lock

Signed-off-by: Sora Morimoto <sora@morimoto.io>

chore: update react-intl

chore: fix post rebase

chore: remove axios from packages that dont need it

chore: ensure projects install r rd rrd & s

Revert "chore: ensure projects install r rd rrd & s"

This reverts commit 2e87a1d0fcaf21e187ce558f4690d41ff854d58d.

Revert "Revert "chore: ensure projects install r rd rrd & s""

This reverts commit b53a3d49987b00abb393966738d2a34f59c9dc71.

chore: Add all undeclared packages to package.json
 2023-03-02 10:12:14 +00:00
dependabot[bot]
c980d94258
chore(deps): bump @vscode/sqlite3 from 5.0.8 to 5.1.2 
Bumps [@vscode/sqlite3](https://github.com/microsoft/vscode-node-sqlite3) from 5.0.8 to 5.1.2.
- [Release notes](https://github.com/microsoft/vscode-node-sqlite3/releases)
- [Commits](https://github.com/microsoft/vscode-node-sqlite3/commits)

---
updated-dependencies:
- dependency-name: "@vscode/sqlite3"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-02 10:11:56 +00:00
Josh
3c378b9c5b
Merge pull request #15967 from strapi/chore/remove-stack-from-repo 2023-03-02 10:10:57 +00:00
Alexandre BODIN
f50ecb1443
Merge pull request #15868 from strapi/dependabot/npm_and_yarn/reselect-4.1.7 2023-03-02 11:08:19 +01:00
Josh
09ff54bc6e chore: convert Stack components to Flex 
chore: update snapshots

chore: convert rest of files to use Flex

chore: fix duplicate import

chore: update snapshots

chore: add eslint rule for stack

refactor: catch other Stack component uses

chore: remove horizontal prop
 2023-03-02 10:02:40 +00:00
Fernando Chavez
b2e5f90da7 remove unnecessary storybook imports 2023-03-02 11:00:20 +01:00
Fernando Chavez
47e0709cd2 add methods and typescript declaration to the docs 2023-03-02 10:58:06 +01:00
dependabot[bot]
a2a40506b0
chore(deps): bump ci-info from 3.5.0 to 3.8.0 
Bumps [ci-info](https://github.com/watson/ci-info) from 3.5.0 to 3.8.0.
- [Release notes](https://github.com/watson/ci-info/releases)
- [Changelog](https://github.com/watson/ci-info/blob/master/CHANGELOG.md)
- [Commits](https://github.com/watson/ci-info/compare/v3.5.0...v3.8.0)

---
updated-dependencies:
- dependency-name: ci-info
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-02 09:27:31 +00:00
Alexandre Bodin
435362adab Merge branch 'releases/4.7.1-hotfix' v4.7.1 2023-03-02 10:25:29 +01:00
Alexandre Bodin
0307fb4bf7 v4.7.1 2023-03-02 10:24:10 +01:00
Marc
6662580bf0
Merge pull request #15950 from strapi/fix/improve-is-private-attribute-performance 2023-03-02 09:45:54 +01:00
Alexandre BODIN
f1bf47f692
Merge pull request #15962 from strapi/hotfix/missing-license-seats 2023-03-02 09:39:19 +01:00
Alexandre Bodin
e56b0061c7 Make checks stricter 2023-03-02 09:19:25 +01:00
Marc
8ac67d6b8b
Update packages/core/utils/lib/content-types.js 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2023-03-02 09:17:44 +01:00
Fernando Chavez
5896480c22 Add new page to helper-plugin's storybook about useCustomFields 2023-03-02 09:06:48 +01:00
Alexandre Bodin
24901be60b Fix license seat undefined block user creation 2023-03-01 20:13:22 +01:00
Jamie Howard
78a155b972
Merge pull request #15958 from strapi/fix/CM-component-categories 2023-03-01 15:45:23 +00:00
Jamie Howard
17210958d8
Merge pull request #15916 from manfwh/main 2023-03-01 12:13:15 +00:00
Jamie Howard
5925ace19a fix(content-manager): typo when returning a component category 2023-03-01 12:08:52 +00:00
Marc-Roig
571ed83628 use optional chaining on isPrivateAttribute 2023-02-28 16:38:33 +01:00
Christian
5c9a88be04
Merge pull request #15911 from strapi/docs/how-to-install-packages 2023-02-28 11:01:18 +01:00
Christian
88a518df52
Merge pull request #15941 from strapi/fix/dbGeneratedConfig 2023-02-28 09:48:47 +01:00
Marc-Roig
37e980fc7e send entity with updates in it in publish webhook 2023-02-28 09:19:26 +01:00
DMehaffy
999c16f24e
Fix db generated config - pg port 
PG port was wrong when generating the database.js config it was using 3306 instead of 5432 as the default
 2023-02-27 20:07:01 -07:00
Convly
948dbb3121 v4.7.0 v4.7.0 2023-02-27 20:33:14 +01:00
Jean-Sébastien Herbaux
8cdc2b4d64
Merge pull request #15607 from strapi/features/data-transfer 2023-02-27 19:39:03 +01:00
Convly
b502f188b5 Fix unit test 2023-02-27 19:30:26 +01:00
Jean-Sébastien Herbaux
03cb2b91ae
Merge pull request #15935 from strapi/data-transfer/disable-transfer-when-missing-salt 2023-02-27 19:14:14 +01:00
Convly
9afb0ad86d Check token salt on hash 2023-02-27 19:10:04 +01:00
Simone
d781fee4c7
Merge pull request #15934 from strapi/data-transfer/fix-translations 
Fix translations and remove useless file
 2023-02-27 19:07:16 +01:00
Convly
ae23359954 Emit a warning when the feature is enabled but salt is not set 2023-02-27 18:55:16 +01:00
Simone Taeggi
d8b3e5559f fix missing translations, remove unused file 2023-02-27 18:41:50 +01:00
Ben Irvin
13099b4c55 Send error status when token salt not set 
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
 2023-02-27 17:56:23 +01:00
Fernando Chávez
e66228b24c
Merge pull request #15926 from strapi/fix/display-name-on-audit-logs 
[Audit Logs] Use username or email on audit logs page
 2023-02-27 16:27:36 +01:00
Convly
928cfe9928 Merge branch 'releases/4.7.0' into features/data-transfer 2023-02-27 16:12:27 +01:00
Convly
e366e030c5 Fix conflict for en translation 2023-02-27 16:10:52 +01:00
Convly
98c0b9f500 Merge branch 'main' into releases/4.7.0 2023-02-27 16:09:41 +01:00
Ben Irvin
509e97bd02
Merge pull request #15928 from strapi/data-transfer/fix-uuid-err 2023-02-27 15:14:51 +01:00
Fernando Chavez
793df833bb fix test failing 2023-02-27 15:08:14 +01:00
Alexandre BODIN
d6098036a3
Merge pull request #15929 from strapi/chore/ee-users-delete-reload 2023-02-27 14:52:08 +01:00