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

1917 Commits

Author SHA1 Message Date
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
Alexandre Bodin
34c2a41843 Do not try to add API endpoint for content type plugins using i18N 2023-07-11 13:46:54 +02:00
Gustav Hansen
2291816276 Merge branch 'main' into feature/review-workflow-multiple 2023-07-11 12:47:44 +02:00
Josh
fef7cd24df chore: update ds to 1.8.2 2023-07-11 10:20:09 +01:00
dependabot[bot]
595b3a7588
chore(deps): bump react-redux from 8.0.5 to 8.1.1 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 8.0.5 to 8.1.1.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v8.0.5...v8.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-09 23:38:32 +00:00
Gustav Hansen
a886c69b56 Merge branch 'main' into feature/review-workflow-multiple-merge-07-2023 2023-07-07 13:35:15 +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
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
Josh
95de3129e0 fix: i18n CM EditView locale selector flex gap 2023-07-05 10:28:42 +01:00
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
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
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
Alexandre BODIN
028f543e81
Merge branch 'main' into chore/replace-node-14-with-20 2023-07-01 06:56:07 +02:00
Marc Roig
c37d1ce0db
Merge pull request #17127 from Boegie19/fix-local-all-and-populate 2023-06-30 15:54:15 +02:00
Boegie19
459f50452f fixed doc string 2023-06-30 15:01:23 +02:00
Boegie19
48c91ef286 remove console.logs 2023-06-30 14:59:42 +02:00
Boegie19
c05e428286 remove un needed default 2023-06-30 14:59:18 +02:00
Boegie19
3fdbbfc203 fix test and add wrapResult support 2023-06-30 14:55:47 +02:00
Ben Irvin
d1ffb4a544 fix pagination query sanitization 2023-06-29 15:59:45 +02:00
Josh
885aa13160 refactor: useRBAC hook to stop infinite loop 
chore: add test setup to helper-plugin

test: add useRBAC suite

refactor: useRBAC hook to stop infinite loop

chore: shuffle around and add jsdocs
 2023-06-29 11:56:36 +01:00
Boegie19
b29e20c7b5 fix testing error 2023-06-29 12:35:21 +02:00
Boegie19
ce7b590822 fix error 2023-06-29 11:46:13 +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
Boegie19
fe87a895a5 add transformParamsToQuery back 2023-06-28 12:35:03 +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
f49f273327
Merge pull request #16702 from strapi/chore/upgrade-jest-to-29.5 2023-06-27 13:44:40 +02:00
Nitin
fbc1a4888f fix bug on Settings > Documentation & Advanced setting tab while saving 2023-06-27 10:47:37 +05:30
Ben Irvin
c8e128d11c Merge branch 'main' into chore/upgrade-jest-to-29.5 2023-06-26 16:31:04 +02:00
Ben Irvin
23e86fd063 fix some tests 2023-06-26 16:26:39 +02:00
Convly
9fb9f758da Merge branch 'releases/4.11.2' 2023-06-21 16:04:33 +02:00
Convly
6f7c815c2b v4.11.2 2023-06-21 15:57:32 +02:00
Gustav Hansen
528b451257 Chore: Move plugin permissions into constants 2023-06-20 14:18:34 +02:00
Christian
9197eb111b
Merge branch 'main' into remove-didReceiveAPIRequest 2023-06-19 12:53:37 +02:00
Christian Capeans
90694bdfbe Remove didReceiveAPIRequest event 2023-06-19 11:53:24 +02:00
Josh
bc6034cf84
chore: remove history & clean up some U&P tests (#16992) 2023-06-19 10:22:38 +01:00
Gustav Hansen
c86d26d25a
Merge pull request #16985 from strapi/chore/eslint-sort-imports-front 
Chore: Auto-sort imports using eslint
 2023-06-19 09:18:51 +02:00
Gustav Hansen
dca5778d8e Chore: Apply eslint import sorting fix 2023-06-12 21:34:07 +02: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
Josh
7df9fa2da1
refactor: use version 2 of breadcrumbs in anticipation of deprecation (#16981) 2023-06-12 14:42:27 +01:00
Alexandre Bodin
0de06a008d v4.11.0 2023-06-07 17:16:22 +02:00
Josh
8357aab46e
chore: fix tests (#16937) 
Co-authored-by: Marc-Roig <marc12info@gmail.com>
 2023-06-07 11:43:09 +01:00
Convly
106cfafca4 Merge branch 'main' into releases/4.11.0 2023-06-07 11:31:42 +02:00
Josh
38fb966605
chore: upgrade ds to 1.8.0 (#16931) 2023-06-06 15:13:17 +01:00
Gustav Hansen
53ad69979d Chore: Fix missing dependency update for @strapi/icons in sentry 2023-06-02 15:59:49 +02:00