yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-30 04:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,587 Commits 115 Branches 486 Tags
Commit Graph

5123 Commits

Author SHA1 Message Date
Ben Irvin
a063f21474 jsdoc comments 2022-08-19 16:53:51 +02:00
Ben Irvin
c5eb2b1a9d rename mapTokenPermissions to flattenTokenPermissions 2022-08-19 16:45:16 +02:00
Ben Irvin
d4f03c7d56 declare functions before use 2022-08-19 16:42:55 +02:00
Ben Irvin
c6aef125c9 fix jsdoc params 2022-08-19 16:41:39 +02:00
Ben Irvin
e79617b094 lastUsedAt isn't a valid update field 2022-08-19 16:37:41 +02:00
Ben Irvin
e3961fb298 rename lastUsed to lastUsedAt 2022-08-19 16:36:28 +02:00
Ben Irvin
36d37706ce add lifespan and expiresAt fields 2022-08-19 16:33:58 +02:00
Simone Taeggi
e8fc84affd fix linting errors 2022-08-19 15:56:41 +02:00
Simone Taeggi
6b05d3cbba Merge branch 'features/api-token-v2' into api-token-v2/api-tokens-design-details 2022-08-19 15:46:08 +02:00
Simone Taeggi
754ed2ffa4 refactor the coverage script for the helper plugin 2022-08-19 15:40:38 +02:00
Bassel Kanso
96f23ec774 Merge branch 'main' into features/api-token-v2 2022-08-19 12:36:25 +03:00
Alexandre Bodin
8f44422e8e Handles sqlite not able to add an increment table 2022-08-19 11:14:38 +02:00
Alexandre Bodin
714268f310 Add primary keys to relational table 2022-08-19 09:58:20 +02:00
Simone Taeggi
96e26338ff fix the PR based on Alex comment related where to define the coverage options 2022-08-19 09:05:46 +02:00
Simone Taeggi
9d9f7d2a86 Merge branch 'main' into chore/add-coverage-script-in-the-admin-package-json 2022-08-19 08:56:55 +02:00
Julie Plantey
8f52e4178a Merge branch 'main' of https://github.com/strapi/strapi into dependabot/npm_and_yarn/date-fns-2.29.1 2022-08-18 18:33:22 +02:00
Julie Plantey
73b12aa94d upgrading to v2.29.2 because 2.29.1 introduced a breaking change on intervalToDuration 2022-08-18 18:31:27 +02:00
Simone Taeggi
f8e6757519 merge features/api-token-v2 2022-08-18 18:28:07 +02:00
Simone Taeggi
e0798960c0 Add shadow to the Permissions container and close the Accordion if another one is selected 2022-08-18 18:18:29 +02:00
Julie Plantey
2ae55c2739 fix ApiTokens LV tests 2022-08-18 17:59:44 +02:00
Ben Irvin
c8af2cef6b remove log 2022-08-18 14:55:57 +02:00
Ben Irvin
f30f25ecbe lint 2022-08-18 14:52:16 +02:00
Ben Irvin
7ce7db6604 update tests 2022-08-18 14:12:34 +02:00
Ben Irvin
9941198dac fix regeneration 2022-08-18 14:03:59 +02:00
Ben Irvin
7098ae95be Merge branch 'api-token-v2/backend/regenerate-token' into api-token-v2/regenerate-tokens-api 2022-08-18 13:48:06 +02:00
Ben Irvin
06d95419f4 add regeneration of tokens 2022-08-18 13:31:02 +02:00
Ben Irvin
21845bb0d0 remove lastUsed from create 2022-08-18 12:30:27 +02:00
Ben Irvin
fd05d49346 fix linting 2022-08-18 12:24:13 +02:00
Ben Irvin
b2b1432322 Merge branch 'features/api-token-v2' into api-token-v2/permissions-for-api-token 2022-08-18 12:20:45 +02:00
Ben Irvin
622d00930f fix required attributes 2022-08-18 12:13:29 +02:00
Ben Irvin
c61e402461 disallow updating lastUsed from api 2022-08-18 12:03:25 +02:00
Ben Irvin
745a3a8497 add lastUsed to yup validation schema 2022-08-18 12:00:47 +02:00
Ben Irvin
9de7791fad cleanup 2022-08-18 11:53:30 +02:00
Bassel Kanso
3fb0206a25 fix lint issues 2022-08-18 12:43:38 +03:00
Bassel Kanso
4c07dec65f Merge branch 'features/api-token-v2' of https://github.com/strapi/strapi into features/api-token-v2 2022-08-18 12:20:56 +03:00
Bassel Kanso
baad6fd93f Merge branch 'main' into features/api-token-v2 2022-08-18 12:18:09 +03:00
Ben Irvin
7b60783888 fix e2e tests 2022-08-18 11:02:24 +02:00
Ben Irvin
449f982781 Merge branch 'api-token-v2/permissions-for-api-token' into api-token-v2/access-times-backend 2022-08-18 10:55:11 +02:00
Ben Irvin
e28c9e7ec9 add lastUsed 2022-08-18 10:22:09 +02:00
Simone Taeggi
2ea3c317e5 add updatedAt field in the list of token 2022-08-18 09:46:39 +02:00
Gustav Hansen
7d72343aac
Merge pull request #14077 from strapi/dependabot/npm_and_yarn/axios-0.27.2 
Bump axios from 0.24.0 to 0.27.2
 2022-08-18 09:33:30 +02:00
Ben Irvin
215735b0cd update lastUsed when token is accessed 2022-08-17 23:28:35 +02:00
Ben Irvin
f95bb29d76 add lastUsed 2022-08-17 23:28:20 +02:00
Alex V
b411b49d93 Fetch graphql endpoint path from graphql plugin 
- Do not use hardcoded '/graphql' endpoint because it will mismatch
if plugin has different endpoint configuration.
 2022-08-17 13:24:37 +02:00
dependabot[bot]
0f05a28906 Bump axios from 0.24.0 to 0.27.2 
Bumps [axios](https://github.com/axios/axios) from 0.24.0 to 0.27.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.27.2/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.24.0...v0.27.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-17 13:07:01 +02:00
dependabot[bot]
01aaee8d36 Bump date-fns from 2.28.0 to 2.29.1 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.28.0 to 2.29.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/main/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.28.0...v2.29.1)

---
updated-dependencies:
- dependency-name: date-fns
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-17 13:06:42 +02:00
Gustav Hansen
e4e0981e24
Merge pull request #14076 from strapi/dependabot/npm_and_yarn/sanitize-html-2.7.1 
Bump sanitize-html from 2.7.0 to 2.7.1
 2022-08-17 13:05:32 +02:00
Alexandre BODIN
dd227e2b64
Merge pull request #14015 from strapi/chore/master-to-main 
Prepare switch to main instead of master
 2022-08-17 11:18:57 +02:00
Alexandre BODIN
67add5e425
Merge pull request #14112 from strapi/chore/logo-update-timout-fix 
Setup timeout for logo update page due to slow image fetching
 2022-08-17 11:18:11 +02:00
Alexandre Bodin
a90d53db4c Prepare switch to main instead of master 2022-08-17 11:17:44 +02:00