yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-05 23:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,846 Commits 112 Branches 487 Tags
Commit Graph

12157 Commits

Author SHA1 Message Date
Marc-Roig
d08f6cffbf
Merge branch 'main' into fix/rbac-condition-and-relations 2023-06-19 11:37:26 +02:00
Gustav Hansen
0a3ba688c9 Merge branch 'main' into enhancement/use-enterprise-hook-users-list 2023-06-19 11:19:04 +02:00
Gustav Hansen
86eaf9f728
Merge pull request #16871 from strapi/enhancement/use-enterprise-hook 
POC: Add useEnterprise() hook; refactor settings router
 2023-06-19 11:04:25 +02:00
Jamie Howard
98835a7df6
Merge pull request #16988 from strapi/rw-assignee/remove-react-select 2023-06-19 09:46:06 +01:00
Convly
c0d1646e96 Merge branch 'main' into fix/strapi-service-loose-type 2023-06-19 09:58:24 +02:00
Convly
52626f52b9 Add comment to explain context about the common.service any use 2023-06-19 09:57:47 +02:00
Bassel Kanso
bc0617860d
Merge pull request #16870 from mofahsan/fix/register-api-routes-undefined-error 
Fix: Handle undefined routes in registerAPIRoutes forEach loop
 2023-06-19 10:54:56 +03:00
Convly
e26c1c122b Make the abstract service type looser to allow unsafe calls 2023-06-19 09:45:04 +02:00
Gustav Hansen
0cb8977cdf Merge branch 'main' into enhancement/use-enterprise-hook 2023-06-19 09:32:25 +02:00
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
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
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
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
Jamie Howard
4dd26a2445 feature(ee): emit workflow id with stage change event 2023-06-12 16:24:09 +01:00
Marc-Roig
6cdb5a7737
v4.11.1 2023-06-12 17:10:44 +02:00
Jamie Howard
f433f1becc Merge remote-tracking branch 'origin/main' into rw-assignee/remove-react-select 2023-06-12 15:45:09 +01: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
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
markkaylor
01e461d267
Merge pull request #16979 from strapi/fix/marketplace-stats 2023-06-12 11:24:54 +02:00
Jamie Howard
102e766e20 Merge remote-tracking branch 'origin/feature/review-workflow-assignee' into feature/review-workflow-assignee-list-view-fe 2023-06-12 10:02:10 +01: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
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
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]
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
Marc
3bfe1c913c
Merge pull request #16964 from strapi/fix/keep-webhook-event-list 2023-06-09 17:40:43 +02:00
Bassel Kanso
60c5f18f6d
Merge pull request #16773 from strapi/fix/transfer-push-stuck 
[DTS] Retry sending messages if no response was recieved
 2023-06-09 18:23:29 +03:00
Josh
ce0cc74e94
fix: dynamic zone component data (#16969) 2023-06-09 15:45:06 +01:00
Josh
80258ecc38
chore: remove react-select from RW & ban with ESlint (#16951) 2023-06-09 15:10:52 +01:00
Convly
820da82762 Fix relation attribute type (mappedBy and inversedBy), make it compatible with Attribute.Any 2023-06-09 16:07:34 +02:00