yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-30 20:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,053 Commits 116 Branches 487 Tags
Commit Graph

465 Commits

Author SHA1 Message Date
Alexandre Bodin
03aa29e527 Fix merge issue 2022-08-11 10:20:50 +02:00
Alexandre Bodin
17866010b7 Apply no promise return 2022-08-11 10:20:50 +02:00
Alexandre Bodin
cf49ddbbfc Prettier and backend fix 2022-08-11 10:20:49 +02:00
Alexandre Bodin
0ae14c06cb 1st fix pass 2022-08-11 10:20:48 +02:00
Ben Irvin
f16d86f8ec remove test 2022-08-10 17:36:21 +02:00
Ben Irvin
fe51a07d01 fix updates 2022-08-10 17:35:15 +02:00
Ben Irvin
4f39f046d9 test update 2022-08-10 10:57:19 +02:00
Ben Irvin
7d59934668 allow empty permissions array on non-custom tokens 2022-08-10 10:55:49 +02:00
Pierre Noël
310833b9c8
Merge pull request #13964 from strapi/fix/logo-customization 
Fix upload of menu logo
 2022-08-09 18:41:35 +02:00
Ben Irvin
6eba2d80bf fix tests to work with custom token changes 2022-08-09 17:49:28 +02:00
Ben Irvin
e7294f812d only return permissions with custom tokens 2022-08-09 17:48:52 +02:00
WalkingPizza
b43a35aaf7 Replace trigger permission with update 2022-08-09 17:20:19 +02:00
ivanThePleasant
7291d2e6cf Change user hashing to be a service on admin, introduce adminUserId property to the send function, refactor several events 2022-08-09 12:20:25 +03:00
Ben Irvin
385fbe500e add non-custom permissions param test 2022-08-09 10:53:16 +02:00
Ben Irvin
a5fcc3eaaf fix failure tests 2022-08-09 10:49:44 +02:00
Ben Irvin
4229f41b4a use ValidationError 2022-08-09 10:28:42 +02:00
Ben Irvin
895e0c1fe4 return permissions with custom token create 2022-08-09 10:27:34 +02:00
Ben Irvin
e3bd58c69a update test names 2022-08-09 10:23:15 +02:00
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
WalkingPizza
e0350558bc Add missing permissions to webhook triggering endpoint 2022-08-06 15:19:20 +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
Pierre Noël
1f41b4ba48 Fix upload of menu logo 2022-08-04 09:57:26 +02:00
Convly
9aff190dc3 Merge branch 'api-token-v2/engine-abstraction' into api-token-v2/up-engine-impl 2022-08-01 10:51:22 +02:00
Convly
77d8499f65 Skip engine test while it's being refactored 2022-08-01 10:49:33 +02:00
Convly
31ef51e245 Update wording 2022-08-01 10:48:01 +02:00
Convly
72c721e8e2 Remove old engine test 2022-08-01 09:31:11 +02:00
Convly
4ebc128ffb Make users-permissions auth strategy use the content API permission engine 2022-07-29 10:17:06 +02:00
Convly
43e360a641 Fix format permission handler argument 2022-07-28 17:05:29 +02:00
Convly
3fa282be30 Merge branch 'master' into api-token-v2/engine-abstraction 2022-07-27 15:46:54 +02:00
Convly
0b8c7b59c6 Merge branch 'master' into features/typescript 2022-07-25 09:30:18 +02:00
Convly
456f945d1e Fix condition checks 2022-07-22 10:43:06 +02:00
Convly
ddb6a91503 Make RBAC an implementation of the @strapi/permissions engine 2022-07-21 10:41:40 +02:00
Pierre Noël
6d265c2917 fix permission-domain.test.js 2022-07-12 17:56:58 +02:00
Alexandre Bodin
91c200490b Fix jest running because of .github and jest weird behavior 2022-07-12 13:54:06 +02:00
Convly
bdb5a3ee89 Merge branch 'releases/4.3.0' into features/typescript 2022-06-30 16:08:51 +02:00
Rémi de Juvigny
68cb67d7ca Show disabled plugins as installed 2022-06-28 17:26:25 +02:00
Convly
bdc043aaec Fix ctx.status 2022-06-07 16:19:24 +02:00
Convly
48ab30ccee First pass on Alexandre's review 2022-06-07 16:07:39 +02:00
Convly
7a99759c1e Merge branch 'releases/4.2.0' of github.com:strapi/strapi into features/typescript 2022-06-07 09:49:55 +02:00
Alexandre Bodin
c765101934 Merge branch 'master' of github.com:strapi/strapi into releases/4.2.0 2022-05-25 12:12:56 +02:00