yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,890 Commits 138 Branches 514 Tags
Commit Graph

31890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustav Hansen
7e32d81023 Merge branch 'main' into feature/review-workflow-assignee-2-merge-07-25 2023-07-25 11:06:45 +02:00
Gustav Hansen
e16a4b69b2
Merge pull request #17430 from strapi/fix/multiple-review-workflows-settings-rbac 
Fix: Better align review workflows design and implementation of RBAC
 2023-07-24 21:31:06 +02:00
Alexandre BODIN
f05ad73601
Merge pull request #17362 from strapi/chore/ts-permissions 
Tested on 0.0.0-experimental.4b25b175f94cc15a4346702e9d9a729b9e5db70f
 2023-07-24 18:47:03 +02:00
Ben Irvin
a10084ea9f
Merge pull request #16557 from strapi/chore/replace-node-14-with-20 2023-07-24 18:44:20 +02:00
Alexandre BODIN
af5e67b7e8
Merge pull request #17398 from strapi/chore/ts-color-picker 2023-07-24 18:43:10 +02:00
Simone
3e91c737de
Merge pull request #17426 from strapi/fix/bulk-publish-v2-change-published-label 
[bulk publish] Change published label in the modal
 2023-07-24 16:48:22 +02:00
Simone
af8eab8327
Merge pull request #17431 from strapi/fix/bulk-publish-v2-remove-sorting 
[bulk publish] Remove sorting from the bulk publish modal
 2023-07-24 16:47:49 +02:00
Christian
42d3fdd15d
Merge pull request #17371 from strapi/fix/16340-transfer-k8s-pv 2023-07-24 16:37:25 +02:00
Ben Irvin
ea684e159a
Merge branch 'main' into chore/replace-node-14-with-20 2023-07-24 16:33:10 +02:00
Simone
be0f05f5d7
Merge pull request #17423 from strapi/fix/bulk-publish-v2-edit-icon-on-the-right 
[bulk publish] Move edit icon to the right in the Modal
 2023-07-24 16:26:31 +02:00
Gustav Hansen
22f413f10f Fix: Better align design and implementation of RBAC 2023-07-24 16:20:51 +02:00
Simone Taeggi
a47b11149e fix the HeaderCell sortable icon bug 2023-07-24 16:16:06 +02:00
Simone Taeggi
3482c947c2 change id 2023-07-24 16:06:35 +02:00
Marc Roig
9b177cc55a
Merge pull request #17417 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1420.0 2023-07-24 15:52:54 +02:00
Simone
d2a2d80f33
Merge pull request #17428 from strapi/fix/not-call-number-draft-relations-api-with-no-ids 
Bulk publish: fix, enable countManyEntriesDraftRelations API only when you have selected entries in the modal
 2023-07-24 15:42:52 +02:00
Simone Taeggi
d03d981d8d change the marginLeft definition 2023-07-24 15:41:06 +02:00
Simone Taeggi
7577509941 use another id for the Already Published translation 2023-07-24 15:36:15 +02:00
Simone
96da3094b6
Merge pull request #17403 from strapi/fix/bulk-publish-v2-fix-select-all 
Bulk Publish: fix Select All not working inside the Modal
 2023-07-24 15:26:51 +02:00
Simone Taeggi
f735e5ae36 enable the draft relations count api only if we have ids selected and remove it.only from 
tests
 2023-07-24 15:19:07 +02:00
Marc Roig
df79981a07
Merge pull request #17262 from strapi/fix/relation-reordering-inv 2023-07-24 15:12:00 +02:00
Christian Capeans
0389630a42 Add context to the attemptResolveError function 2023-07-24 15:07:15 +02:00
Christian Capeans
26e9bcf3e1 Rename function 2023-07-24 14:12:00 +02:00
Christian
1ba5ae3a48
Update packages/core/strapi/lib/commands/utils/data-transfer.js 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-07-24 14:08:47 +02:00
Ben Irvin
7d9f040cc4
Merge pull request #17424 from strapi/fix/deits-ensure-access-before-backup 2023-07-24 13:34:04 +02:00
Ben Irvin
9bbbcccf7a ensure before attempting 2023-07-24 13:11:22 +02:00
Simone Taeggi
0220db03a5 change entity published label 2023-07-24 12:37:13 +02:00
Alexandre Bodin
2369cc5187 Add tsconfig front 2023-07-24 12:22:14 +02:00
Simone Taeggi
4b2f1bf6d3 move the pencil icon to the right 2023-07-24 12:02:44 +02:00
Alexandre Bodin
5b1ecac1fa Migrate color-picker plugin to ts 2023-07-24 12:02:14 +02:00
Simone Taeggi
fc597f6932 set default value validationEntries 2023-07-24 11:43:26 +02:00
Ben Irvin
1da17e2621
Merge pull request #17410 from wtchnm/fix/17409 2023-07-24 11:29:07 +02:00
Gustav Hansen
3a07983ff0
Merge pull request #17422 from strapi/chore/update-rw-copy 
Chore: Update review workflows copy
 2023-07-24 11:21:59 +02:00
Simone Taeggi
4bab8f48dd Merge branch 'main' into fix/bulk-publish-v2-fix-select-all 2023-07-24 11:12:16 +02:00
Gustav Hansen
89f6413ea3
Merge pull request #17412 from deepak41/update-in-CONTRIBUTING.md-file 
fixed grammatical error in CONTRIBUTING.md
 2023-07-24 11:06:41 +02:00
Gustav Hansen
688281780c
Merge pull request #17414 from strapi/dependabot/npm_and_yarn/eslint-d99a50bdbe 
chore(deps-dev): bump the eslint group with 1 update
 2023-07-24 11:06:03 +02:00
Simone Taeggi
ee4dc5fb00 refactor the useQuery data to have two props for the rows and for the validationErrors 2023-07-24 11:05:54 +02:00
Gustav Hansen
ad6eaa06c1 Chore: Update review workflows copy 2023-07-24 11:04:18 +02:00
markkaylor
567b3f6439
[bulk publish] Deselect entries after publishing (#17402) 2023-07-24 10:57:30 +02:00
markkaylor
c349cfc477
[bulk publish] Set page size to the number of selected entries (#17405) 2023-07-24 10:56:12 +02:00
Gustav Hansen
690c854584
Merge pull request #17420 from strapi/enhancement/workflow-attributes-em-workflow-name 
Enhancement: Emphasize workflow name
 2023-07-24 09:55:23 +02:00
Gustav Hansen
9ccf9586b2 Chore: Run lint task 2023-07-24 09:33:16 +02:00
Gustav Hansen
925a9e6f2e Enhancement: Emphasize workflow name 2023-07-24 09:26:26 +02:00
Gustav Hansen
77d0d31013
Merge pull request #17415 from strapi/dependabot/npm_and_yarn/sanitize-html-2.11.0 
chore(deps): bump sanitize-html from 2.10.0 to 2.11.0
 2023-07-24 09:06:58 +02:00
Marc Roig
cc456519f6
Merge pull request #17418 from strapi/dependabot/npm_and_yarn/cloudinary-1.38.0 2023-07-24 09:06:38 +02:00
dependabot[bot]
55befa69fa
chore(deps): bump cloudinary from 1.37.0 to 1.38.0 
Bumps [cloudinary](https://github.com/cloudinary/cloudinary_npm) from 1.37.0 to 1.38.0.
- [Release notes](https://github.com/cloudinary/cloudinary_npm/releases)
- [Changelog](https://github.com/cloudinary/cloudinary_npm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cloudinary/cloudinary_npm/compare/1.37.0...1.38.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-23 22:20:43 +00:00
dependabot[bot]
485363a666
chore(deps): bump aws-sdk from 2.1415.0 to 2.1420.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1415.0 to 2.1420.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1415.0...v2.1420.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-23 22:20:02 +00:00
dependabot[bot]
1abde4db33
chore(deps): bump sanitize-html from 2.10.0 to 2.11.0 
Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) from 2.10.0 to 2.11.0.
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apostrophecms/sanitize-html/compare/2.10.0...2.11.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-23 22:17:52 +00:00
dependabot[bot]
5d69fe1d38
chore(deps-dev): bump the eslint group with 1 update 
Bumps the eslint group with 1 update: [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react).

- [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jsx-eslint/eslint-plugin-react/compare/v7.32.2...v7.33.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-23 22:16:50 +00:00
Deepak Kumar Singh
d2ed2535ac added a word in line 141 2023-07-23 16:59:37 +05:30
Gabriel Pereira Woitechen
3aa0528515 fix: await for isSsoLocked promise #17409 2023-07-21 21:51:15 -03:00