yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,925 Commits 127 Branches 497 Tags
Commit Graph

27925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Howard
3ab49498c9 chore(content-type-builder): pr feedback 2023-02-01 15:14:03 +00:00
Marc-Roig
e0e2d28f02 Merge branch 'main' into feature/provider-size-limit 2023-02-01 15:56:39 +01:00
Christian
b71eccf656
Merge pull request #14900 from strapi/tracking-system-ct-components-dz 
Tracking system, number of content types and components per user/project
 2023-02-01 13:02:07 +01:00
Christian
c557588829
Merge branch 'main' into tracking-system-ct-components-dz 2023-02-01 12:50:25 +01:00
Marc
786e476209
Merge pull request #15363 from strapi/fix/webhook-with-count-relations 2023-02-01 12:22:42 +01:00
Josh
c26371f455
Merge pull request #15664 from strapi/dependabot/npm_and_yarn/jest-watch-typeahead-2.2.2 2023-02-01 10:38:41 +00:00
Mark Kaylor
cab6d7817e Remove is and is not null operators form user 2023-02-01 11:15:40 +01:00
Marc
27535fdb9a
Merge branch 'main' into fix/webhook-with-count-relations 2023-02-01 11:11:57 +01:00
dependabot[bot]
13fc4f7ca4
chore(deps-dev): bump jest-watch-typeahead from 2.2.0 to 2.2.2 
Bumps [jest-watch-typeahead](https://github.com/jest-community/jest-watch-typeahead) from 2.2.0 to 2.2.2.
- [Release notes](https://github.com/jest-community/jest-watch-typeahead/releases)
- [Changelog](https://github.com/jest-community/jest-watch-typeahead/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jest-community/jest-watch-typeahead/compare/v2.2.0...v2.2.2)

---
updated-dependencies:
- dependency-name: jest-watch-typeahead
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-01 09:36:40 +00:00
Josh
6f794a0b53
Merge pull request #15661 from strapi/dependabot/npm_and_yarn/vercel/ncc-0.36.1 2023-02-01 09:34:55 +00:00
Gustav Hansen
268e11b1ae
Merge pull request #15662 from strapi/dependabot/npm_and_yarn/mini-css-extract-plugin-2.7.2 
chore(deps): bump mini-css-extract-plugin from 2.4.4 to 2.7.2
 2023-02-01 10:28:56 +01:00
Christian
1e6dbdc909
Merge pull request #14921 from TingHaooo/fix/users-permissions-unique-email 
Fix duplicated emails checking
 2023-02-01 10:15:36 +01:00
Marc
d942c56395
Merge branch 'main' into fix/webhook-with-count-relations 2023-02-01 10:08:28 +01:00
dependabot[bot]
a4223ffce6
chore(deps): bump mini-css-extract-plugin from 2.4.4 to 2.7.2 
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 2.4.4 to 2.7.2.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v2.4.4...v2.7.2)

---
updated-dependencies:
- dependency-name: mini-css-extract-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-01 09:06:32 +00:00
dependabot[bot]
7c1333cd1f
chore(deps-dev): bump @vercel/ncc from 0.34.0 to 0.36.1 
Bumps [@vercel/ncc](https://github.com/vercel/ncc) from 0.34.0 to 0.36.1.
- [Release notes](https://github.com/vercel/ncc/releases)
- [Commits](https://github.com/vercel/ncc/compare/0.34.0...0.36.1)

---
updated-dependencies:
- dependency-name: "@vercel/ncc"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-01 09:04:49 +00:00
Marc
e86c4e389d
Merge pull request #15046 from HastaCs/main 2023-02-01 09:41:49 +01:00
Marc-Roig
2d94d30cb0 Merge branch 'main' into fix/webhook-with-count-relations 2023-02-01 09:34:57 +01:00
Mark Kaylor
0b4f2572ba Fix spaces in translations 2023-01-31 17:51:44 +01:00
Jamie Howard
00142301cb fix(CTB): AttributeIcon 2023-01-31 16:35:59 +00:00
Marc
1c5ea28dcb
Merge branch 'main' into main 2023-01-31 16:37:55 +01:00
Christian
449529fd02
Merge branch 'main' into fix/users-permissions-unique-email 2023-01-31 16:17:19 +01:00
marcoautiero
d89e10e108 Fixing issue #15413 2023-01-31 15:50:34 +01:00
Marc
360dc02f58
Merge pull request #15585 from strapi/dependabot/npm_and_yarn/cloudinary-1.33.0 2023-01-31 15:40:15 +01:00
Marc-Roig
bc593964d6 test for populated and not populated relations in webhooks 2023-01-31 15:38:39 +01:00
Simone
21f8e427d3
Merge pull request #15599 from strapi/enhancement/axios-migration-upload 
replace axiosInstance with getFetchClient inside the upload
 2023-01-31 15:12:44 +01:00
Marc-Roig
708e1d677c refactor mapAsyncDialects import 2023-01-31 14:43:10 +01:00
Marc
b5926ee665
Merge branch 'main' into dependabot/npm_and_yarn/cloudinary-1.33.0 2023-01-31 14:39:44 +01:00
Gustav Hansen
c13a72ef26
Merge pull request #15644 from strapi/chore/update-caniuse-db 
Chore: Update caniuse database
 2023-01-31 14:10:37 +01:00
Mark Kaylor
ab87379d48 Add empty line between tests 2023-01-31 14:03:05 +01:00
Mark Kaylor
9dc89bb2f6 Add models to publish actions 2023-01-31 14:00:39 +01:00
Mark Kaylor
04630cdf98 Make schema optional on mainField 2023-01-31 13:46:39 +01:00
Gustav Hansen
82115b2ca7 Chore: Update caniuse database 2023-01-31 13:30:37 +01:00
Marc
63e448c326
Merge branch 'main' into dependabot/npm_and_yarn/cloudinary-1.33.0 2023-01-31 12:57:39 +01:00
Marc-Roig
9d865b7b11 use mapAsync for all cases in mapAsyncDialects 2023-01-31 11:57:32 +01:00
Ben Irvin
9bbcab2e8a
Merge pull request #15639 from strapi/fix/import-invalid-jsonl-should-throw 2023-01-31 11:51:21 +01:00
Marc-Roig
cd8429c3c7 simplify mapAsyncDialects 2023-01-31 11:46:02 +01:00
Marc-Roig
67f2cc730c simplify mapAsyncDialects 2023-01-31 11:43:23 +01:00
Marc-Roig
cf88d212f9 introduce use of mapAsync 2023-01-31 11:40:56 +01:00
Marc-Roig
3a4e811756 Merge branch 'main' into fix/performance-degradation-in-deeply-nested-coimpos 2023-01-31 11:13:08 +01:00
markkaylor
5c565ae9e1
Merge pull request #15606 from strapi/chore/cm-json-input 
[Content Manager] Add the new JSONInput from the DS to the CM
 2023-01-31 11:00:15 +01:00
Gustav Hansen
778614cc36
Merge pull request #15642 from strapi/dependabot/npm_and_yarn/immer-9.0.19 
chore(deps): bump immer from 9.0.15 to 9.0.19
 2023-01-31 10:49:12 +01:00
Mark Kaylor
e1e02a800b Fix bad import 2023-01-31 10:43:41 +01:00
Mark Kaylor
83a980fe93 Add snapshot test 2023-01-31 10:13:31 +01:00
Mark Kaylor
d371b73189 Update size 2023-01-31 10:13:14 +01:00
dependabot[bot]
acf7129596
chore(deps): bump immer from 9.0.15 to 9.0.19 
Bumps [immer](https://github.com/immerjs/immer) from 9.0.15 to 9.0.19.
- [Release notes](https://github.com/immerjs/immer/releases)
- [Commits](https://github.com/immerjs/immer/compare/v9.0.15...v9.0.19)

---
updated-dependencies:
- dependency-name: immer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-31 09:04:01 +00:00
Rémi de Juvigny
14a1972d07
Merge pull request #15589 from strapi/dependabot/npm_and_yarn/inquirer-8.2.5 
chore(deps): bump inquirer from 8.2.4 to 8.2.5
 2023-01-31 10:00:26 +01:00
Julie Plantey
7055da085f
Merge pull request #15534 from hide-me/main 
Fix and updates for plugin translations
 2023-01-31 09:51:45 +01:00
Mark Kaylor
45b04be287 Remove global styles 2023-01-31 09:30:44 +01:00
Ben Irvin
b9275ce7a6
Merge branch 'main' into fix/import-invalid-jsonl-should-throw 2023-01-31 09:05:54 +01:00
Ben Irvin
e73b7873c5
Merge pull request #15609 from strapi/enhancement/add-datatype-diff-type 2023-01-31 09:05:01 +01:00