yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 20:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,133 Commits 117 Branches 489 Tags
Commit Graph

12382 Commits

Author SHA1 Message Date
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
Jamie Howard
47a020ef72 test(ee) 2023-06-09 14:43:28 +01:00
Jamie Howard
f05762e2e8 feature(ee): modify webhook payload 2023-06-09 14:41:22 +01:00
Bassel Kanso
94b79d41b4
Merge branch 'main' into fix/transfer-push-stuck 2023-06-09 16:38:58 +03:00
Jamie Howard
9e4bf7f97b fix(ee): update order mistake 2023-06-09 14:33:27 +01:00
Jamie Howard
ed5fe3766d fix(ee): entity service decorator tests 2023-06-09 14:25:19 +01:00
Jamie Howard
0bba0878f4 chore: rename webhook event 2023-06-09 14:23:57 +01:00
Christian Capeans
37ec6abc3c Delete sending null in the assets transfer 2023-06-09 15:03:54 +02:00
Marc-Roig
7a80dfa0d5
chore: fix styling 2023-06-09 10:54:12 +02:00
Marc-Roig
7ad44c8699
Merge branch 'main' into fix/rbac-condition-and-relations 2023-06-09 10:32:42 +02:00
Convly
4726734b52 Add back the common service type 2023-06-09 10:00:12 +02:00
Convly
78e6952af9 Fix relation attribute type, add back relation and target properties 2023-06-09 09:57:21 +02:00
Marc-Roig
c6d273be82
chore: move deprecated tag 2023-06-09 09:02:34 +02:00
Marc-Roig
f04dd1ade5
chore: add deprecated jsdoc tag 2023-06-09 08:58:10 +02:00
Marc-Roig
d18762de62
fix: keep webhook events object and print a warning error 2023-06-09 08:43:49 +02:00
GitStart
761f0c7803
Merge branch 'main' into fix/ctb-removes-hidden-fields 2023-06-09 05:22:42 +01:00
Marc
f7c15a991f
Merge pull request #16932 from strapi/feature/rw-assignee-put-route 2023-06-08 17:46:09 +02:00
dependabot[bot]
9699edeefe
chore(deps): bump stream-json from 1.7.4 to 1.8.0 
Bumps [stream-json](https://github.com/uhop/stream-json) from 1.7.4 to 1.8.0.
- [Commits](https://github.com/uhop/stream-json/compare/1.7.4...1.8.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-08 15:38:38 +00:00
Ben Irvin
e321cba19b
Merge pull request #16912 from strapi/dependabot/npm_and_yarn/semver-and-types/semver-7.5.1 2023-06-08 17:36:19 +02:00
Jamie Howard
ccde1a4466 feature(ee): add review workflow stage change event to webhook form 2023-06-08 15:34:25 +01:00
Jamie Howard
0f15960636 feature(ee): emit workflow stage change webhook event 2023-06-08 12:39:52 +01:00
Christian
6494068ba1
Update packages/core/strapi/lib/types/core-api/controller.d.ts 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-06-08 12:02:20 +02:00
Christian Capeans
f0aaefbf5f Merge branch 'ts-support/controllers' of https://github.com/strapi/strapi into ts-support/controllers 2023-06-08 11:53:22 +02:00
Christian Capeans
af61b69c3e Replace types for interfaces where needed 2023-06-08 11:53:12 +02:00
Jamie Howard
70f3dbf97a chore: code cleanup 2023-06-08 09:51:49 +01:00
Bassel
2282ba810a Merge branch 'main' into fix/sso-lock-out-option 2023-06-08 11:46:28 +03:00