12157 Commits

Author SHA1 Message Date
Jamie Howard
a9a843250d chore: disable review workflow event options 2023-06-02 11:44:42 +01:00
Damián Paranič
4ba722f8c3
Merge branch 'main' into fix/media-library-multiple-selection 2023-06-02 12:39:13 +02:00
Jamie Howard
96bfeca3db Merge remote-tracking branch 'origin/main' into webhooks/edit-view 2023-06-02 11:14:18 +01:00
Gustav Hansen
b14d6bba22 Chore: Update snapshot tests 2023-06-02 12:04:25 +02:00
Gustav Hansen
1578abfe36 Merge branch 'main' into feature/review-workflow-assignee 2023-06-02 12:01:54 +02:00
Jamie Howard
ca1ed38fea
Merge pull request #16835 from strapi/feature/set-webhook-events 2023-06-02 11:00:25 +01:00
Gustav Hansen
dc58d6c205 Merge branch 'main' into feature/review-workflow-multiple 2023-06-02 11:54:21 +02:00
Gustav Hansen
de1b02bfce Chore: Update tests 2023-06-02 11:51:30 +02:00
markkaylor
24e95099c8
Merge branch 'releases/4.11.0' into feature/bulk-publish 2023-06-02 11:39:02 +02:00
Marc
b256e2da15
Update packages/core/strapi/lib/services/entity-service/index.d.ts
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
2023-06-02 11:35:50 +02:00
Simone Taeggi
f33fc37a86 fix some review comments 2023-06-01 18:25:16 +02:00
Jamie Howard
9b0274669d test(webhooks/EditView): fix failing tests 2023-06-01 17:23:56 +01:00
Jamie Howard
2549eff086 fix(webhooks/EditView): accessibility of events table 2023-06-01 17:13:16 +01:00
Jamie Howard
780f71ab9f Merge remote-tracking branch 'origin/main' into webhooks/edit-view 2023-06-01 17:04:03 +01:00
Nathan Pichon
1baeabf6f6
refactor(review-workflow): shorten the stage attribute name on entities (#16881)
* refactor(review-workflow): shorten the stage attribute name on entities

* fix(review-workflow): update data transfer
2023-06-01 17:49:00 +02:00
Jamie Howard
38eb69ca5e chore(webhooks/EditView): add padding to td and th 2023-06-01 16:46:44 +01:00
Marc-Roig
ddb123ff20
fix: update ID types 2023-06-01 17:41:21 +02:00
Marc-Roig
c56023a56a
fix: typo 2023-06-01 17:38:53 +02:00
Marc-Roig
52b37c3fcf
fix: move ID type definition in databse 2023-06-01 17:37:41 +02:00
Jamie Howard
0d46b7ada7 chore(CTB): remove lodash usage in FormModal 2023-06-01 16:14:51 +01:00
Jamie Howard
d13b8ccdaf fix(webhooks/EditView): events 2023-06-01 16:13:06 +01:00
Jamie Howard
88d6e56bc5 chore(webhooks/EditView): rename react-query key 2023-06-01 15:54:59 +01:00
Jamie Howard
d527b7f3cf chore(webhooks/EditView): rename constants 2023-06-01 15:53:28 +01:00
Marc-Roig
79f025e7aa
fix: typo 2023-06-01 16:39:53 +02:00
Marc-Roig
e4ec1b7301
fix: update query engine ts types 2023-06-01 16:35:08 +02:00
Jamie Howard
59d61424a9 chore: fix entity manager linter warnings 2023-06-01 15:21:47 +01:00
Jamie Howard
c53b7a7ae4 fix: simplify emitEvent logic 2023-06-01 15:20:13 +01:00
Nathan Pichon
28173dff9e
Merge branch 'main' into advisory-fix-1 2023-06-01 16:18:03 +02:00
Convly
417e130966 Review changes for roles fetching 2023-06-01 16:04:39 +02:00
Convly
9fc35371dd Use component uid instead of content type uid 2023-06-01 15:40:22 +02:00
Simone Taeggi
1599a66682 Merge branch 'main' into fix/sso-lock-out-option 2023-06-01 15:13:22 +02:00
Gustav Hansen
41885fdd3d Merge branch 'main' into chore/react18 2023-06-01 12:50:17 +02:00
Mark Kaylor
ee5278b9fd Fix filters causing too many emitted events 2023-06-01 11:24:07 +02:00
Marc
5fa0dd54a2
Merge pull request #16798 from strapi/feature/review-workflow-default-stage-colors 2023-06-01 11:11:21 +02:00
Nathan Pichon
b8ca9a01ce
feat(review workflow): Prevent too long table name for rw join table attributes (#16827)
* feat(review-workflow): prevent activating on content-type with a too long name

* chore(review-workflow): update warning message

* test(review-workflows): add a test for too long name content type

* test(review-workflows): fix describe condition

* chore(review-workflows): rename variable and constant

* chore(review-workflows): rename constants

* test(review-workflows): update test content type name length

* feat(review-workflows): validate that the content type have rw activated

* feat(review-workflows): simplify the validation step

* Update packages/core/admin/ee/server/services/review-workflows/review-workflows.js

Co-authored-by: Marc <marc12info@gmail.com>

* Update packages/core/admin/ee/server/services/review-workflows/review-workflows.js

Co-authored-by: Marc <marc12info@gmail.com>

* chore: remove unused import

* test(review-workflows): update unit tests

* test: disable review workflows

---------

Co-authored-by: Marc <marc12info@gmail.com>
2023-06-01 10:17:00 +02:00
Convly
c443fb2cf1 Merge branch 'releases/4.10.7' 2023-05-31 17:49:57 +02:00
Convly
da080df32b v4.10.7 2023-05-31 17:46:38 +02:00
Jamie Howard
2a593348e4 feature(ee): extend content types with assignee attribute 2023-05-31 16:36:04 +01:00
Jamie Howard
e8f5470aff fix: update useModels to useContentTypes 2023-05-31 15:00:32 +01:00
Jamie Howard
16764cb1d5 Merge remote-tracking branch 'origin/main' into webhooks/edit-view 2023-05-31 14:59:19 +01:00
Jamie Howard
9ecb8fe34c test: fix tests for addAllowedEvent 2023-05-31 14:28:32 +01:00
Simone
2e73b6d204
SSO - local authentication lock-out hide password section in the Profile page (#16819)
* hide the password section on profile when the role of the user is locked

* refactor the solution to fix some comments in the PR

* fix unit test to use getByRole

* fix the comments in the PR

* fix some comments

* change isLoading condition

* refactor the Profile page to split the content in different components

* update Profile tests

* refactor ProfilePage unit test

Co-authored-by: Christian <christiancp100@gmail.com>

* fix test and blank spaces

* refactor unit test

* refactor Preferences component

* last fixes

* move client definition in the Profile Page unit test

* remove api file in the Profile page and inline the callbacks

* fix review comments

---------

Co-authored-by: Christian <christiancp100@gmail.com>
2023-05-31 14:51:26 +02:00
Gustav Hansen
9c394bcc3f Fix: Fix refetching users 2023-05-31 14:31:33 +02:00
Gustav Hansen
946cf1c130
Merge pull request #16834 from strapi/feature/review-workflow-assignee-users
Enhancement: Allow admin users to be assigned to an entity in the CM edit view
2023-05-31 14:26:46 +02:00
Ahsan
9003c8d312 Fix: Handle undefined routes in registerAPIRoutes forEach loop 2023-05-31 16:22:25 +05:30
nathan-pichon
c8995460ac
fix(content-types): remove getter for private attributes
+ Fixes a flaky test (transactions.test.api.js)
2023-05-31 11:45:26 +02:00
Bassel Kanso
c8997ab4b1
Merge branch 'main' into fix/transfer-push-stuck 2023-05-31 12:20:49 +03:00
Gustav Hansen
a5fa3bd7e1
Merge pull request #16805 from strapi/feat/date-picker-improvements
feat: date/time picker improvements
2023-05-31 10:23:24 +02:00
Marc
1a5f50a262
Merge pull request #16656 from strapi/dependabot/npm_and_yarn/umzug-3.2.1 2023-05-31 10:10:14 +02:00
Jean-Sébastien Herbaux
c84063f34f
Merge branch 'main' into fix/clean-filters 2023-05-31 09:49:35 +02:00