yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-25 06:04:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,965 Commits 138 Branches 514 Tags
Commit Graph

22965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bassel Kanso
94b1ae4c70 Merge branch 'master' into features/api-token-v2 2022-08-04 14:11:28 +03:00
Gustav Hansen
432a26cf5f
Merge pull request #13955 from strapi/dependabot/npm_and_yarn/eslint-plugin-jsx-a11y-6.6.1 
Bump eslint-plugin-jsx-a11y from 6.6.0 to 6.6.1
 2022-08-04 11:52:05 +02:00
Alexandre BODIN
8e05415767
Merge pull request #13961 from strapi/chore/depdendabot-babel-config 
Update dependabot config
 2022-08-03 20:30:15 +02:00
Alexandre Bodin
6a02839acc Update dependabot config 2022-08-03 16:27:27 +02:00
Pierre Noël
07b0ec2ba5
Merge pull request #13958 from strapi/fix/clean-config-new-projects 
Clean config files for generated projects
 2022-08-03 15:31:28 +02:00
Simone
dcb5e64d5d
Merge pull request #13905 from strapi/fix/typescript-webpack-config-not-loaded-in-building-13754 
Fix webpack custom config loading in TypeScript projects
 2022-08-03 15:22:41 +02:00
Alexandre BODIN
ffaff7c66a
Merge pull request #13655 from lkho/pr/database-schema-diff-columns 
fix: diff indexes columns
 2022-08-03 12:33:51 +02:00
Alexandre Bodin
06839f2bca Merge branch 'master' into fix/clean-config-new-projects 2022-08-03 12:29:36 +02:00
dependabot[bot]
39f8c98fd0
Bump eslint-plugin-jsx-a11y from 6.6.0 to 6.6.1 
Bumps [eslint-plugin-jsx-a11y](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y) from 6.6.0 to 6.6.1.
- [Release notes](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/compare/v6.6.0...v6.6.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-jsx-a11y
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-03 10:14:42 +00:00
Simone Taeggi
f0af0bf815 Merge branch 'master' into fix/typescript-webpack-config-not-loaded-in-building-13754 2022-08-03 12:14:01 +02:00
Alexandre Bodin
655615b738 Upgrade babel 2022-08-03 12:09:08 +02:00
Pierre Noël
3df81b92f1 clean config files for generated projects 2022-08-03 12:06:28 +02:00
Simone Taeggi
c232a8e814 revert the empty lines 2022-08-03 12:00:16 +02:00
Alexandre BODIN
f2002891c4
Merge pull request #13952 from strapi/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.18.10 
Bump @babel/plugin-transform-runtime from 7.16.7 to 7.18.10
 2022-08-03 11:58:45 +02:00
Alexandre BODIN
803e50d18b
Merge pull request #13956 from strapi/dependabot/npm_and_yarn/babel/parser-7.18.10 
Bump @babel/parser from 7.18.6 to 7.18.10
 2022-08-03 11:56:59 +02:00
Simone Taeggi
16338ad84b replace the ts webpack config file with the js version 2022-08-03 11:56:23 +02:00
Marc
e73aaf6e9e
Merge pull request #13930 from strapi/fix/manually-resize-image-on-upload 
Do not override width and height after uploading image
 2022-08-03 11:51:58 +02:00
Jean-Sébastien Herbaux
0f7d51a996
Merge pull request #13950 from strapi/fix/ts-get-config-path-invalid-return-type 
Fix invalid return for ts get-config-path
 2022-08-03 11:31:07 +02:00
Jean-Sébastien Herbaux
ec91e5943b
Merge pull request #13824 from strapi/api-token-v2/engine-abstraction 
Permission Engine Abstraction
 2022-08-03 11:19:26 +02:00
dependabot[bot]
1852eb40f1
Bump @babel/parser from 7.18.6 to 7.18.10 
Bumps [@babel/parser](https://github.com/babel/babel/tree/HEAD/packages/babel-parser) from 7.18.6 to 7.18.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.10/packages/babel-parser)

---
updated-dependencies:
- dependency-name: "@babel/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-03 09:11:02 +00:00
dependabot[bot]
202eb2350b
Bump @babel/plugin-transform-runtime from 7.16.7 to 7.18.10 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.16.7 to 7.18.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.10/packages/babel-plugin-transform-runtime)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-03 09:04:11 +00:00
Jean-Sébastien Herbaux
1b43162031
Update packages/core/permissions/README.md 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2022-08-03 10:48:42 +02:00
Jean-Sébastien Herbaux
b082944039
Update packages/core/permissions/README.md 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2022-08-03 10:48:31 +02:00
Simone Taeggi
807eabb356 revert to the original version because we want to use just javascript files for the webpack config 2022-08-03 10:28:35 +02:00
Convly
a7eb9c81e6 Fix return type def 2022-08-03 09:51:45 +02:00
Convly
bf9c618a83 Fix invalid return for ts get-config-path 2022-08-03 09:50:27 +02:00
Jean-Sébastien Herbaux
a6c7c028ad
Merge pull request #13896 from strapi/api-token-v2/up-engine-impl 
Make users-permissions auth strategy use the content API permissions engine
 2022-08-03 09:46:13 +02:00
Marc-Roig
237d12abf4 typos 2022-08-03 09:39:52 +02:00
Alexandre BODIN
7c15f23930
Merge pull request #13938 from strapi/dependabot/npm_and_yarn/babel/plugin-proposal-optional-chaining-7.18.9 
Bump @babel/plugin-proposal-optional-chaining from 7.16.7 to 7.18.9
 2022-08-02 20:14:44 +02:00
dependabot[bot]
c71f1715c8
Bump @babel/plugin-proposal-optional-chaining from 7.16.7 to 7.18.9 
Bumps [@babel/plugin-proposal-optional-chaining](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-optional-chaining) from 7.16.7 to 7.18.9.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.9/packages/babel-plugin-proposal-optional-chaining)

---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-optional-chaining"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-02 16:21:12 +00:00
Alexandre BODIN
edce26b63f
Merge pull request #13939 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1186.0 
Bump aws-sdk from 2.892.0 to 2.1186.0
 2022-08-02 18:17:51 +02:00
Alexandre BODIN
198cb4c9ec
Merge pull request #13923 from strapi/dependabot/npm_and_yarn/cloudinary-1.30.1 
Bump cloudinary from 1.29.0 to 1.30.1
 2022-08-02 18:17:22 +02:00
Alexandre BODIN
05f3471749
Merge pull request #13880 from strapi/dependabot/npm_and_yarn/graphql-tools/utils-8.9.0 
Bump @graphql-tools/utils from 8.6.6 to 8.9.0
 2022-08-02 18:16:41 +02:00
Alexandre BODIN
c282437dac
Merge pull request #13848 from strapi/dependabot/npm_and_yarn/babel/plugin-transform-modules-commonjs-7.18.6 
Bump @babel/plugin-transform-modules-commonjs from 7.16.7 to 7.18.6
 2022-08-02 18:16:09 +02:00
Jean-Sébastien Herbaux
f7a7098ef2
Merge pull request #13937 from strapi/fix/ts-false-positive-get-config-path 
Fix false positive results for ts utils' getConfigPath
 2022-08-02 17:56:48 +02:00
Convly
787a90de69 Fix typings 2022-08-02 17:43:40 +02:00
Convly
53f642f2ed Fix tests 2022-08-02 17:42:38 +02:00
Convly
c473d84128 Merge branch 'api-token-v2/engine-abstraction' into api-token-v2/up-engine-impl 2022-08-02 16:59:37 +02:00
Gustav Hansen
5ef019318c
Merge pull request #13943 from strapi/enhancement/subnav-ds-update 
CTB: Update SubNav styles using improved DS properties
 2022-08-02 16:53:32 +02:00
Ben Irvin
8fd063ae57
Merge pull request #13942 from strapi/api-token-v2/engine-abstraction-tests 
Api token v2/engine abstraction tests
 2022-08-02 16:53:08 +02:00
Convly
7d40f78384 Revert action/subject to action only 2022-08-02 16:51:06 +02:00
Ben Irvin
b077e735ba fix braces 2022-08-02 16:49:03 +02:00
Gustav Hansen
159ee5abf6 chore: Update snapshot tests 2022-08-02 15:14:51 +02:00
Gustav Hansen
eb374ad23a
Merge pull request #13799 from strapi/chore/bump-ds-1-2-1-beta-0 
chore: Bump @strapi/design-system to 1.2.1
 2022-08-02 14:17:56 +02:00
Gustav Hansen
e3fb4d5ae0 CTB: Improve SubNavSection title, by passing down defaultMessage 2022-08-02 13:43:30 +02:00
Gustav Hansen
f25f1b45b7
Merge branch 'master' into chore/bump-ds-1-2-1-beta-0 2022-08-02 13:20:54 +02:00
Gustav Hansen
3016533fd1 CTB: Update SubNav styles using improved DS properties 2022-08-02 13:12:49 +02:00
Ben Irvin
90bc708599 fix test name 2022-08-02 13:12:42 +02:00
Ben Irvin
f2def23f96 fix subject test 2022-08-02 13:07:42 +02:00
Ben Irvin
6e581e044b add type 2022-08-02 13:07:16 +02:00