yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-31 04:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,846 Commits 116 Branches 487 Tags
Commit Graph

845 Commits

Author SHA1 Message Date
Christian Capeans
b26fd06202 Remove unnecessary logs 2023-07-19 12:16:15 +02:00
Christian Capeans
d04d944fcd Confirm continuing the transfer process if assets backup fakls 2023-07-19 12:14:30 +02:00
Christian Capeans
999ff029f0 Merge 2023-07-19 12:12:02 +02:00
dependabot[bot]
881dae1dce
chore(deps): bump semver from 7.5.1 to 7.5.2 
Bumps [semver](https://github.com/npm/node-semver) from 7.5.1 to 7.5.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v7.5.1...v7.5.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-18 12:26:35 +00:00
Bassel
c10955a85f fixing unit test 2023-07-17 15:20:40 +03:00
Bassel Kanso
dd7fb12755
Merge branch 'main' into feat/data-transfer-assets 2023-07-17 11:35:56 +03:00
Ben Irvin
7a64e2a7fd
Merge branch 'main' into chore/replace-node-14-with-20 2023-07-17 09:15:55 +02:00
Marc-Roig
f5e40910a5
Merge branch 'main' into releases/4.11.5 2023-07-12 15:44:01 +02:00
Marc-Roig
7bdef3d278
v4.11.5 2023-07-12 14:47:27 +02:00
Bassel
4441147220 fix type issue 2023-07-12 12:57:16 +03:00
Bassel
30e8a4e8bd adding transacting to import raw query 2023-07-12 12:49:38 +03:00
Christian Capeans
c4c810d8aa Fix failing test 
Co-authored-by: Bassel Kanso <basselkanso82@gmail.com>
 2023-07-11 10:52:14 +02:00
Bassel
9e4a8821e4 stream files entities 2023-07-10 19:23:46 +03:00
Bassel
2eb22bd061 use same delete method for all upload providers 2023-07-10 17:48:12 +03:00
Bassel
4ca425aa3f log warning incase metadata doesn't exist in export file 2023-07-10 17:37:05 +03:00
Bassel
b1057ce3ec improve stringify 2023-07-10 16:42:25 +03:00
Christian Capeans
763645b07b log error 2023-07-10 11:11:13 +02:00
Bassel
6073283d54 Merge branch 'main' into feat/data-transfer-assets 2023-07-10 12:06:58 +03:00
Christian Capeans
8087ae2101 Add error log 2023-07-10 10:22:03 +02:00
dependabot[bot]
de90fbcd78
chore(deps): bump knex from 2.4.0 to 2.5.0 
Bumps [knex](https://github.com/knex/knex) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/knex/knex/releases)
- [Changelog](https://github.com/knex/knex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/knex/knex/compare/2.4.0...2.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-10 08:18:48 +00:00
Christian Capeans
bd67677f54 Delete merge presence in data transfer strategies 2023-07-06 16:52:44 +02:00
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