yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 00:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 113 Branches 488 Tags
Commit Graph

23125 Commits

Author SHA1 Message Date
Marc-Roig
b08c6467ae set ACL parameter 2023-02-14 19:02:00 +01:00
Marc-Roig
1587ea3785 document new aws s3 params 2023-02-14 19:01:30 +01:00
Rémi de Juvigny
839d677c8f Remove the associated actions 2023-02-14 18:52:53 +01:00
Jean-Sébastien Herbaux
1472a5369c
Merge pull request #15801 from strapi/data-transfer/remote-protocol-restrictions 2023-02-14 18:43:55 +01:00
Marc
ffd0a21514
Merge pull request #15541 from strapi/S3-provider-update 2023-02-14 18:22:29 +01:00
Marc-Roig
9a948e7f7e fix 2023-02-14 18:20:16 +01:00
dogusdeniz
46e0276eda
Merge branch 'main' into v4/generator-migration 2023-02-14 20:14:11 +03:00
Josh
7ff91c2cbb
Merge branch 'main' into fix/plugin-templates 2023-02-14 16:28:11 +00:00
Nathan Pichon
d66cec9367
Merge branch 'main' into feature/async-reduce-utils 2023-02-14 16:58:11 +01:00
nathan-pichon
5029344805
feat(async-utils): use curryN instead of curry 2023-02-14 16:55:57 +01:00
Rémi de Juvigny
cbfc5876c7 Delete install and uninstall plugin endpoints 2023-02-14 16:04:16 +01:00
Simone
b0199c8ee3
Merge branch 'main' into enhancement/axios-migration-content-type-builder 2023-02-14 15:59:49 +01:00
Simone Taeggi
39ac1b79b6 add confirmation dialog when deleting an API token or Transfer token 2023-02-14 15:31:32 +01:00
ivanThePleasant
1c9edc61e8
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:37:56 +02:00
ivanThePleasant
c5c3525140
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:37:22 +02:00
ivanThePleasant
a05c82175d
Update packages/core/admin/server/policies/hasLicenseLimitAllowance.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:19:56 +02:00
ivanThePleasant
2a81270bf4
Update packages/core/admin/server/policies/hasLicenseLimitAllowance.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:17:51 +02:00
ivanThePleasant
516340b45a
Update packages/core/admin/server/policies/hasLicenseLimitAllowance.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:17:13 +02:00
ivanThePleasant
09b8fde8eb
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:55:23 +02:00
ivanThePleasant
d3e7172f6a
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:54:09 +02:00
ivanThePleasant
05e285602a
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:48:06 +02:00
ivanThePleasant
9262f5be0c
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:46:31 +02:00
ivanThePleasant
14b76d5d37
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:43:32 +02:00
ivanThePleasant
ac2f0bea4d
Update packages/core/admin/ee/server/controllers/admin.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:42:00 +02:00
ivanThePleasant
df1af817a5 Design changes 2023-02-14 13:40:21 +02:00
dependabot[bot]
fb2094cfb6
chore(deps): bump react-intl from 6.2.7 to 6.2.8 
Bumps [react-intl](https://github.com/formatjs/formatjs) from 6.2.7 to 6.2.8.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/react-intl@6.2.7...react-intl@6.2.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-14 10:24:27 +00:00
Josh
b1839335e3
Merge pull request #15810 from strapi/dependabot/npm_and_yarn/webpack-bundle-analyzer-4.8.0 2023-02-14 10:23:17 +00:00
Convly
e80cfe2363 Update the init check 2023-02-14 11:13:46 +01:00
dependabot[bot]
f9dd84ce69
chore(deps-dev): bump msw from 1.0.0 to 1.0.1 
Bumps [msw](https://github.com/mswjs/msw) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/mswjs/msw/releases)
- [Changelog](https://github.com/mswjs/msw/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mswjs/msw/compare/v1.0.0...v1.0.1)

---
updated-dependencies:
- dependency-name: msw
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-14 10:01:28 +00:00
dependabot[bot]
e142c92e8b
chore(deps-dev): bump webpack-bundle-analyzer from 4.7.0 to 4.8.0 
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 4.7.0 to 4.8.0.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v4.7.0...v4.8.0)

---
updated-dependencies:
- dependency-name: webpack-bundle-analyzer
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-14 09:58:24 +00:00
Rémi de Juvigny
10caa4f811
Merge pull request #15788 from strapi/enhancement/audit-logs-tracking 
Track settings pages usage
 2023-02-14 10:53:19 +01:00
Rémi de Juvigny
f63adf6b48
Merge pull request #15785 from strapi/fix/ce-audit-logs 
Move audit logs permissions to EE
 2023-02-14 10:33:43 +01:00
Marc-Roig
37ef6e7cd6 fix mapping entity when relations are populated 2023-02-14 09:11:10 +01:00
Josh
6339bb32ca chore: make peer deps because of how strapi works 2023-02-14 08:07:05 +00:00
Mark Kaylor
849f16eec6 Remove JSON default values being set by the content manager 2023-02-14 11:55:35 +05:30
Mark Kaylor
1945fd3748 Keep comment 2023-02-14 11:54:05 +05:30
Mark Kaylor
d72d4489cc Fix non required json input setting a value when empty 2023-02-14 11:54:05 +05:30
ivanThePleasant
254ac92425 Part of main branch merge 2023-02-14 00:02:00 +02:00
ivanThePleasant
437690022e Merge branch 'main' into chore/ee-seats 2023-02-14 00:01:02 +02:00
ivanThePleasant
30ac15e2f0 Tests for new hooks 2023-02-13 23:52:12 +02:00
Jamie Howard
d42d7dc058
Merge pull request #15806 from strapi/private-s3-bucket/fix-unit-tests 2023-02-13 17:09:14 +00:00
Josh
4d6c6f7756 chore: just use a span 2023-02-13 16:43:21 +00:00
Jamie Howard
95bc1dc9f0 fix(upload): failing register unit test 2023-02-13 16:40:58 +00:00
Marc-Roig
bbafe2b01d fix conflicts 2023-02-13 17:39:51 +01:00
Marc-Roig
f159f150f2 Merge branch 'feature/private-s3-bucket' into private-s3-bucket/non-mutating-signing 2023-02-13 17:22:14 +01:00
Nathan Pichon
8fae1a80ec
Merge branch 'main' into feature/async-reduce-utils 2023-02-13 16:54:25 +01:00
nathan-pichon
f4ea7d04e3
test(admin-permissions): update snapshot 2023-02-13 16:45:25 +01:00
Jamie Howard
86c08794c5 chore(core): update all translations 2023-02-13 15:25:35 +00:00
Rémi de Juvigny
430461f493
Merge branch 'main' into enhancement/audit-logs-tracking 2023-02-13 14:53:18 +01:00
Rémi de Juvigny
ed12768191 Copy existing handleClickOnLink 2023-02-13 14:52:40 +01:00