yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-04 14:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 111 Branches 487 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustav Hansen
eb135b8a3b Chore: Make review workflow page-title plural 2023-02-01 12:37:17 +01:00
Marc
786e476209
Merge pull request #15363 from strapi/fix/webhook-with-count-relations 2023-02-01 12:22:42 +01:00
Josh
c26371f455
Merge pull request #15664 from strapi/dependabot/npm_and_yarn/jest-watch-typeahead-2.2.2 2023-02-01 10:38:41 +00:00
Mark Kaylor
cab6d7817e Remove is and is not null operators form user 2023-02-01 11:15:40 +01:00
Marc
27535fdb9a
Merge branch 'main' into fix/webhook-with-count-relations 2023-02-01 11:11:57 +01:00
dependabot[bot]
13fc4f7ca4
chore(deps-dev): bump jest-watch-typeahead from 2.2.0 to 2.2.2 
Bumps [jest-watch-typeahead](https://github.com/jest-community/jest-watch-typeahead) from 2.2.0 to 2.2.2.
- [Release notes](https://github.com/jest-community/jest-watch-typeahead/releases)
- [Changelog](https://github.com/jest-community/jest-watch-typeahead/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jest-community/jest-watch-typeahead/compare/v2.2.0...v2.2.2)

---
updated-dependencies:
- dependency-name: jest-watch-typeahead
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-01 09:36:40 +00:00
Josh
6f794a0b53
Merge pull request #15661 from strapi/dependabot/npm_and_yarn/vercel/ncc-0.36.1 2023-02-01 09:34:55 +00:00
Gustav Hansen
268e11b1ae
Merge pull request #15662 from strapi/dependabot/npm_and_yarn/mini-css-extract-plugin-2.7.2 
chore(deps): bump mini-css-extract-plugin from 2.4.4 to 2.7.2
 2023-02-01 10:28:56 +01:00
Christian
1e6dbdc909
Merge pull request #14921 from TingHaooo/fix/users-permissions-unique-email 
Fix duplicated emails checking
 2023-02-01 10:15:36 +01:00
Marc
d942c56395
Merge branch 'main' into fix/webhook-with-count-relations 2023-02-01 10:08:28 +01:00
dependabot[bot]
a4223ffce6
chore(deps): bump mini-css-extract-plugin from 2.4.4 to 2.7.2 
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 2.4.4 to 2.7.2.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v2.4.4...v2.7.2)

---
updated-dependencies:
- dependency-name: mini-css-extract-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-01 09:06:32 +00:00
dependabot[bot]
7c1333cd1f
chore(deps-dev): bump @vercel/ncc from 0.34.0 to 0.36.1 
Bumps [@vercel/ncc](https://github.com/vercel/ncc) from 0.34.0 to 0.36.1.
- [Release notes](https://github.com/vercel/ncc/releases)
- [Commits](https://github.com/vercel/ncc/compare/0.34.0...0.36.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-01 09:04:49 +00:00
Marc
e86c4e389d
Merge pull request #15046 from HastaCs/main 2023-02-01 09:41:49 +01:00
nathan-pichon
ee2b6afc57
test(review-workflow): filters in stages requests 2023-02-01 09:40:32 +01:00
Marc-Roig
2d94d30cb0 Merge branch 'main' into fix/webhook-with-count-relations 2023-02-01 09:34:57 +01:00
nathan-pichon
545b565782
fix(review-workflow): filters in stages requests 2023-01-31 20:16:53 +01:00
Mark Kaylor
0b4f2572ba Fix spaces in translations 2023-01-31 17:51:44 +01:00
Jamie Howard
00142301cb fix(CTB): AttributeIcon 2023-01-31 16:35:59 +00:00
nathan-pichon
80d1695b30
fix(review-workflow): bootstrap 4 stages for default wf 2023-01-31 17:23:05 +01:00
nathan-pichon
6f43611c4a
Merge branch 'feature/review-workflow' into feature/review-worflow/default-workflow 
# Conflicts:
#	packages/core/admin/ee/server/bootstrap.js
 2023-01-31 17:16:39 +01:00
dogusdeniz
8794482d66
Update packages/generators/generators/lib/templates/js/migration.js.hbs 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-01-31 19:15:25 +03:00
dogusdeniz
6e33f2f0cc
Update packages/generators/generators/lib/plops/utils/get-formatted-date.js 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-01-31 19:13:50 +03:00
Gustav Hansen
643cb8a8de CTB: Add checkbox to toggle review workflows for a content-type 2023-01-31 17:11:02 +01:00
Nathan Pichon
61199c036f
Merge pull request #15594 from strapi/feature/review-worflow/workflow-stage 
feat(review-workflow): Stages
 2023-01-31 17:01:27 +01:00
Marc
1c5ea28dcb
Merge branch 'main' into main 2023-01-31 16:37:55 +01:00
Ben Irvin
81c65878bd
Merge branch 'main' into v4/generator-migration 2023-01-31 16:18:13 +01:00
Christian
449529fd02
Merge branch 'main' into fix/users-permissions-unique-email 2023-01-31 16:17:19 +01:00
marcoautiero
d89e10e108 Fixing issue #15413 2023-01-31 15:50:34 +01:00
Marc
360dc02f58
Merge pull request #15585 from strapi/dependabot/npm_and_yarn/cloudinary-1.33.0 2023-01-31 15:40:15 +01:00
Marc-Roig
bc593964d6 test for populated and not populated relations in webhooks 2023-01-31 15:38:39 +01:00
nathan-pichon
335cb1639c
test(review-workflow): add one more stage to tests 2023-01-31 15:30:19 +01:00
Christian
ef6704ea85
Merge pull request #15633 from strapi/deits/import-error-full-disk 
[DEITS] Import/Export error full disk
 2023-01-31 15:25:40 +01:00
nathan-pichon
37f427e581
chore(review-workflow): rename findOne in findById 2023-01-31 15:24:11 +01:00
Nathan Pichon
81146dc5c7
fix(review-workflow): use workflowId instead of id 2023-01-31 15:18:56 +01:00
Simone
21f8e427d3
Merge pull request #15599 from strapi/enhancement/axios-migration-upload 
replace axiosInstance with getFetchClient inside the upload
 2023-01-31 15:12:44 +01:00
Gustav Hansen
6779e145a5 Chore: Remove merge conflict file 2023-01-31 14:59:41 +01:00
Marc-Roig
708e1d677c refactor mapAsyncDialects import 2023-01-31 14:43:10 +01:00
nathan-pichon
cde11ac12a
Merge branch 'feature/review-workflow' into feature/review-worflow/workflow-stage 2023-01-31 14:41:58 +01:00
Marc
b5926ee665
Merge branch 'main' into dependabot/npm_and_yarn/cloudinary-1.33.0 2023-01-31 14:39:44 +01:00
Gustav Hansen
829535d33b
Merge pull request #15635 from strapi/feature/review-workflow-redux-query 
Settings: Connect Review Workflow UI, data loader and redux
 2023-01-31 14:29:42 +01:00
Gustav Hansen
c13a72ef26
Merge pull request #15644 from strapi/chore/update-caniuse-db 
Chore: Update caniuse database
 2023-01-31 14:10:37 +01:00
nathan-pichon
3b0e809e06
fix(review-workflow): content types shouldn't be visible 2023-01-31 14:08:54 +01:00
Mark Kaylor
ab87379d48 Add empty line between tests 2023-01-31 14:03:05 +01:00
Mark Kaylor
9dc89bb2f6 Add models to publish actions 2023-01-31 14:00:39 +01:00
Gustav Hansen
6583f4021a useReviewWorkflows: Enable skipped tests 2023-01-31 13:49:38 +01:00
Mark Kaylor
04630cdf98 Make schema optional on mainField 2023-01-31 13:46:39 +01:00
Gustav Hansen
82115b2ca7 Chore: Update caniuse database 2023-01-31 13:30:37 +01:00
Christian Capeans
3e98167fb2 Clear mocks instead of reset them 2023-01-31 13:22:18 +01:00
Gustav Hansen
73975255ea Chore: Simplify setWorkflows action 2023-01-31 13:09:14 +01:00
Gustav Hansen
622946aec9 Remove mock data and use real API instead 2023-01-31 13:04:47 +01:00