31822 Commits

Author SHA1 Message Date
Marc-Roig
930cde00dd
fix: omit using regular lodash 2023-07-19 14:05:21 +02:00
Gustav Hansen
a81c63413c Chore: Cleanup review-workflow API error handling 2023-07-19 14:00:49 +02:00
Gustav Hansen
d47792aa45
Merge pull request #17354 from strapi/chore/useAPIErrorHandler-main-precedence
Chore: Give precedence to error.message over error.details
2023-07-19 13:58:25 +02:00
Gustav Hansen
750655fb4e Chore: Give precedence to error.message over error.details 2023-07-19 13:33:18 +02:00
Gustav Hansen
9e2c34dfcb
Merge pull request #17319 from fbalhawan/fix/default-admin-lastname
admin lastname defaults to undefined
2023-07-19 13:21:18 +02:00
Gustav Hansen
0ad24b49d4
Merge pull request #17369 from strapi/fix/rw-workflow-attributes-ct
Fix: Remove content-type groups from workflow attrs conditionally
2023-07-19 13:13:36 +02:00
Gustav Hansen
a55fb72965
Merge pull request #17367 from strapi/chore/remove-cypress-config
Chore: Remove stray cypress config file
2023-07-19 12:51:45 +02:00
Christian Capeans
af2694c639 Revert yarn.lock changes 2023-07-19 12:41:22 +02:00
Gustav Hansen
d7e2c6704b Fix: Remove content-type groups from workflow attrs conditionally 2023-07-19 12:39:42 +02:00
Christian Capeans
014fc1b5c2 Fix tests and code cleaning 2023-07-19 12:38:50 +02:00
Gustav Hansen
a2b088974e
Merge pull request #17358 from strapi/feat/review-workflows-rbac-fe
Feat: Add RBAC permissions for review-workflow settings pages
2023-07-19 12:25:38 +02:00
Gustav Hansen
f08702df99
Merge pull request #17285 from strapi/chore/refactor-useLicenseLimits-rbac-user
Chore: Split user RBAC permissions from useLicenseLimits hook
2023-07-19 12:24:55 +02:00
Christian Capeans
ca0a7f5fcb Fix typo 2023-07-19 12:20:15 +02:00
Christian Capeans
b26fd06202 Remove unnecessary logs 2023-07-19 12:16:15 +02:00
Christian Capeans
d04d944fcd Confirm continuing the transfer process if assets backup fakls 2023-07-19 12:14:30 +02:00
Christian Capeans
999ff029f0 Merge 2023-07-19 12:12:02 +02:00
Gustav Hansen
63b7e4e5b7 Chore: Remove stray cypress config file 2023-07-19 12:01:45 +02:00
Gustav Hansen
9a66fe2b75 Chore: Update imports to named imports 2023-07-19 11:58:39 +02:00
Gustav Hansen
5659a628ab Chore: Add manual mock for useLicenseLimits 2023-07-19 11:58:39 +02:00
Gustav Hansen
3a0d905f2d Chore: Move user RBAC conditions out of useLicenseLimits 2023-07-19 11:58:39 +02:00
Gustav Hansen
b5bef2e970 Chore: Extend review-workflow tests to include RBAC 2023-07-19 11:22:35 +02:00
Gustav Hansen
79a28ad2c6 Feat: Add RBAC conditions to the review-workflows settings pages 2023-07-19 11:22:35 +02:00
Ben Irvin
0fff4223ad
Merge branch 'main' into fix/17172-ssolocked-roles-null 2023-07-19 10:59:22 +02:00
Gustav Hansen
99f5f0aafe
Merge pull request #17364 from strapi/dependabot/npm_and_yarn/word-wrap-1.2.4
chore(deps): bump word-wrap from 1.2.3 to 1.2.4
2023-07-19 10:51:41 +02:00
dependabot[bot]
74de7e7520
chore(deps): bump word-wrap from 1.2.3 to 1.2.4
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-19 08:23:00 +00:00
Josh
1b99c20f66 Merge branch 'fix/clone-relations-components' of github.com:strapi/strapi into fix/clone-relations-components 2023-07-19 09:17:52 +01:00
Josh
b48701f464 fix: don't send the id if cloning 2023-07-19 09:17:41 +01:00
Marc-Roig
98c9b6d6c1
fix: omit id when cloning entity 2023-07-19 10:15:43 +02:00
Christian Capeans
ed19cff34c Merge branch 'main' of https://github.com/strapi/strapi into fix/16340-transfer-k8s-pv 2023-07-19 10:01:24 +02:00
Josh
b4fc0aba80 fix: fe showing relations in components from og entity 2023-07-19 08:52:55 +01:00
Christian Capeans
2e978842ad log error 2023-07-19 09:09:15 +02:00
Marc Roig
961ad56e43
Merge pull request #17159 from goodhoko/chunk-conditionally 2023-07-18 21:48:34 +02:00
Christian Capeans
0048079ec2 log error 2023-07-18 18:06:25 +02:00
Ben Irvin
dda8543003 fix defaultRole and comment 2023-07-18 17:48:07 +02:00
Ben Irvin
88f99a54f7 Revert "fix defaultRole and comment"
This reverts commit f33ad9cc2966f3de465426c7be45d16aa874159b.
2023-07-18 17:40:11 +02:00
Ben Irvin
ae67e82f26 Revert "allow null defaultRole on backend"
This reverts commit 64c995d4ccf5681bac9b10e575ce808f6e17d120.
2023-07-18 17:37:13 +02:00
Ben Irvin
64c995d4cc allow null defaultRole on backend 2023-07-18 17:32:51 +02:00
Marc-Roig
77f327e5c2
fix: jsdoc remove return 2023-07-18 17:24:55 +02:00
Marc Roig
ec00ece8bb
Merge pull request #17310 from strapi/feature/sendReviewWorkflowPropertiesOnceAWeek 2023-07-18 17:21:34 +02:00
Gustav Hansen
e825fc3694
Merge pull request #17356 from strapi/fix/review-workflows-permissions
Fix: Fix review workflow settings page permissions
2023-07-18 16:55:16 +02:00
Marc-Roig
007c289877
fix: typo 2023-07-18 16:48:50 +02:00
Gustav Hansen
e8f4408751 Fix: Fix review workflow settings page permissions 2023-07-18 16:41:26 +02:00
Marc-Roig
2667ce0331
Merge branch 'review-workflow-multiple/amplitude-be' into feature/sendReviewWorkflowPropertiesOnceAWeek 2023-07-18 16:39:04 +02:00
Gustav Hansen
1f82375819
Merge pull request #16755 from strapi/feature/review-workflow-multiple
Feature: Multiple review workflows
2023-07-18 16:38:01 +02:00
Marc-Roig
dc09aa2f8f
fix: move cron utils to upload 2023-07-18 16:22:20 +02:00
Marc-Roig
e024f590ab
feat: compute review workflow weekly metrics 2023-07-18 15:50:48 +02:00
Gustav Hansen
9483cef63e
Merge branch 'main' into feature/review-workflow-multiple 2023-07-18 15:37:47 +02:00
Gustav Hansen
670bf497cb
Merge pull request #17350 from strapi/feature/review-workflow-multiple-merge-18-07-23
Merge `main` into `feature/review-workflow-multiple` (including bulk publish)
2023-07-18 15:35:54 +02:00
Gustav Hansen
fa9777b27c
Merge pull request #17332 from strapi/feature/throw-if-duplicated-stage-name
feat: throw ValidationError if stage has a duplicated name
2023-07-18 15:35:34 +02:00
Marc Roig
cdcef5da1b
Merge branch 'feature/review-workflow-multiple' into review-workflow-multiple/amplitude-be 2023-07-18 15:14:19 +02:00