yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-13 03:07:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,106 Commits 116 Branches 488 Tags
Commit Graph

4809 Commits

Author SHA1 Message Date
markkaylor
39e41973a8
Merge branch 'main' into fix/audit-logs-test-error 2023-03-08 13:22:22 +05:30
Simone Taeggi
6bdbe17068 upgrade the design-system and icons dependencies, the snapshots and a failing unit test 2023-03-07 18:13:28 +01:00
Alexandre Bodin
b1d1a6a272 Merge branch 'main' of github.com:strapi/strapi into chore/rbac-ce 2023-03-07 16:19:54 +01:00
Simone Taeggi
b6ea2a544e Merge branch 'main' into data-transfer/limit-token-name-length 2023-03-07 16:08:35 +01:00
Josh
edc8c32056 chore: replace spacing with gap 
chore: update snapshots

fix: css on roles settings
 2023-03-07 14:27:20 +00:00
Alexandre Bodin
3d554829db Merge branch 'main' of github.com:strapi/strapi into chore/rbac-ce 2023-03-07 14:46:37 +01:00
Alexandre Bodin
11821500d2 Update FE snapshot 2023-03-07 14:17:01 +01:00
Josh
6b07ba03c0
Merge pull request #15969 from strapi/dependabot/npm_and_yarn/react-select-5.7.0 2023-03-07 09:18:56 +00:00
Josh
024758e731 chore: update snapshots for react-select classNames 2023-03-07 08:35:27 +00:00
Marc
c90c7ee82a
Merge pull request #15978 from strapi/dependabot/npm_and_yarn/chalk-4.1.2 2023-03-07 09:18:45 +01:00
Alexandre Bodin
e3a4b431ba clean comment 2023-03-07 08:41:07 +01:00
Alexandre Bodin
8278afe3f3 Merge branch 'main' of github.com:strapi/strapi into chore/rbac-ce 2023-03-07 08:27:15 +01:00
markkaylor
a3ad977212
Merge branch 'main' into fix/audit-logs-test-error 2023-03-07 08:46:39 +05:30
Mark Kaylor
6e96e68a87 Fix tbody cannot appear as child of div error 2023-03-07 08:42:24 +05:30
Alexandre Bodin
6c36872dd2 Fix test 2023-03-06 22:17:56 +01:00
Alexandre Bodin
6a003d738c Move frontend 2023-03-06 22:15:57 +01:00
Alexandre Bodin
e0e2084422 Move RBAC into CE 2023-03-06 21:46:45 +01:00
Sergio Peña
50235362be Fix some traslations removing dots 2023-03-06 17:59:13 +00:00
Fernando Chavez
0578e6e19b reduce scope of audit logs test to only test audit logs feature 2023-03-06 17:47:33 +01:00
Rémi de Juvigny
08e1d1a54a Use internal service state 2023-03-06 12:24:30 +01:00
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
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
Josh
3234fcc61d
Merge pull request #15900 from strapi/fix/relations-caching-between-locales 2023-03-03 15:42:28 +00: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
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
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
Alexandre Bodin
dee0e195c1 Fix invalid require using internal paths 2023-03-02 22:16:29 +01:00
Josh
d209390fbe chore: update DS to 1.6.4 2023-03-02 13:17:01 +00:00
Josh
63c0993e93
Merge pull request #15968 from strapi/chore/add-all-undeclared-packages 2023-03-02 10:54:55 +00: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
Alexandre Bodin
435362adab Merge branch 'releases/4.7.1-hotfix' 2023-03-02 10:25:29 +01:00
Alexandre Bodin
0307fb4bf7 v4.7.1 2023-03-02 10:24:10 +01:00
Alexandre Bodin
e56b0061c7 Make checks stricter 2023-03-02 09:19:25 +01:00
Alexandre Bodin
24901be60b Fix license seat undefined block user creation 2023-03-01 20:13:22 +01:00
Simone
46c1eef111
Merge branch 'main' into data-transfer/limit-token-name-length 2023-03-01 14:23:25 +01:00
Jamie Howard
17210958d8
Merge pull request #15916 from manfwh/main 2023-03-01 12:13:15 +00:00
Simone Taeggi
da8e3d91d5 Merge branch 'main' into data-transfer/limit-token-name-length 2023-02-28 10:01:19 +01:00
Convly
948dbb3121 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