yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-13 03:51:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,133 Commits 122 Branches 483 Tags
Commit Graph

407 Commits

Author SHA1 Message Date
Convly
be8985fa20 v4.12.1 2023-08-02 17:13:32 +02:00
dependabot[bot]
e709346a3d
chore(deps): bump aws-sdk from 2.1420.0 to 2.1425.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1420.0 to 2.1425.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1420.0...v2.1425.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>
 2023-07-30 23:01:23 +00:00
Alexandre BODIN
6c81e74ebc
Merge pull request #17479 from strapi/chore/ts-color-picker-be 2023-07-28 15:20:19 +02:00
Alexandre Bodin
eb5a97801d Migrate color picker backend to ts and setup initial frontend configs 2023-07-27 20:38:48 +02:00
Marc-Roig
44b62b3870
Merge branch 'main' into releases/4.12.0 2023-07-27 16:59:14 +02:00
Marc-Roig
7f8109a1a7
v4.12.0 2023-07-27 16:38:18 +02:00
Josh
f062ba1483 Revert "Migrate color-picker plugin to ts" 2023-07-27 13:28:06 +01:00
Ben Irvin
a10084ea9f
Merge pull request #16557 from strapi/chore/replace-node-14-with-20 2023-07-24 18:44:20 +02:00
Alexandre BODIN
af5e67b7e8
Merge pull request #17398 from strapi/chore/ts-color-picker 2023-07-24 18:43:10 +02:00
Ben Irvin
ea684e159a
Merge branch 'main' into chore/replace-node-14-with-20 2023-07-24 16:33:10 +02:00
Alexandre Bodin
5b1ecac1fa Migrate color-picker plugin to ts 2023-07-24 12:02:14 +02:00
dependabot[bot]
485363a666
chore(deps): bump aws-sdk from 2.1415.0 to 2.1420.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1415.0 to 2.1420.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1415.0...v2.1420.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>
 2023-07-23 22:20:02 +00:00
Convly
b4a4e42919 Merge branch 'main' of github.com:strapi/strapi into releases/4.11.6 2023-07-19 16:47:47 +02:00
Convly
1edefac8a3 v4.11.7 2023-07-19 16:39:46 +02:00
Ben Irvin
7a64e2a7fd
Merge branch 'main' into chore/replace-node-14-with-20 2023-07-17 09:15:55 +02:00
dependabot[bot]
791b336f40
chore(deps): bump aws-sdk from 2.1413.0 to 2.1415.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1413.0 to 2.1415.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1413.0...v2.1415.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>
 2023-07-16 22:25:31 +00: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
dependabot[bot]
73462765d8
chore(deps): bump aws-sdk from 2.1409.0 to 2.1413.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1409.0 to 2.1413.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1409.0...v2.1413.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>
 2023-07-10 08:19:42 +00: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
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
dependabot[bot]
1d3dcb7bf3
Bump aws-sdk from 2.1399.0 to 2.1409.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1399.0 to 2.1409.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1399.0...v2.1409.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>
 2023-07-02 22:40:43 +00:00
Alexandre BODIN
028f543e81
Merge branch 'main' into chore/replace-node-14-with-20 2023-07-01 06:56:07 +02:00
Marc Roig
7328972567
Merge pull request #17145 from strapi/fix/do-not-sign-cdn-files 2023-06-30 10:33:51 +02:00
Marc-Roig
133ddc2de4
fix: do not sign files if using baseUrl 2023-06-29 17:02:53 +02:00
Marc-Roig
aac28413ad
v4.11.3 2023-06-28 16:52:34 +02:00
Ben Irvin
7f5b10ee76
Merge branch 'main' into chore/replace-node-14-with-20 2023-06-27 13:45:23 +02:00
Convly
6f7c815c2b v4.11.2 2023-06-21 15:57:32 +02:00
dependabot[bot]
e54595c02c
chore(deps): bump aws-sdk from 2.1372.0 to 2.1399.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1372.0 to 2.1399.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1372.0...v2.1399.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>
 2023-06-18 23:01:53 +00:00
Jean-Sébastien Herbaux
aea0ea8350
Merge pull request #16990 from strapi/releases/4.11.1 2023-06-12 17:27:43 +02:00
Marc-Roig
6cdb5a7737
v4.11.1 2023-06-12 17:10:44 +02:00
Marc
6a14ac1b76
Merge pull request #16940 from strapi/docs/fix-acl-expire-time-s3 2023-06-12 10:52:25 +02:00
Marc
e41415e8ff
Merge pull request #16868 from strapi/fix/s3-bucket-compat-providers 2023-06-08 17:46:53 +02:00
Marc
aa7f6368d0
Update utils.ts 2023-06-08 11:02:12 +02:00
Alexandre Bodin
0de06a008d v4.11.0 2023-06-07 17:16:22 +02:00
Marc-Roig
f787d94bad
fix: mention actual expire time of private assets 2023-06-07 12:08:19 +02:00
Convly
da080df32b v4.10.7 2023-05-31 17:46:38 +02:00
Marc-Roig
7b895b35ac
feat: implement is url from bucket 2023-05-31 11:26:44 +02:00
Ben Irvin
cb2531ef6b
Merge branch 'main' into chore/replace-node-14-with-20 2023-05-25 10:16:29 +02:00
Convly
7dbae9d05d v4.10.6 2023-05-24 16:54:28 +02:00
Sébastien Vanvelthem
5d645f2103
chore: align swc usage for test:unit and fix swc/helpers hazards (#16731) 2023-05-18 09:53:07 +01:00
derrickmehaffy
b66bd63a65 remove all references to airtable assets and switch to market-assets 2023-05-16 14:17:58 -07:00
Convly
d9277d616b v4.10.5 2023-05-11 18:28:54 +02:00
Convly
3f55bac2e7 v4.10.4 2023-05-10 14:46:30 +02:00
Ben Irvin
c9f6a66dfb set minimum node to 16 2023-05-09 18:40:30 +02:00
Ben Irvin
87c8aea2c2 resolve merge conflicts with main 2023-05-09 18:31:42 +02:00
Marc-Roig
1b4b5ffd16
chore: bump aws-sdk version 2023-05-05 08:27:45 +02:00
Convly
a02b19866a v4.10.2 2023-05-03 15:04:25 +02:00
Ben Irvin
09d6856616 fix version typo 2023-04-28 18:07:14 +02:00