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

6461 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Marc-Roig
7a80dfa0d5
chore: fix styling 2023-06-09 10:54:12 +02:00
Marc
f7c15a991f
Merge pull request #16932 from strapi/feature/rw-assignee-put-route 2023-06-08 17:46:09 +02: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
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
Alexandre Bodin
0de06a008d v4.11.0 2023-06-07 17:16:22 +02:00
Bassel
f704024bdf fix failing test 2023-06-07 14:37:22 +03:00
Josh
8357aab46e
chore: fix tests (#16937) 
Co-authored-by: Marc-Roig <marc12info@gmail.com>
 2023-06-07 11:43:09 +01:00
Jamie Howard
4203273a06 fix(ee): allow clearing of assignee select 2023-06-07 11:36:37 +01:00
Bassel
f4908a8a21 remove lodash pick and omit 2023-06-07 13:26:32 +03:00
Marc-Roig
0c295bd6a1
feat: add strapi dependency 2023-06-07 11:45:36 +02:00
Bassel
057cb55f9c remove testids and use labels instead 2023-06-07 12:42:14 +03:00
Convly
106cfafca4 Merge branch 'main' into releases/4.11.0 2023-06-07 11:31:42 +02:00
Bassel
587d2ee944 remove onSuccess 2023-06-07 12:23:16 +03:00
Marc-Roig
b64acedc45
feat: sanitize update assignee entity 2023-06-07 10:47:17 +02:00
Marc-Roig
82668517b2
feat: delete assignee if id is null 2023-06-07 10:46:59 +02:00
Marc-Roig
5622c6baf3
feat: validate update assignee 2023-06-07 10:44:57 +02:00
Convly
58d2f3ec0b Fix missing require for ee auth service 2023-06-06 22:40:24 +02:00
Marc-Roig
33883aeb43
feat: add assignee updateEntity service 2023-06-06 17:56:49 +02:00
Marc-Roig
dc5e5def91
Merge branch 'feature/add-assignee-attribute' into feature/rw-assignee-put-route 2023-06-06 17:54:01 +02:00
Bassel
1449663b27 move to user controller 2023-06-06 18:40:23 +03:00
Bassel
bda9508bc9 fixing tests 2023-06-06 18:28:48 +03:00
Bassel
3510a7ff1e remove console.log 2023-06-06 18:07:30 +03:00
Bassel
84da83aa4d making things work on CE edition 2023-06-06 18:05:07 +03:00
Bassel
f07531cb86 add route to for ssoLocked and update accordingly 2023-06-06 17:29:55 +03:00
dependabot[bot]
1c485c01a3
chore(deps): bump semver and @types/semver 
Bumps [semver](https://github.com/npm/node-semver) and [@types/semver](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/semver). These dependencies needed to be updated together.

Updates `semver` from 7.3.8 to 7.5.1
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v7.3.8...v7.5.1)

Updates `@types/semver` from 7.3.13 to 7.5.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/semver)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: "@types/semver"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-06 14:29:44 +00:00
Jean-Sébastien Herbaux
4d76b58dee
Merge pull request #16910 from strapi/dependabot/npm_and_yarn/typescript-5.1.3 2023-06-06 16:27:46 +02:00
Josh
38fb966605
chore: upgrade ds to 1.8.0 (#16931) 2023-06-06 15:13:17 +01:00
Jamie Howard
7de2c4a472 feature(ee): WIP initial commit for assignee put route 2023-06-06 14:55:11 +01:00
Bassel
a97d8da47f Merge branch 'main' into fix/sso-lock-out-option 2023-06-06 14:31:41 +03:00
Fernando Chavez
420f30002f snaps fix 2023-06-06 09:13:32 +02:00
Fernando Chávez
b14a181b4d Update packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DynamicZoneList.js 
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
 2023-06-06 09:13:32 +02:00
Fernando Chavez
4f87df708f remove brand icons 2023-06-06 09:13:32 +02:00
Fernando Chavez
f6c442265e improves and small fixes on component icons 2023-06-06 09:13:32 +02:00