yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 09:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,294 Commits 115 Branches 488 Tags
Commit Graph

31294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustav Hansen
009f770e54 Chore: Remove cellFormatter callback and inline columns in list-view 2023-07-06 13:13:20 +02:00
Christian Capeans
063b2f366c Merge branch 'main' into dependabot/npm_and_yarn/winston-3.9.0 2023-07-06 11:32:00 +02:00
smoothdvd
24283a030e
Merge branch 'main' into patch-4 2023-07-06 16:13:38 +08:00
Jean-Sébastien Herbaux
4a3b7f564e
Merge pull request #17175 from boazpoolman/feature/admin-type 2023-07-06 09:24:43 +02:00
Josh
d2d5476f07
Merge pull request #17155 from strapi/chore/remove-step-from-time 2023-07-05 16:54:17 +01:00
Jean-Sébastien Herbaux
9751bc9825
Merge pull request #17207 from strapi/releases/4.11.4 2023-07-05 17:40:40 +02:00
Convly
3149e374f4 Merge branch 'releases/4.11.4' 2023-07-05 16:51:48 +02:00
Convly
babbeb86b6 Update yarn.lock 2023-07-05 16:50:01 +02:00
Convly
8d325a6953 v4.11.4 v4.11.4 2023-07-05 16:46:16 +02:00
Jean-Sébastien Herbaux
5342fe4390
Merge pull request #17204 from strapi/fix/date-parser 2023-07-05 16:22:14 +02:00
Jean-Sébastien Herbaux
8fe9a90972
Merge pull request #17017 from strapi/dependabot/npm_and_yarn/graphql-scalars-1.22.2 2023-07-05 15:06:13 +02:00
Christian Capeans
98f34c162e Fix date parser 2023-07-05 15:01:37 +02:00
Gustav Hansen
e0c7d79524 Fix: Add back review workflows column in new CM list view 2023-07-05 14:13:06 +02:00
Josh
fde1c794f6
Merge pull request #17195 from strapi/fix/i18n-cm-edit-view-gap 2023-07-05 12:46:23 +01:00
Gustav Hansen
19d827b0a9 Chore: Refactor CM list-view review-workflow columns to use useEnterprise 2023-07-05 13:32:23 +02:00
Gustav Hansen
b88b9e8af8 Enhancement: Extend useEnterprise hook by an enabled boolean flag 2023-07-05 13:32:08 +02:00
Christian Capeans
04bedb1b54 Merge branch 'main' into dependabot/npm_and_yarn/winston-3.9.0 2023-07-05 13:25:17 +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
Josh
95de3129e0 fix: i18n CM EditView locale selector flex gap 2023-07-05 10:28:42 +01:00
Josh
f76018d648
Merge pull request #17183 from strapi/chore/refactor-helper-plugin-tests 2023-07-05 09:58:48 +01:00
Gustav Hansen
0a147c142d
Merge pull request #17189 from strapi/dependabot/npm_and_yarn/jest-cd7e10a537 
chore(deps-dev): bump the jest group with 4 updates
 2023-07-05 10:48:54 +02:00
Gustav Hansen
36ec1a182a
Merge pull request #17191 from strapi/dependabot/npm_and_yarn/webpack-d131db577c 
chore(deps): bump the webpack group with 1 update
 2023-07-05 10:48:39 +02:00
Josh
7da44e6406 refactor: remove history from hp tests and refactor Pagination component 2023-07-05 08:53:29 +01:00
Josh
f430548a7e
Merge pull request #17188 from noobCode-69/main 2023-07-05 08:30:17 +01:00
dependabot[bot]
e7c69a396b
chore(deps): bump the webpack group with 1 update 
Bumps the webpack group with 1 update: [webpack](https://github.com/webpack/webpack).

- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.86.0...v5.88.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-05 07:13:02 +00: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
Gustav Hansen
27505e6741
Merge pull request #17184 from strapi/chore/dependabot-groups 
Chore: Group dependabot updates
 2023-07-05 09:05:45 +02:00
so_hell
8bd5f4d7f8 Fix bug #17187: updated the handleClick function 2023-07-05 09:52:39 +05:30
dependabot[bot]
8b0de32c6e
chore(deps): bump graphql-scalars from 1.20.1 to 1.22.2 
Bumps [graphql-scalars](https://github.com/Urigo/graphql-scalars) from 1.20.1 to 1.22.2.
- [Release notes](https://github.com/Urigo/graphql-scalars/releases)
- [Changelog](https://github.com/Urigo/graphql-scalars/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Urigo/graphql-scalars/compare/v1.20.1...v1.22.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-04 15:33:41 +00:00
Gustav Hansen
da46061869 Chore: Group dependabot updates 2023-07-04 17:32:00 +02:00
Jean-Sébastien Herbaux
670f4a65e1
Merge pull request #16785 from strapi/dependabot/npm_and_yarn/lerna-6.6.2 2023-07-04 17:31:55 +02:00
dependabot[bot]
a324ebeed8
chore(deps-dev): bump lerna from 6.5.1 to 6.6.2 
Bumps [lerna](https://github.com/lerna/lerna/tree/HEAD/packages/lerna) from 6.5.1 to 6.6.2.
- [Release notes](https://github.com/lerna/lerna/releases)
- [Changelog](https://github.com/lerna/lerna/blob/main/packages/lerna/CHANGELOG.md)
- [Commits](https://github.com/lerna/lerna/commits/6.6.2/packages/lerna)

---
updated-dependencies:
- dependency-name: lerna
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-04 14:35:33 +00:00
Josh
bc87e695db
Merge pull request #17126 from strapi/chore/remove-unique-identifier 2023-07-04 15:05:39 +01:00
Gustav Hansen
e59a080e45 Chore: Update yarn lockfile 2023-07-04 15:47:05 +02:00
Maxime Castres
b724d9abe8 Chore: Remove unique identifier 2023-07-04 15:46:12 +02:00
Josh
83ada24a02
Merge pull request #17064 from smorimoto/update-yarn-3.6.0 2023-07-04 09:16:06 +01:00
Boaz Poolman
282c29564a feat: Add an any type for strapi.admin 2023-07-03 20:58:09 +02:00
Sora Morimoto
45cc9518e4 Update Yarn to v3.6.1 
Signed-off-by: Sora Morimoto <sora@morimoto.io>
 2023-07-04 03:09:43 +09:00
Josh
2f67950deb
Merge pull request #17169 from strapi/chore/update-ds-181 2023-07-03 16:22:54 +01:00
Jean-Sébastien Herbaux
8c7ea46ccf
Merge pull request #17122 from strapi/fix/dts-pull-hang 2023-07-03 17:20:54 +02:00
Jamie Howard
2d4db7a482
Merge pull request #17128 from strapi/fix/rw-webhooks 2023-07-03 15:24:10 +01:00
Josh
d301b8a7ad chore: update DS to 1.8.1 2023-07-03 15:14:38 +01:00
Josh
9bc4e05325
Merge pull request #17140 from strapi/fix/useRBAC-infinite-loop 2023-07-03 14:24:55 +01:00
Josh
a0fb526155
Merge pull request #17164 from strapi/dependabot/npm_and_yarn/webpack-bundle-analyzer-4.9.0 2023-07-03 10:36:53 +01:00
Marc Roig
e781c56a46
Merge pull request #17165 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1409.0 2023-07-03 11:25:08 +02:00
Jean-Sébastien Herbaux
17bf13c6b2
Merge pull request #17143 from strapi/fix/16170-graphql-pagination-count-filter 2023-07-03 11:10:05 +02:00
Convly
e5854ec0de Use getModel instead of contentTypes 2023-07-03 10:13:57 +02:00
Jean-Sébastien Herbaux
d21f34e436
Merge branch 'main' into fix/16170-graphql-pagination-count-filter 2023-07-03 10:10:18 +02:00
Josh
1eff3b27a7
Merge pull request #17141 from nitinmadelyn/edit-user 2023-07-03 08:15:35 +01: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