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

6461 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Jamie Howard
e87dad4373 chore: linter rule 2023-05-30 16:15:05 +01:00
Jamie Howard
d77e42b859 refactor(webhooks): populate allowed events from relevant modules 2023-05-30 16:13:10 +01:00
Simone Taeggi
82891cb1a8 Merge branch 'main' into fix/sso-lock-out-option 2023-05-30 15:15:14 +02:00
Simone Taeggi
2d33930cd9 remove useless wrapper in the useSettingsForm unit test 2023-05-30 15:11:10 +02:00
Simone Taeggi
2553c35346 remove useless snapshot 2023-05-30 14:43:35 +02:00
Simone Taeggi
b58307c990 refactor the useSettingsForm unit test 2023-05-30 14:40:05 +02:00
markkaylor
73416f4b91
Merge branch 'releases/4.11.0' into feature/bulk-publish 2023-05-30 14:12:38 +02:00
Gustav Hansen
37927ce7d6 Chore: Update Edit and Listview 2023-05-30 14:04:52 +02:00
Gustav Hansen
ffd959c90d Merge branch 'main' into feature/review-workflow-multiple 2023-05-30 13:42:04 +02:00
Josh
212d409508 refactor: use DesignSystemProvider and fix tests 2023-05-30 13:15:32 +02:00
Josh
140689602e chore: tidy ups 2023-05-30 13:12:10 +02:00
Josh
19106faaea chore: update snapshots and tests 2023-05-30 13:12:07 +02:00
Josh
bd89ec5d53 chore: add experimental DS version 2023-05-30 13:04:53 +02:00
Gustav Hansen
ff028570be Chore: Add tests for AssigneeSelect 2023-05-30 12:55:15 +02:00
Gustav Hansen
8774e76c1b Chore: Update StageSelect tests 2023-05-30 12:55:14 +02:00
Gustav Hansen
e3c0e70610 Chore: Update InformationBoxEE tests 2023-05-30 12:55:14 +02:00
Jamie Howard
723187ab4c chore: webhook controller yup validation 2023-05-30 11:05:42 +01:00
Gustav Hansen
4f63cb517f
Merge pull request #16862 from strapi/chore/stray-console-log 
Chore: Remove stray console log
 2023-05-30 12:00:57 +02:00
Jamie Howard
c557e43243 chore(webhooks/EditView): use renderChildren function 2023-05-30 10:44:32 +01:00
Jamie Howard
b919da9c26 Merge remote-tracking branch 'origin/main' into feature/set-webhook-events 2023-05-30 10:16:36 +01:00
Jamie Howard
510a20c82c chore: update webhook event name 2023-05-30 09:42:03 +01:00
Gustav Hansen
093d3436a8
Merge pull request #16861 from strapi/chore/notification-missing-translation 
Chore: Notification - Add missing translation
 2023-05-30 10:31:05 +02:00
Gustav Hansen
8259d9836d Chore: Remove stray console log 2023-05-30 10:23:18 +02:00
Gustav Hansen
fd7a5c7a99 Chore: Notification - Add missing translation 2023-05-30 10:03:47 +02:00
Gustav Hansen
2b6ad39a57
Merge pull request #16850 from strapi/dependabot/npm_and_yarn/axios-1.4.0 
chore(deps): bump axios from 1.3.4 to 1.4.0
 2023-05-30 08:56:49 +02:00
Gustav Hansen
26e9bf0cb2
Merge pull request #16852 from strapi/dependabot/npm_and_yarn/react-query-3.39.3 
chore(deps): bump react-query from 3.24.3 to 3.39.3
 2023-05-30 08:56:11 +02:00
Gustav Hansen
e192306863
Merge pull request #16853 from strapi/dependabot/npm_and_yarn/formik-2.4.0 
chore(deps): bump formik from 2.2.9 to 2.4.0
 2023-05-30 08:55:39 +02:00
Gustav Hansen
41aff9786f
Merge pull request #16851 from strapi/dependabot/npm_and_yarn/testing-library/dom-8.20.0 
chore(deps-dev): bump @testing-library/dom from 8.19.0 to 8.20.0
 2023-05-30 08:54:36 +02:00
Bassel Kanso
a6750d6cc5
Merge pull request #16673 from Marwa-Hodeib/translationEnglishToArabic 
Translation english to arabic
 2023-05-29 14:03:46 +03:00
“marwa-hodeib”
b8264edcb3 Merge branch 'translationEnglishToArabic' of https://github.com/Marwa-Hodeib/strapi into translationEnglishToArabic 2023-05-29 12:33:19 +03:00
Simone Taeggi
536b2ccd4b test duplicated sso roles are cleaned 2023-05-29 11:22:35 +02:00
Simone Taeggi
f83a848525 Merge branch 'main' into fix/sso-lock-out-option 2023-05-29 10:41:05 +02:00
dependabot[bot]
1c5f857faa
chore(deps): bump formik from 2.2.9 to 2.4.0 
Bumps [formik](https://github.com/formium/formik) from 2.2.9 to 2.4.0.
- [Release notes](https://github.com/formium/formik/releases)
- [Commits](https://github.com/formium/formik/compare/formik@2.2.9...formik@2.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-28 23:04:50 +00:00
dependabot[bot]
71902a4f5c
chore(deps): bump react-query from 3.24.3 to 3.39.3 
Bumps [react-query](https://github.com/tannerlinsley/react-query) from 3.24.3 to 3.39.3.
- [Release notes](https://github.com/tannerlinsley/react-query/releases)
- [Commits](https://github.com/tannerlinsley/react-query/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-28 23:03:37 +00:00