yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-26 06:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,266 Commits 138 Branches 514 Tags
Commit Graph

23266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Irvin
ae90cf5fd0 Merge branch 'api-token-v2/regenerate-tokens-api' into api-token-v2/backend-expirations 2022-08-22 12:11:46 +02:00
Ben Irvin
6de74793df add test todos 2022-08-22 09:26:20 +02:00
Ben Irvin
55dee1a09d verify expiration of token 2022-08-22 09:25:55 +02:00
Ben Irvin
36d37706ce add lifespan and expiresAt fields 2022-08-19 16:33:58 +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
35df5ce4c4 revert 2022-08-18 12:11:34 +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
Ben Irvin
ed9cbce5ad remove test junk 2022-08-18 11:44:03 +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
Simone
ecff97d79b
Merge pull request #14037 from strapi/api-token-v2/rbac-on-api-token-list 
api-token-v2/rbac-on-api-token-list
 2022-08-18 10:53:44 +02:00
Alexandre BODIN
fc863acc53
Merge pull request #14075 from strapi/dependabot/npm_and_yarn/graphql-tools/utils-8.10.0 
Bump @graphql-tools/utils from 8.9.0 to 8.10.0
 2022-08-18 10:38:49 +02:00
Ben Irvin
4f46d57de0 update testing (remove all later) 2022-08-18 10:29:48 +02:00
Ben Irvin
e28c9e7ec9 add lastUsed 2022-08-18 10:22:09 +02:00
Bassel Kanso
5d5e49f079
Merge pull request #14078 from strapi/fix/typescript-plugin-generation 
Fix typescript plugin generation
 2022-08-18 10:54:59 +03:00
Alexandre BODIN
e1e84f07d2
Merge pull request #14073 from strapi/dependabot/npm_and_yarn/sendgrid/mail-7.7.0 
Bump @sendgrid/mail from 7.4.7 to 7.7.0
 2022-08-18 09:41:37 +02:00
Ben Irvin
dece14c0de
Merge pull request #13962 from strapi/fix/preinstall-node-version-check 
Require Node >=14, <=16 to install Strapi
 2022-08-18 09:41:07 +02:00
dependabot[bot]
3aa4ac20ea
Bump @graphql-tools/utils from 8.9.0 to 8.10.0 
Bumps [@graphql-tools/utils](https://github.com/ardatan/graphql-tools/tree/HEAD/packages/utils) from 8.9.0 to 8.10.0.
- [Release notes](https://github.com/ardatan/graphql-tools/releases)
- [Changelog](https://github.com/ardatan/graphql-tools/blob/master/packages/utils/CHANGELOG.md)
- [Commits](https://github.com/ardatan/graphql-tools/commits/@graphql-tools/utils@8.10.0/packages/utils)

---
updated-dependencies:
- dependency-name: "@graphql-tools/utils"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-18 07:34:44 +00: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
Gustav Hansen
9bcee7ca49
Merge pull request #13395 from benderillo/fix-gql-endpoint 
Fetch graphql endpoint path from graphql plugin
 2022-08-17 15:28:14 +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
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
Ben Irvin
1436345e78 remove console.log 2022-08-17 10:10:28 +02:00
Ben Irvin
63b76e8c9d update bootstrap 2022-08-17 09:49:03 +02:00
Ben Irvin
2694362f0e add syncActions 2022-08-17 09:48:35 +02:00
Marc
21d06ce7d0
Merge pull request #13996 from strapi/fix/upload-image-without-extension 
Fix: upload media image with non standard urls
 2022-08-17 09:29:29 +02:00
Ben Irvin
32ad5bc504 await actionSync 2022-08-16 18:22:25 +02:00
Alexandre Bodin
bd48a9fffd Setup timeout for logo update page due to slow image fetching 2022-08-16 18:08:18 +02:00
Alexandre Bodin
840391f541 Fix linter 2022-08-16 11:55:39 +02:00
Simone Taeggi
d23ae7b1a7 update snapshots 2022-08-16 10:45:18 +02:00