yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-27 19:10:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,134 Commits 111 Branches 486 Tags
Commit Graph

412 Commits

Author SHA1 Message Date
Convly
340b17d6da Update wording 2022-09-29 18:12:05 +02:00
Convly
a1c7185252 Add hostedOnStrapiCloud property to the telemetry events 2022-09-29 17:35:18 +02:00
Jamie Howard
a742a5d6bc
Merge pull request #14458 from strapi/fix/13360/camel-case-email 
Treat email as lowercase when creating a user
 2022-09-29 13:48:55 +01:00
Jamie Howard
bfbab082cf fix(admin): lowercase email when creating user 2022-09-26 15:52:08 +01:00
Simone Taeggi
8753fae8ff Merge branch 'main' into features/api-token-v2 2022-09-14 14:47:38 +02:00
Julie Plantey
3b53153723
Merge pull request #14290 from WalkingPizza/fix/13648 
Trim admin's first name when validating
 2022-09-12 10:31:32 +02:00
Simone Taeggi
2870ba20f9 Merge branch 'features/api-token-v2' into api-token-v2/regenerate-permission 2022-09-09 00:53:32 +02:00
Simone Taeggi
1a289ca1ff Revert "merge main" 
This reverts commit 5dc28ed5e5ead9b83b8bb30f96efc6eb6f1d3e3f.
 2022-09-08 23:49:07 +02:00
Simone Taeggi
5dc28ed5e5 merge main 2022-09-08 23:40:39 +02:00
Simone Taeggi
e1a0ae803e Merge branch 'main' into features/api-token-v2 2022-09-08 22:16:55 +02:00
Simone Taeggi
d48f5919c3 fix the api-token routes policy 2022-09-08 11:39:09 +02:00
Simone Taeggi
527bad15ef update e2e test 2022-09-08 00:08:59 +02:00
Simone Taeggi
a78c2a88cb update snasphot 2022-09-07 23:09:10 +02:00
Simone Taeggi
99b47e7178 update snapshots 2022-09-07 22:48:17 +02:00
Simone Taeggi
ba9cdb8d7f update admin permissions e2e snapshots 2022-09-07 21:01:32 +02:00
Simone Taeggi
cb0bacbfe9 update e2e failing snapshot 2022-09-07 18:58:42 +02:00
Simone Taeggi
e4550714d8 update e2e failing snapshot 2022-09-07 18:54:26 +02:00
Alexandre Bodin
961d535ea9 Fix for in working with undefined 2022-09-06 20:32:15 +02:00
Simone Taeggi
9ddd46a776 add the regenerate permission to the api token 2022-09-06 11:02:44 +02:00
Alexandre Bodin
4e989321e3 Fix eslint core/admin 2022-09-05 16:15:21 +02:00
Bassel Kanso
30e3a2ac70 Merge branch 'features/api-token-v2' into api-token-v2/get-action-bound-routes 2022-09-02 11:17:39 +03:00
Bassel Kanso
c842085fe3 move routes map service to content API coontainer 2022-09-02 11:06:55 +03:00
WalkingPizza
1b6ccc76b6 Trim admin's first name when validating 2022-09-01 22:45:23 +02:00
Ben Irvin
7091e551c4
Merge pull request #14278 from strapi/api-token-v2/lifespan-no-update 
Prevent updating an API token's lifespan from the admin API
 2022-09-01 10:00:31 +02:00
Simone Taeggi
078c4fb96c merge main in features/api-token-v2 2022-09-01 09:50:19 +02:00
Ben Irvin
55634bacbd lifespan update not allowed 2022-08-31 16:42:48 +02:00
Ben Irvin
dc90c752c8 remove old path 2022-08-31 10:57:13 +02:00
Ben Irvin
1e5f8e9fee fix test 2022-08-31 10:56:59 +02:00
Bassel Kanso
e9fd658331 add a route to get contentApi Routes 2022-08-31 11:39:55 +03:00
Jean-Sébastien Herbaux
b9538ea7c3
Merge pull request #14247 from strapi/api-token-v2/throw-on-unknown-permission 
Validate & throw on unknown permissions for API tokens
 2022-08-31 10:34:32 +02:00
Gustav Hansen
51caa5f5a3 chore: Update e2e snapshot tests 2022-08-30 15:44:12 +02:00
Convly
dc084f9102 Add missing await 2022-08-30 10:56:17 +02:00
Jean-Sébastien Herbaux
bd9ddaa84c
Merge pull request #14248 from strapi/api-token-v2/db-auto-sync-and-cleanup 
Automatically synchronize and cleanup API tokens' permissions in database
 2022-08-30 10:54:46 +02:00
Convly
bf5534d725 Test consistency 2022-08-29 18:03:43 +02:00
Convly
dfad26d2a2 Fix test 2022-08-29 18:03:04 +02:00
Convly
e4b9dd5ab8 Simplify the delete request 2022-08-29 17:39:41 +02:00
Convly
a80e83d397 Remove console.log 2022-08-29 17:36:22 +02:00
Convly
f506369ce6 Sync permissions in DB with existing one, automatic cleanup on schema deletion 2022-08-29 17:32:41 +02:00
Convly
e7ca50f6b9 Validate permissions for api-tokens & throw on unknown permissions 2022-08-29 16:33:41 +02:00
Ben Irvin
3cd1a9b183
Merge branch 'features/api-token-v2' into api-token-v2/restrict-lifespans 2022-08-29 12:37:53 +02:00
Ben Irvin
0213ee2e1a
Merge pull request #14238 from strapi/api-token-v2/rename-api-token-permission 
rename token-permission to api-token-permission
 2022-08-29 12:35:21 +02:00
Ben Irvin
b4c8cae41d
Merge pull request #14234 from strapi/api-token-v2/allow-empty-permissions-array 
allow empty array of permissions
 2022-08-29 12:34:57 +02:00
Simone
4f7db2ef72
Merge pull request #14180 from strapi/api-token-v2/settings-access-api-token 
RBAC on API tokens settings access
 2022-08-29 11:30:26 +02:00
Ben Irvin
2dea049a8c fix test 2022-08-29 10:50:46 +02:00
Ben Irvin
7ed24a9edf
Merge pull request #14192 from strapi/api-token-v2/regenerate-tokens-api 
Api Token v2/add regenerate controller tests
 2022-08-29 10:38:42 +02:00
Ben Irvin
9aed7d9540 rename token-permission to api-token-permission 2022-08-29 09:17:31 +02:00
Ben Irvin
697662421f allow empty array of permissions 2022-08-26 16:11:08 +02:00
Ben Irvin
16537f199e validate lifespan 2022-08-26 15:27:47 +02:00
Jean-Sébastien Herbaux
d3357b87af
Merge pull request #14216 from strapi/api-token-v2/fix-update-custom-token-permissions 
Fix permissions update for custom API tokens
 2022-08-26 15:24:06 +02:00
Bassel Kanso
025c4d154f
Merge pull request #14200 from strapi/api-token-v2/permissions-route 
Api token layout route
 2022-08-26 12:44:12 +03:00