yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-29 00:49:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,074 Commits 123 Branches 506 Tags
Commit Graph

874 Commits

Author SHA1 Message Date
Convly
3149e374f4 Merge branch 'releases/4.11.4' 2023-07-05 16:51:48 +02:00
Convly
8d325a6953 v4.11.4 2023-07-05 16:46:16 +02:00
Christian
dd47104357
Merge branch 'main' into feat/data-transfer-assets 2023-07-05 15:13:20 +02:00
Christian
3117d9f99e
Merge pull request #16914 from strapi/dependabot/npm_and_yarn/stream-json-1.8.0 2023-07-05 13:18:16 +02:00
Christian Capeans
924804eff0 Fix local-destination tests 2023-07-05 13:14:39 +02:00
Christian Capeans
abda292fde Add comment to clarify the use of process.nextTick 2023-07-05 11:49:23 +02:00
Christian Capeans
90222db30b Add comments 2023-07-05 11:40:59 +02:00
Christian Capeans
b7bd31aa74 Add backwards compatibility to the assets transfer 2023-07-05 11:35:42 +02:00
dependabot[bot]
ac3016b86b
chore(deps-dev): bump the jest group with 4 updates 
Bumps the jest group with 4 updates: [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest), [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest), [jest-circus](https://github.com/facebook/jest/tree/HEAD/packages/jest-circus) and [jest-cli](https://github.com/facebook/jest/tree/HEAD/packages/jest-cli).


Updates `jest` from 29.5.0 to 29.6.0
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.6.0/packages/jest)

Updates `@types/jest` from 29.2.0 to 29.5.2
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest)

Updates `jest-circus` from 29.5.0 to 29.6.0
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.6.0/packages/jest-circus)

Updates `jest-cli` from 29.5.0 to 29.6.0
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.6.0/packages/jest-cli)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: jest
- dependency-name: "@types/jest"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: jest
- dependency-name: jest-circus
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: jest
- dependency-name: jest-cli
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: jest
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-05 07:10:53 +00:00
Christian Capeans
c57b411703 Fix provider stored in database 2023-07-04 17:46:07 +02:00
Christian Capeans
b2a98a4a8d Fix push transfer with external assets provider 2023-07-04 15:36:38 +02:00
Christian Capeans
668237709f Merge branch 'main' into feat/data-transfer-assets 2023-07-04 10:05:51 +02:00
Christian Capeans
f127c3a4a3 Specify the right path 2023-07-03 16:11:19 +02:00
Christian Capeans
09193142aa Delete assets before transfering to external provider 
Co-authored-by: Bassel Kanso <basselkanso82@gmail.com>
 2023-07-03 13:38:31 +02:00
Alexandre BODIN
028f543e81
Merge branch 'main' into chore/replace-node-14-with-20 2023-07-01 06:56:07 +02:00
Ben Irvin
67e2799601 fix for backwards compatibility 2023-06-30 14:46:43 +02:00
Ben Irvin
533bd1f310 cast to array for backwards compatibility 2023-06-30 14:44:43 +02:00
Christian
5229428c20
Update packages/core/data-transfer/src/strapi/providers/remote-source/index.ts 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-06-30 13:24:59 +02:00
Christian
9f7b6a28ae
Update packages/core/data-transfer/src/strapi/providers/remote-source/index.ts 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-06-30 13:24:54 +02:00
Christian Capeans
9aff84d17c Merge branch 'main' into fix/dts-pull-hang 2023-06-29 12:28:06 +02:00
Christian Capeans
e9e5727f9f Add comments to clarify the code 2023-06-29 12:24:26 +02:00
Marc-Roig
f9a4af2894
Merge branch 'main' into releases/4.11.3 2023-06-28 17:27:34 +02:00
Marc-Roig
aac28413ad
v4.11.3 2023-06-28 16:52:34 +02:00
Christian Capeans
6359676a9b Optimize assets transfer 2023-06-28 09:30:04 +02:00
Ben Irvin
7f5b10ee76
Merge branch 'main' into chore/replace-node-14-with-20 2023-06-27 13:45:23 +02:00
Ben Irvin
a58a2f9a51 diagnostics 2023-06-27 12:24:58 +02:00
Ben Irvin
88c71d5eaa fixes 2023-06-27 12:03:57 +02:00
Bassel Kanso
cac25da38a
Merge branch 'main' into feat/data-transfer-assets 2023-06-26 18:20:58 +03:00
Bassel
f2515d762a upload image to aws and cloudinary providers successfully 2023-06-26 17:58:41 +03:00
Bassel
3c3edc8dff saved point 
Co-authored-by: Christian <christiancp100@gmail.com>
 2023-06-26 17:41:21 +03:00
Ben Irvin
2586daeecc eof eol 2023-06-26 14:20:52 +02:00
Ben Irvin
8627f96d89 fix after merge 2023-06-26 12:41:10 +02:00
Ben Irvin
68e7bc8b21
Merge branch 'main' into chore/data-transfer-dev-docs 2023-06-26 12:32:02 +02:00
Ben Irvin
9f61258e74 add remote provider docs 2023-06-26 12:23:35 +02:00
Ben Irvin
fba7d1d77d local strapi docs 2023-06-26 11:10:09 +02:00
Ben Irvin
17f3d909d9 add file providers docs 2023-06-26 09:56:49 +02:00
Christian Capeans
0e83bc28d9 Optimise pull transfer for entities, configurations and links 2023-06-23 13:57:54 +02:00
Ben Irvin
c2c33a3b32 add comments to providers 2023-06-21 19:18:05 +02:00
Convly
6f7c815c2b v4.11.2 2023-06-21 15:57:32 +02:00
Bassel
a113aee1bd Merge branch 'main' into feat/data-transfer-assets 2023-06-21 14:23:04 +03:00
Bassel
cce6ba6ff5 fix file path incase external provider 2023-06-21 14:20:06 +03:00
Christian
16df3c178f
Merge branch 'main' into dependabot/npm_and_yarn/stream-json-1.8.0 2023-06-21 11:51:25 +02:00
Bassel
8996d55eb7 export files from external providers 2023-06-20 17:15:33 +03:00
Marc-Roig
6cdb5a7737
v4.11.1 2023-06-12 17:10:44 +02:00
Convly
1e91d9b498 Review comments 2023-06-12 10:51:45 +02:00
Convly
f427c244eb Merge branch 'main' into features/type-system 2023-06-09 18:58:03 +02:00
Convly
820da82762 Fix relation attribute type (mappedBy and inversedBy), make it compatible with Attribute.Any 2023-06-09 16:07:34 +02:00
Bassel Kanso
94b79d41b4
Merge branch 'main' into fix/transfer-push-stuck 2023-06-09 16:38:58 +03:00
Christian Capeans
37ec6abc3c Delete sending null in the assets transfer 2023-06-09 15:03:54 +02:00
dependabot[bot]
9699edeefe
chore(deps): bump stream-json from 1.7.4 to 1.8.0 
Bumps [stream-json](https://github.com/uhop/stream-json) from 1.7.4 to 1.8.0.
- [Commits](https://github.com/uhop/stream-json/compare/1.7.4...1.8.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-08 15:38:38 +00:00