yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-21 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 120 Branches 490 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustav Hansen
159ee5abf6 chore: Update snapshot tests 2022-08-02 15:14:51 +02:00
Convly
d647d390ad Merge branch 'master' into chore/graphql-use-graphql-scalars 2022-08-02 14:54:10 +02:00
Gustav Hansen
eb374ad23a
Merge pull request #13799 from strapi/chore/bump-ds-1-2-1-beta-0 
chore: Bump @strapi/design-system to 1.2.1
 2022-08-02 14:17:56 +02:00
Gustav Hansen
e3fb4d5ae0 CTB: Improve SubNavSection title, by passing down defaultMessage 2022-08-02 13:43:30 +02:00
Gustav Hansen
f25f1b45b7
Merge branch 'master' into chore/bump-ds-1-2-1-beta-0 2022-08-02 13:20:54 +02:00
Gustav Hansen
3016533fd1 CTB: Update SubNav styles using improved DS properties 2022-08-02 13:12:49 +02:00
Ben Irvin
90bc708599 fix test name 2022-08-02 13:12:42 +02:00
Ben Irvin
f2def23f96 fix subject test 2022-08-02 13:07:42 +02:00
Ben Irvin
6e581e044b add type 2022-08-02 13:07:16 +02:00
Ben Irvin
640e0c859d add types 2022-08-02 12:57:41 +02:00
Pierre Noël
21d8cad4af
Merge pull request #13934 from strapi/fix/add-api-token-salt-in-created-projects 
Add apiToken.salt directly in the config of created projects
 2022-08-02 12:00:51 +02:00
Convly
2a60f6eb54 Move from deprecated packages to graphql-scalars to handle scalar types 2022-08-02 11:45:59 +02:00
Mark Kaylor
6a5f4a97b9 Inject inputs from plugins 2022-08-02 11:28:14 +02:00
markkaylor
dfe99b0f00
Merge pull request #13935 from strapi/add-custom-field-attribute/validation 
[Custom Field] Add validation
 2022-08-02 11:27:53 +02:00
Bassel Kanso
fca84ede09 Merge branch 'master' into fix/counting-when-deep-filtering 2022-08-02 12:14:45 +03:00
dependabot[bot]
a54edbc0b9
Bump aws-sdk from 2.892.0 to 2.1186.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.892.0 to 2.1186.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.892.0...v2.1186.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>
 2022-08-02 09:08:18 +00:00
Jean-Sébastien Herbaux
9390f681bc
Merge pull request #13793 from ihmpavel/graphql-bounded 
feat(graphql): Add bounded cache
 2022-08-02 11:01:56 +02:00
Bassel Kanso
749d1906f9 add e2e tests to cover the counting case in the meta when deep filtering 2022-08-02 11:52:19 +03:00
Convly
20259d944d Fix ts utils' getConfigPath returning false positive due to ancestors lookup 2022-08-02 10:52:10 +02:00
Ben Irvin
794b5e155d revert generateAbility 2022-08-02 10:44:31 +02:00
Ben Irvin
db1531cc98 fix mocks 2022-08-02 10:13:18 +02:00
Mark Kaylor
4d3e0a4b15 Add custom field validation registered by user 2022-08-02 09:15:26 +02:00
Jake Wesorick
e215383a7b Add more locales. smn, smn_FI, se, se_FI, se_NO, se_SE, gd, gd_GB, ug, ug_CN. 2022-08-02 13:37:21 +07:00
Pierre Noël
7f8ea3b5e5 add apiToken.salt directly in the config of created projects 2022-08-01 17:42:37 +02:00
dependabot[bot]
1e2f7d1c8f
Bump cloudinary from 1.29.0 to 1.30.1 
Bumps [cloudinary](https://github.com/cloudinary/cloudinary_npm) from 1.29.0 to 1.30.1.
- [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.29.0...1.30.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-01 15:21:10 +00:00
dependabot[bot]
80c1c25d27
Bump @graphql-tools/utils from 8.6.6 to 8.9.0 
Bumps [@graphql-tools/utils](https://github.com/ardatan/graphql-tools/tree/HEAD/packages/utils) from 8.6.6 to 8.9.0.
- [Release notes](https://github.com/ardatan/graphql-tools/releases)
- [Changelog](https://github.com/ardatan/graphql-tools/blob/master/packages/utils/CHANGELOG.md)
- [Commits](https://github.com/ardatan/graphql-tools/commits/@graphql-tools/utils@8.9.0/packages/utils)

---
updated-dependencies:
- dependency-name: "@graphql-tools/utils"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-01 15:21:04 +00:00
Alexandre Bodin
7039c0d228 v4.3.2 v4.3.2 2022-08-01 17:18:09 +02:00
Julie Plantey
a163acea82
Merge pull request #13918 from strapi/folder-breadcrumbs/cm 
[Breadcrumbs] CM / ML Modal
 2022-08-01 17:13:11 +02:00
Pierre Noël
1eab2fb08c v4.3.1 v4.3.1 2022-08-01 16:44:44 +02:00
Alexandre Bodin
8ab2db1497 Fix missing private package 2022-08-01 16:41:30 +02:00
Marc-Roig
09fdd984c1 test upload image 2022-08-01 15:53:03 +02:00
Julie Plantey
9fa0adeb8e feedback fixes 2022-08-01 15:41:56 +02:00
Gustav Hansen
88caa92f87
Merge pull request #13847 from strapi/dependabot/npm_and_yarn/ora-5.4.1 
Bump ora from 5.4.0 to 5.4.1
 2022-08-01 15:31:01 +02:00
Gustav Hansen
d9a7e21abe chore: Update snapshot tests 2022-08-01 15:28:01 +02:00
Gustav Hansen
17e8700365 chore: Update @strapi/design-system to 1.2.1 2022-08-01 15:04:27 +02:00
Gustav Hansen
ae71c7a7c4 chore: Update @strapi/design-system to 1.2.1-beta.0 2022-08-01 14:54:13 +02:00
Alexandre BODIN
b186d63152
Merge pull request #13780 from strapi/dependabot/npm_and_yarn/knex-1.0.7 
Bump knex from 1.0.4 to 1.0.7
 2022-08-01 13:55:59 +02:00
Andrei
2143c2d3d0
Merge branch 'strapi:master' into strapi/fix/issue-13453-documentation-fix 2022-08-01 13:46:26 +02:00
Andrei Wilkens
f4519a89a1 renamed addSchema to addComponentSchema and fixed a template string 2022-08-01 13:44:21 +02:00
Ben Irvin
a8d6c215d2 cleanup 2022-08-01 13:40:43 +02:00
Ben Irvin
20fe90de93 test subject objects 2022-08-01 13:31:27 +02:00
Ben Irvin
56c22e33f3 fix tests 2022-08-01 13:12:10 +02:00
Ben Irvin
295133bb33 finish condition tests 2022-08-01 12:28:04 +02:00
Marc-Roig
f0b67b9ec5 add function for uploading image 2022-08-01 12:14:13 +02:00
Julie Plantey
c824230092 added test for getBreadcrumbDataCM 2022-08-01 12:05:18 +02:00
Ben Irvin
58156444e3 expect ability.rules 2022-08-01 11:46:13 +02:00
Jean-Sébastien Herbaux
ce6c3f911e
Merge pull request #13855 from strapi/fix/dz-populate-same-field-name 
Better handle populating of dynamic-zones
 2022-08-01 11:31:04 +02:00
Bassel Kanso
b218ec3997 count columns based on distinct ID 2022-08-01 12:15:05 +03:00
Jean-Sébastien Herbaux
9866d64954
Merge pull request #13747 from strapi/dependabot/npm_and_yarn/apollo-server-koa-3.10.0 
Bump apollo-server-koa from 3.1.2 to 3.10.0
 2022-08-01 10:58:08 +02:00
Convly
9aff190dc3 Merge branch 'api-token-v2/engine-abstraction' into api-token-v2/up-engine-impl 2022-08-01 10:51:22 +02:00