yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-28 16:39:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,989 Commits 124 Branches 506 Tags
Commit Graph

22989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Irvin
8cc144679d accept permissions params for api-tokens 2022-08-09 09:59:09 +02:00
Ben Irvin
f208e0c69d skip custom tests 2022-08-08 22:54:58 +02:00
Ben Irvin
ff559cdf6b custom token test 2022-08-08 22:54:08 +02:00
Ben Irvin
004a959a96 expect token status 2022-08-08 22:53:25 +02:00
Ben Irvin
d70ab84c89 remove randomness 2022-08-08 22:51:01 +02:00
Ben Irvin
01bbebff19 use constants 2022-08-08 22:50:36 +02:00
Ben Irvin
78063a5591 add test for custom without permissions 2022-08-08 17:21:10 +02:00
Ben Irvin
6641ba1f64 update tests 2022-08-08 17:09:17 +02:00
Ben Irvin
d78ec0243d use constant 2022-08-08 17:06:38 +02:00
Ben Irvin
0b057257fd add custom type 2022-08-08 15:00:46 +02:00
Convly
5c7576db65 Fix update & create 2022-08-05 12:31:16 +02:00
Convly
3a9709bdbf Attach permission model to tokens, update api token' strategy & services 2022-08-05 12:01:36 +02:00
Bassel Kanso
701aa19911 update permission engine pakage version 2022-08-05 10:25:07 +03:00
Bassel Kanso
52c0a74418 Merge branch 'master' into features/api-token-v2 2022-08-05 09:55:17 +03:00
Gustav Hansen
70f9be00fc
Merge pull request #13985 from strapi/fix/remove-apollo-federation 
GraphQL: Remove unused @apollo/federation dependency
 2022-08-04 20:07:05 +02:00
Gustav Hansen
25d178d9a8
Merge pull request #13968 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1188.0 
Bump aws-sdk from 2.1186.0 to 2.1188.0
 2022-08-04 17:48:36 +02:00
Gustav Hansen
5856b4f0b9 GraphQL: Remove unused @apollo/federation dependency 2022-08-04 17:44:51 +02:00
Gustav Hansen
d73b847c5c
Merge pull request #13978 from strapi/fix/ml-permissions-view 
ML: Improve canRead and canCreate permission messages
 2022-08-04 17:41:42 +02:00
Gustav Hansen
eb7dbd39d7
Merge pull request #13976 from strapi/fix/upload-proxy-error-gracefully 
Upload: Handle file upload errors gracefully
 2022-08-04 16:38:17 +02:00
Gustav Hansen
838dcc5a01 EmptyOrNoPermissions: simplify getContent() 2022-08-04 15:36:15 +02:00
Gustav Hansen
3c6a58aaea ML: Remove default NoPermissions component 2022-08-04 15:17:56 +02:00
Gustav Hansen
11d021507c ML: Improve canRead and canCreate permission messages 2022-08-04 14:00:23 +02:00
Bassel Kanso
94b1ae4c70 Merge branch 'master' into features/api-token-v2 2022-08-04 14:11:28 +03:00
Gustav Hansen
71f290f4c1 Upload: Handle file upload errors gracefully 2022-08-04 12:06:17 +02: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
dependabot[bot]
a4005fa56d
Bump aws-sdk from 2.1186.0 to 2.1188.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1186.0 to 2.1188.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1186.0...v2.1188.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>
 2022-08-03 18:33:04 +00: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