yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-22 14:59:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,188 Commits 125 Branches 496 Tags
Commit Graph

9448 Commits

Author SHA1 Message Date
Alexandre BODIN
b9e92de1af
Merge pull request #15976 from strapi/chore/fix-invalid-path 
Fix invalid require using internal paths
 2023-03-03 18:41:11 +01:00
Marc
399806ef2c
Merge pull request #15942 from strapi/fix/publish-webhook-with-publishedAt 2023-03-03 17:18:47 +01:00
Alexandre Bodin
e789cd81f3 Avoid local strapi conflicting with global 2023-03-03 17:17:02 +01:00
Christian Capeans
3093fa32f1 Refactor the push handler for the data transfer 
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
 2023-03-03 17:16:24 +01:00
Alexandre Bodin
5992d968eb Update requires 2023-03-03 17:03:45 +01:00
Josh
3234fcc61d
Merge pull request #15900 from strapi/fix/relations-caching-between-locales 2023-03-03 15:42:28 +00:00
Marc
6846491a30
Merge branch 'main' into fix/publish-webhook-with-publishedAt 2023-03-03 16:17:36 +01:00
Josh
0c2aa6d5bc fix: add default params to cache key to avoid flickering of unlocalised relations 2023-03-03 15:02:55 +00:00
Josh
08160f1943 fix: alignment should be center not flex-start 2023-03-03 14:26:54 +00:00
Josh
cad6fb7429 chore: remove unnecessary test 2023-03-03 14:17:23 +00:00
Josh
f4f2b5ab2e fix: dont merge the state if the ID changes 
fix: dont merge the state if the ID changes

fix: pass id to querykey & add cleanup method to useRelation hook

fix: pass defaultParams as part of the cache key

Revert "fix: reset cache for `relation` keys in i18n plugin"

This reverts commit 34b2fd9fabfcb93fb9f416616802e10b79133112.

fix: pass defaultParams as part of the cache key

chore: spread cachekey in search query

fix: move logic to useRelations hook that handles removing from the store.

fix: broken test

refactor: rename method to onUnmount
 2023-03-03 14:17:23 +00:00
dependabot[bot]
6b19d1bf42
Bump react-select from 5.6.0 to 5.7.0 
Bumps [react-select](https://github.com/JedWatson/react-select) from 5.6.0 to 5.7.0.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@5.6.0...react-select@5.7.0)

---
updated-dependencies:
- dependency-name: react-select
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-03 14:13:10 +00:00
Josh
05a83874c1
Merge pull request #15972 from strapi/chore/update-DS 2023-03-03 14:09:55 +00:00
Ben Irvin
927e21bde7 refactor and fix tests 2023-03-03 14:40:44 +01:00
Marc
c942ca2564
Update entity-manager.js 2023-03-03 14:02:56 +01:00
Marc
8c1ec39e8d
Update entity-manager.js 2023-03-03 14:02:44 +01:00
Ben Irvin
ef21662b79 catch errors from graceful abort 2023-03-03 12:38:58 +01:00
Ben Irvin
70013c4a61 remove delay 2023-03-03 12:37:50 +01:00
Ben Irvin
68522cbeb9 remove delay 2023-03-03 12:37:22 +01:00
Ben Irvin
c7bdb421f3 catch signals within transfer process to abort gracefully 2023-03-03 12:18:03 +01:00
dependabot[bot]
64e484f494
chore(deps): bump glob from 7.2.0 to 7.2.3 
Bumps [glob](https://github.com/isaacs/node-glob) from 7.2.0 to 7.2.3.
- [Release notes](https://github.com/isaacs/node-glob/releases)
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v7.2.0...v7.2.3)

---
updated-dependencies:
- dependency-name: glob
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-03 10:11:25 +00:00
dependabot[bot]
875a2cb7ba
chore(deps): bump chalk from 4.1.1 to 4.1.2 
Bumps [chalk](https://github.com/chalk/chalk) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/chalk/chalk/releases)
- [Commits](https://github.com/chalk/chalk/compare/v4.1.1...v4.1.2)

---
updated-dependencies:
- dependency-name: chalk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-03 10:09:15 +00:00
Marc
fbad5cd13c
Merge branch 'main' into fix/publish-webhook-with-publishedAt 2023-03-03 10:25:01 +01:00
Christian Capeans
2892fa55fa Refactor controllers logic to handle pull transfer 
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
 2023-03-03 09:49:46 +01:00
Cameron Paczek
0da597202f enfoce name to be supplied when removing cron jobs 2023-03-02 14:28:36 -08:00
Cameron Paczek
99d50d8447 add ability to list jobs 2023-03-02 14:24:46 -08:00
Alexandre Bodin
dee0e195c1 Fix invalid require using internal paths 2023-03-02 22:16:29 +01:00
Ben Irvin
606a88e5f2 add jsdoc 2023-03-02 17:56:05 +01:00
Ben Irvin
a1f34b312a cancelling prompts is treated as error 2023-03-02 17:42:43 +01:00
Ben Irvin
a9620ba6e4 aborting prompts displays as error 2023-03-02 17:34:47 +01:00
Bassel Kanso
6e7b9980c9
Merge branch 'main' into fix/transfer-wrong-url 2023-03-02 16:42:42 +02: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
Bassel
687c4d0fd6 don't send headers to websocket if it's undefined 2023-03-02 15:22:51 +02:00
Josh
d209390fbe chore: update DS to 1.6.4 2023-03-02 13:17:01 +00:00
Fernando Chavez
a6a9fc1648 improves to useCustomFields typescript 2023-03-02 13:59:10 +01:00
Bassel
ab5f2f4b8e Merge branch 'main' into fix/transfer-wrong-url 2023-03-02 14:56:53 +02:00
Bassel
bf6c00cadd send more details in error message 2023-03-02 14:56:20 +02: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
Bassel
944ddfb190 capture websocket connection error and throw correct error 2023-03-02 13:47:50 +02: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
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
Andrew Luca
73f6631a92 Add oneOf env helper for union values 2023-03-02 11:57:59 +02:00