yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-18 05:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,696 Commits 117 Branches 489 Tags
Commit Graph

19622 Commits

Author SHA1 Message Date
Convly
afea3145b8 Fix populate structure 2022-11-29 17:35:17 +01:00
Convly
749443074a Merge branch 'features/deits' into deits/fix-entities-export 2022-11-29 17:07:52 +01:00
Convly
9910620d10 Merge branch 'features/deits' of github.com:strapi/strapi into features/deits 2022-11-29 17:07:35 +01:00
Convly
9e98d31b8d Merge branch 'main' of github.com:strapi/strapi into features/deits 2022-11-29 17:07:19 +01:00
Jean-Sébastien Herbaux
3ebd2db4d6
Merge pull request #14879 from strapi/features/morphs-populate 2022-11-29 17:06:05 +01:00
Convly
659a55ae99 Remove console.log 2022-11-29 17:05:20 +01:00
Convly
6ee0ec21a9 Merge branch 'features/deits' of github.com:strapi/strapi into deits/fix-entities-export 2022-11-29 17:01:17 +01:00
Convly
43df00df22 Merge branch 'features/deits' into deits/fix-entities-export 2022-11-29 16:59:56 +01:00
Ben Irvin
711e5ad644
Merge pull request #15033 from strapi/deits/upgrade-commander 
[deits] Upgrade commander package
 2022-11-29 16:58:43 +01:00
Ben Irvin
1454fb5b7c Merge branch 'main' into features/deits 2022-11-29 16:04:20 +01:00
Pierre Noël
5d9faf3861 fix test - array's order 2022-11-29 14:02:44 +01:00
Pierre Noël
bbd318d845
Merge branch 'main' into fix/github-test-mysql5 2022-11-29 11:31:29 +01:00
Ben Irvin
bb561a791e upgrade commander 2022-11-29 10:38:10 +01:00
markkaylor
1ffef66e64
Merge pull request #14873 from strapi/fix/custom-fields-breaking-inputs 
[Custom fields] Create hook to lazy load custom field components
 2022-11-29 10:28:27 +01:00
Ben Irvin
e47dfb35ae Merge branch 'main' into features/deits 2022-11-29 09:34:10 +01:00
markkaylor
25bcd1c4e2
Merge pull request #14885 from raphaelmue/fix/swaggerParameterLocale 
Fix #14712: Query Parameter for Locale (API Documentation Plugin)
 2022-11-28 17:56:09 +01:00
Pierre Noël
78b8319070 remove unecessary checks in tests breaking with mysql 5 2022-11-28 10:45:30 +01:00
Nathan Pichon
15127e84b0
Merge pull request #14724 from strapi/fix/file-upload-components 
fix(upload-files): do file upload on components too
 2022-11-25 12:00:40 +01:00
Convly
307bbe2b41 Merge branch 'features/deits' of github.com:strapi/strapi into deits/fix-entities-export 2022-11-24 16:12:36 +01:00
Ben Irvin
de02ba208f fix reject 2022-11-24 11:34:05 +01:00
Ben Irvin
605647c5e4 add message 2022-11-24 11:21:49 +01:00
Convly
a7aac3e781 Remove useless import 2022-11-24 11:21:35 +01:00
Ben Irvin
c0b321c64e refactor 2022-11-24 11:18:02 +01:00
Ben Irvin
48b81b747d close pipeline correctly 2022-11-24 11:12:01 +01:00
ivanThePleasant
00a3f69152
Merge pull request #14835 from strapi/chore/fix-iso-locales 
Chore/fix iso locales
 2022-11-24 11:21:32 +02:00
Convly
42304aa680 Fix the nested populate for entities export 2022-11-24 10:19:40 +01:00
Ben Irvin
416442f970 prompt for key if not provided for an encrypted file 2022-11-24 09:44:50 +01:00
Ben Irvin
47c9e154b5 restore validation 2022-11-24 09:44:13 +01:00
Ben Irvin
a5d874c70c change file from arg to option 2022-11-24 09:18:24 +01:00
Mark Kaylor
0343495ea1 Select custom field uids from layout using reselect 2022-11-23 21:40:53 +01:00
Mark Kaylor
cfd9262878 Merge branch 'main' of github.com:strapi/strapi into fix/custom-fields-breaking-inputs 2022-11-23 21:36:30 +01:00
markkaylor
94cd474940
Merge pull request #14881 from strapi/chore/refactor-edit-view 
[Content manager] Refactor edit view
 2022-11-23 21:26:09 +01:00
Jean-Sébastien Herbaux
f67c4b440f
Merge branch 'main' into features/morphs-populate 2022-11-23 16:13:09 +01:00
Alexandre BODIN
879c7e209e
Merge pull request #14187 from strapi/dependabot/npm_and_yarn/graphql-tools/schema-8.5.1 2022-11-23 15:03:48 +01:00
Nathan Pichon
4e6a8bf672
Merge branch 'main' into fix/file-upload-components 2022-11-23 15:00:44 +01:00
Ben Irvin
def5713be8 handle invalid version strings 2022-11-23 14:08:47 +01:00
Alexandre BODIN
9fc86532d6
Merge pull request #14969 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1260.0 2022-11-23 14:02:09 +01:00
Alexandre BODIN
caf78bb0fb
Merge pull request #14867 from strapi/dependabot/npm_and_yarn/swagger-ui-dist-4.15.5 2022-11-23 14:01:50 +01:00
Mark Kaylor
e63b41b73a Remove comment and named export 2022-11-23 14:01:41 +01:00
Julie Plantey
0c408f9bda
Merge pull request #14883 from alekskorolev3/fix-RU-lang 
Update russian translation
 2022-11-23 13:38:28 +01:00
dependabot[bot]
df8feafa4b
chore(deps): bump aws-sdk from 2.1215.0 to 2.1260.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1215.0 to 2.1260.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.1215.0...v2.1260.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-11-23 11:30:19 +00:00
Alexandre BODIN
7d64a36867
Merge pull request #14870 from jorgeRambla/patch-2 
Resolves https://github.com/strapi/strapi/issues/14869
 2022-11-23 12:18:32 +01:00
Alexandre BODIN
463d78a4c1
Merge pull request #14666 from strapi/dependabot/npm_and_yarn/commander-8.3.0 2022-11-23 12:16:02 +01:00
Ben Irvin
c4a797b696 merge features branch 2022-11-23 12:13:33 +01:00
Ben Irvin
a436e20039 improve schemamatching test 2022-11-23 12:11:17 +01:00
Ben Irvin
60fe1ceb70 add tests for version matching and schema matching 2022-11-23 12:07:20 +01:00
dependabot[bot]
a80bef5f5c
Bump @graphql-tools/schema from 8.1.2 to 8.5.1 
Bumps [@graphql-tools/schema](https://github.com/ardatan/graphql-tools/tree/HEAD/packages/schema) from 8.1.2 to 8.5.1.
- [Release notes](https://github.com/ardatan/graphql-tools/releases)
- [Changelog](https://github.com/ardatan/graphql-tools/blob/master/packages/schema/CHANGELOG.md)
- [Commits](https://github.com/ardatan/graphql-tools/commits/@graphql-tools/schema@8.5.1/packages/schema)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-23 10:27:01 +00:00
Raphael Müßeler
a9a695d2bd
Merge branch 'main' into fix/swaggerParameterLocale 2022-11-23 10:58:31 +01:00
markkaylor
a91fe47990
Merge branch 'main' into fix/custom-fields-breaking-inputs 2022-11-23 10:24:39 +01:00
Madhuri Sandbhor
c693065ad1
Merge pull request #14814 from strapi/feature/marketplace-additional-sort-options 
[Marketplace] Exp-373 Update the sort options in SelectSort component
 2022-11-23 10:22:52 +01:00