yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-05 11:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,468 Commits 145 Branches 512 Tags
Commit Graph

31468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustav Hansen
c86d26d25a
Merge pull request #16985 from strapi/chore/eslint-sort-imports-front 
Chore: Auto-sort imports using eslint
 2023-06-19 09:18:51 +02:00
dependabot[bot]
e54595c02c
chore(deps): bump aws-sdk from 2.1372.0 to 2.1399.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1372.0 to 2.1399.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1372.0...v2.1399.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-18 23:01:53 +00:00
GitStart
36aa7d250a
Merge branch 'main' into fix/ctb-removes-hidden-fields 2023-06-15 16:13:06 +01:00
Gustav Hansen
02915b3cf0 Enhancement: Replace ee_else_ce imports with useEnterprise in auth 2023-06-13 07:16:45 +02:00
Gustav Hansen
7de42f7030 Chore: Align variable names 2023-06-13 06:54:59 +02:00
Gustav Hansen
a57127c47a Chore: Cleanup utils 2023-06-13 06:52:37 +02:00
Gustav Hansen
005f91bdcc Chore: Replace role layout ee_else_ce imports with useEnterprise 2023-06-13 06:49:02 +02:00
Gustav Hansen
a1fbbee8f7 Chore: Replace ee_else_ce imports in users list 2023-06-13 06:42:22 +02:00
Gustav Hansen
721318eed1 Docs: Add contributor docs for the userEnterprise hook 2023-06-13 06:28:00 +02:00
Gustav Hansen
96948e0d1e Chore: Update snapshot tests 2023-06-12 22:10:54 +02:00
Gustav Hansen
dca5778d8e Chore: Apply eslint import sorting fix 2023-06-12 21:34:07 +02:00
Gustav Hansen
dfbe582cd7 Chore: Add eslint simple-sort plugin 2023-06-12 21:34:06 +02:00
dependabot[bot]
cfddbe3d20
chore(deps): bump winston from 3.3.3 to 3.9.0 
Bumps [winston](https://github.com/winstonjs/winston) from 3.3.3 to 3.9.0.
- [Release notes](https://github.com/winstonjs/winston/releases)
- [Changelog](https://github.com/winstonjs/winston/blob/master/CHANGELOG.md)
- [Commits](https://github.com/winstonjs/winston/compare/v3.3.3...v3.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-12 15:29:42 +00:00
Jamie Howard
89dad0d065 fix(ee): tests 2023-06-12 16:29:12 +01:00
Jean-Sébastien Herbaux
aea0ea8350
Merge pull request #16990 from strapi/releases/4.11.1 2023-06-12 17:27:43 +02:00
Jean-Sébastien Herbaux
c9660789fc
Merge pull request #16989 from strapi/feat/release_4.11.1 2023-06-12 17:26:03 +02:00
Jamie Howard
4dd26a2445 feature(ee): emit workflow id with stage change event 2023-06-12 16:24:09 +01:00
Marc-Roig
ae3463646d
update: yarn lock 2023-06-12 17:14:00 +02:00
Marc-Roig
6cdb5a7737
v4.11.1 v4.11.1 2023-06-12 17:10:44 +02:00
Gustav Hansen
9d554ec9aa
Merge pull request #16986 from strapi/fix/use-enterprise-tests 
test: remove erroneous act calls
 2023-06-12 16:02:18 +02:00
Gustav Hansen
11f5c5a852
Merge pull request #16984 from strapi/chore/eslint-cleanup-front 
Chore: Cleanup eslint/front configuration
 2023-06-12 16:00:43 +02:00
Josh
f5a9528422 test: update to remove act calls 2023-06-12 14:55:22 +01:00
Josh
7df9fa2da1
refactor: use version 2 of breadcrumbs in anticipation of deprecation (#16981) 2023-06-12 14:42:27 +01:00
Gustav Hansen
9e56a694dc Chore: Cleanup eslint/front configuration 2023-06-12 15:15:11 +02:00
Convly
0b01fbf9cc Fix type for the generic core api service 2023-06-12 15:08:53 +02:00
Gustav Hansen
0f7ea43985 Chore: Simplify settings router defaults 2023-06-12 13:48:48 +02:00
Gustav Hansen
588b9cc816 Chore: Add tests for useEnterprise() hook 2023-06-12 13:48:48 +02:00
Gustav Hansen
49629b147b Chore: Replace ee_else_ce babel plugin for auth router 2023-06-12 13:40:40 +02:00
Gustav Hansen
f60ef2c0a8 Chore: Start using useEnterprise to load the settings router 2023-06-12 13:40:40 +02:00
Gustav Hansen
5b4c13c99a Enhancement: Ass userEnterprise() hook 2023-06-12 12:59:21 +02:00
Convly
5b3cbdce9d Fix type for the core api service 2023-06-12 12:35:50 +02:00
Jean-Sébastien Herbaux
30e56b8376
Merge pull request #16917 from strapi/features/type-system 2023-06-12 11:48:28 +02:00
markkaylor
01e461d267
Merge pull request #16979 from strapi/fix/marketplace-stats 2023-06-12 11:24:54 +02:00
Marc
cc4f58ce38
Merge pull request #16552 from strapi/fix/remove-persisted-tables-from-store 2023-06-12 10:53:21 +02:00
Nathan Pichon
e4e2a310e2
fix(review-workflows): display review workflows informations in content-manager when needed (#16919) 
* chore: update example schemas

* fix(content-manager): merge data instead of overwrite nested objects

* feat(content-manager): add options object in the configuration object

* feat(review-workflow): add the review workflows option in the configuration of content-manager

* fix(content-manager): use review workflows option value in edit-view

* test(workflows): update mocks

* test(info-box): update mocks

* chore: add comments for utils in content-manager

* test(content-manager): add tests on content-types service

* fix(review-workflows): merge configuration before updating it

* docs(review-workflows): add comments about why we merge configuration of CTs

* refactor(review-workflows): extract updateContentTypeConfig function

* test(workflows): update mock

* fix(review-workflows): remove infinite loop

* fix(review-workflows): use findConfiguration instead of getConfiguration

* test(review-workflows): change plural name of long content type

* test(review-workflows): skip long ct name test
 2023-06-12 10:52:52 +02:00
Marc
6a14ac1b76
Merge pull request #16940 from strapi/docs/fix-acl-expire-time-s3 2023-06-12 10:52:25 +02:00
Convly
1e91d9b498 Review comments 2023-06-12 10:51:45 +02:00
mofahsan
77ffce9776
Merge branch 'main' into fix/register-api-routes-undefined-error 2023-06-12 14:04:52 +05:30
Mark Kaylor
6aef176bd9 Update snapshots 2023-06-12 09:57:53 +02:00
Mark Kaylor
f84609a1e9 Fix lineHeight breaking card spacing 2023-06-12 09:49:28 +02:00
Convly
2f6b153153 Merge branch 'releases/4.11.1' into features/type-system 2023-06-12 09:40:11 +02:00
Gustav Hansen
d8238ee6e7
Merge pull request #16975 from strapi/dependabot/npm_and_yarn/eslint-8.42.0 
chore(deps-dev): bump eslint from 8.41.0 to 8.42.0
 2023-06-12 09:34:44 +02:00
Convly
72d87345b4 Use types instead of scalar for boolean values 2023-06-12 09:32:46 +02:00
Convly
a238c9705d Fix js support 2023-06-12 09:26:00 +02:00
dependabot[bot]
ec6bdbfbe5
chore(deps-dev): bump eslint from 8.41.0 to 8.42.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.41.0 to 8.42.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.41.0...v8.42.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-12 07:08:30 +00:00
Gustav Hansen
336b7c78f8
Merge pull request #16977 from strapi/dependabot/npm_and_yarn/core-js-3.31.0 
chore(deps-dev): bump core-js from 3.30.1 to 3.31.0
 2023-06-12 08:59:11 +02:00
Gustav Hansen
abae689067
Merge pull request #16976 from strapi/dependabot/npm_and_yarn/webpack-5.86.0 
chore(deps): bump webpack from 5.82.0 to 5.86.0
 2023-06-12 08:58:40 +02:00
dependabot[bot]
1f1ff68dc7
chore(deps-dev): bump core-js from 3.30.1 to 3.31.0 
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.30.1 to 3.31.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.31.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-11 23:03:40 +00:00
dependabot[bot]
25eb067e06
chore(deps): bump webpack from 5.82.0 to 5.86.0 
Bumps [webpack](https://github.com/webpack/webpack) from 5.82.0 to 5.86.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.82.0...v5.86.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-11 23:01:49 +00:00
Convly
f427c244eb Merge branch 'main' into features/type-system 2023-06-09 18:58:03 +02:00