yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,490 Commits 122 Branches 507 Tags
Commit Graph

23490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simone Taeggi
abae2c1e01 use theme spaces 2022-08-26 17:57:38 +02:00
Simone Taeggi
372b03fcc2 Merge branch 'features/api-token-v2' into api-token-v2/regenerate-an-api-token 2022-08-26 17:53:14 +02:00
Simone
8625c98089
Merge pull request #14231 from strapi/api-token-v2/integrate-BE-on-save-token 
[FE] Integrate the BE to Save a Token in Creation and Update
 2022-08-26 17:30:48 +02:00
Simone Taeggi
0a63f1b69c update snapshots 2022-08-26 16:27:24 +02:00
Simone Taeggi
0987baaf4b add type selection 2022-08-26 15:48:04 +02:00
Simone Taeggi
73a9f3c40c first attempt to fix the save action in both creation and updating 2022-08-26 15:39:09 +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
Simone Taeggi
2f3ca60c63 Merge branch 'main' into features/api-token-v2 2022-08-26 10:06:17 +02:00
Bassel Kanso
db4c3af1f9 remove test 2022-08-26 10:42:01 +03:00
Bassel Kanso
3ce256e279 add content api permissions controller to it's separate file 2022-08-26 10:02:13 +03:00
Jean-Sébastien Herbaux
cf7b2fb6e0
Merge pull request #14220 from strapi/api-token-v2/fix-expiration-date-checks 
Fix expiration date checks
 2022-08-25 17:06:26 +02:00
Convly
29cea1d7cb null guard for expiration checks 2022-08-25 16:56:50 +02:00
Convly
d834bf6f48 Fix tests 2022-08-25 16:27:18 +02:00
Simone Taeggi
0b4ca50191 show the regenerate button only on update and after creation 2022-08-25 16:19:33 +02:00
Bassel Kanso
4d72da1257 Merge branch 'features/api-token-v2' into api-token-v2/permissions-route 2022-08-25 16:59:12 +03:00
Bassel Kanso
a772f8a8ac add content type permissions to the permissions route 2022-08-25 16:57:45 +03:00
Convly
87520328bd Fix expiration date checks on api token strategy 2022-08-25 15:44:10 +02:00
Convly
3568034cb4 Add test for create & update custom token permissions 2022-08-25 15:16:53 +02:00
Convly
8732d07555 Prevent duplicate permissions on create too 2022-08-25 14:25:09 +02:00
Convly
2c71d7d069 Fix permissions update for custom token (uniqueness) 2022-08-25 14:23:36 +02:00
Gustav Hansen
c39ddc8bb0
Merge pull request #14210 from strapi/dependabot/npm_and_yarn/storybook/addon-links-6.5.10 
Bump @storybook/addon-links from 6.5.9 to 6.5.10
 2022-08-25 14:19:30 +02:00
Jean-Sébastien Herbaux
4c6c5e5218
Merge pull request #14214 from strapi/api-token-v2/fix-update-checks 
Fix API tokens' update due to wrong enum values
 2022-08-25 14:12:46 +02:00
Convly
46b28db877 Fix invalid enum value used to assert 'changingTypeToCustom' 2022-08-25 13:56:24 +02:00
Ben Irvin
b3fe16b3c6
Merge pull request #14186 from strapi/api-token-v2/backend-expirations 
Api token v2/backend expirations
 2022-08-25 13:14:27 +02:00
Gustav Hansen
ffa6a0bc53
Merge pull request #14206 from gitstart/STRAP-65 
0 values are not handled correctly in relations
 2022-08-25 12:54:50 +02:00
Simone Taeggi
ca44733f41 add the regenerate button 2022-08-25 12:31:52 +02:00
Ben Irvin
9e42345011 yup blocks unexpected fields 2022-08-25 12:01:52 +02:00
dependabot[bot]
9d76db0380
Bump @storybook/addon-links from 6.5.9 to 6.5.10 
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) from 6.5.9 to 6.5.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.10/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.10/addons/links)

---
updated-dependencies:
- dependency-name: "@storybook/addon-links"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-25 09:08:55 +00:00
Simone Taeggi
826f9eaf40 Merge branch 'main' into features/api-token-v2 2022-08-25 09:09:48 +02:00
gitstart
f67f226102 0 values are not handled correctly in relations 2022-08-25 06:48:27 +00:00
Ben Irvin
2195e9a2f2 fix comment 2022-08-24 19:05:13 +02:00
Ben Irvin
3ca863d80b fix failing test 2022-08-24 19:02:38 +02:00
Alexandre BODIN
a5ae7a818c
Merge pull request #14173 from strapi/dependabot/npm_and_yarn/koa/cors-3.4.1 
Bump @koa/cors from 3.1.0 to 3.4.1
 2022-08-24 18:56:59 +02:00
Ben Irvin
2b30007f86 lifespan must be greater than zero 2022-08-24 18:05:51 +02:00
Ben Irvin
2359ca1cc6 fix tests 2022-08-24 18:05:36 +02:00
Ben Irvin
53be3b5d30 make name unique 2022-08-24 18:04:12 +02:00
Bassel Kanso
64663febef Merge branch 'features/api-token-v2' into api-token-v2/permissions-route 2022-08-24 18:58:27 +03:00
Bassel Kanso
ea2db51fda update permissions package version 2022-08-24 18:57:36 +03:00
Bassel Kanso
ef922ec0fd Merge branch 'features/api-token-v2' into api-token-v2/permissions-route 2022-08-24 18:09:43 +03:00
Bassel Kanso
e8bca67186 create route for api token layout 2022-08-24 18:08:17 +03:00
Simone Taeggi
674a820c82 update permissions package 2022-08-24 16:39:58 +02:00
Ben Irvin
6577a9533c use lodash/fp 2022-08-24 16:29:39 +02:00
Ben Irvin
574448deae remove comments 2022-08-24 16:27:48 +02:00
Ben Irvin
a3a584d176 allow lifespan to update 2022-08-24 16:27:15 +02:00
Ben Irvin
1bd9fbdd85 fix return type 2022-08-24 16:26:40 +02:00
Simone Taeggi
573084845c Merge branch 'features/api-token-v2' of github.com:strapi/strapi into features/api-token-v2 2022-08-24 16:02:58 +02:00
Simone Taeggi
7e99205b28 Merge branch 'main' into features/api-token-v2 2022-08-24 16:02:46 +02:00
Simone Taeggi
160352044a Merge branch 'main' into features/api-token-v2 2022-08-24 16:01:33 +02:00
dependabot[bot]
1af3d1891c
Bump @koa/cors from 3.1.0 to 3.4.1 
Bumps [@koa/cors](https://github.com/koajs/cors) from 3.1.0 to 3.4.1.
- [Release notes](https://github.com/koajs/cors/releases)
- [Changelog](https://github.com/koajs/cors/blob/master/History.md)
- [Commits](https://github.com/koajs/cors/compare/3.1.0...3.4.1)

---
updated-dependencies:
- dependency-name: "@koa/cors"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-24 14:01:29 +00:00