yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-21 06:22:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,014 Commits 123 Branches 496 Tags
Commit Graph

23014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Julie Plantey
bdc0454cd7 breadcrumbs in ML modal - CM 2022-07-31 17:43:42 +02:00
Julie Plantey
110317b6b1 updated snapshots 2022-07-31 16:51:09 +02:00
Julie Plantey
2774384c89 breadcrumbs in upload page 2022-07-31 16:39:47 +02:00
Julie Plantey
e1dc2b8634 list.asset.load translation refacto 2022-07-31 14:56:09 +02:00
Julie Plantey
e0792e28f5 ds beta update 2022-07-31 14:50:35 +02:00
Marc
47a4486943 do not override width and height 2022-07-30 10:14:37 +02:00
Simone Taeggi
26100eea01 evaluate the webpack.config.ts file and compile the file when we build the typescript project example 2022-07-29 16:58:21 +02:00
Gustav Hansen
b511597ea2
Merge pull request #13902 from strapi/fix/ml-assetdialog-canread 
AssetDialog: Properly take canRead permissions into account
 2022-07-29 16:40:49 +02:00
Gustav Hansen
21b95f9954
Merge pull request #13886 from strapi/feature/replace-virtualized-window 
ComponentIconPicker: Replace react-virtualized with react-window
 2022-07-29 14:34:48 +02:00
Gustav Hansen
ab3972bbc7
Merge pull request #13899 from strapi/fix/ml-bulk-action 
ML: Hide bulk actions if not assets or folders exist
 2022-07-29 14:34:22 +02:00
Gustav Hansen
7a8a3fd257 AssetDialog: Properly take canRead permissions into account 2022-07-29 14:28:59 +02:00
ihmpavel
6ae4e4a968
Merge branch 'strapi:master' into graphql-bounded 2022-07-29 13:59:20 +02:00
Gustav Hansen
d67128ed9f ML: Hide bulk actions if not assets or folders exist 2022-07-29 12:34:25 +02:00
Gustav Hansen
4631f9f87b
Merge branch 'master' into feature/replace-virtualized-window 2022-07-29 12:11:04 +02:00
Gustav Hansen
05c400c391 ComponentIconPicker: Replace react-virtualized with react-window 2022-07-29 12:06:28 +02:00
Gustav Hansen
6c6332a6e7
Merge pull request #13878 from strapi/fix/13868-relation-1-1-styles 
SelectOne: Fix component styles
 2022-07-28 15:44:54 +02:00
Gustav Hansen
e17d75315b
Merge pull request #13884 from strapi/fix/13868-relation-bullet-skew 
Relation: Fix skewed draft/ publish bullet indicator
 2022-07-28 15:44:35 +02:00
Bassel Kanso
cf6c08de92
Merge pull request #13838 from strapi/fix/graphql-playground 
Fix/graphql playground
 2022-07-28 15:53:04 +03:00