yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 10:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,053 Commits 114 Branches 488 Tags
Commit Graph

6989 Commits

Author SHA1 Message Date
Marc-Roig
6022e327d3 Merge branch 'main' into fix/delete-components-when-deleting-entity 2022-08-18 17:23:21 +02:00
Marc-Roig
3577fae4e4 get list of components to delete them afterwards 2022-08-18 17:19:18 +02:00
Rémi de Juvigny
01d8f37507 Add condition to customInputs 2022-08-18 16:32:05 +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
Rémi de Juvigny
64c5c10f34 Restore ternary 2022-08-18 12:19:06 +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
Rémi de Juvigny
6e3b2d683a Fix custom field input loader remounting 2022-08-18 11:28:30 +02: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
Julie Plantey
791b7f5e44 wip 2022-08-18 09:52:57 +02:00
Rémi de Juvigny
1fed0afa01 Try InputLoader 2022-08-18 09:50:27 +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
Julie Plantey
d312648a77 RelationList height & scroll 2022-08-17 17:09:32 +02:00
Julie Plantey
3b77b20218 disabled state 2022-08-17 16:17:23 +02:00
Rémi de Juvigny
4729a49186 Merge remote-tracking branch 'origin/features/custom-fields' into custom-fields/cm-input 2022-08-17 14:51:48 +02:00
Rémi de Juvigny
cd7c339445 Move custom field input to GenericInput 2022-08-17 14:49:59 +02:00
Rémi de Juvigny
11eee5c9f5 Add custom field to inputs 2022-08-17 14:36:04 +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
Julie Plantey
f766df3ee0 error and description state 2022-08-17 12:12:21 +02:00
Julie Plantey
24d0f3b9c5 Relation background 2022-08-17 11:49:59 +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
Bassel Kanso
9a7968ac32 Merge branch 'fix/service-typings' of https://github.com/strapi/strapi into fix/service-typings 2022-08-17 12:16:15 +03:00
Bassel Kanso
9ced5f53dd Merge branch 'master' into fix/service-typings 2022-08-17 12:15:46 +03:00
Ben Irvin
1436345e78 remove console.log 2022-08-17 10:10:28 +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
Alve Svarén
047f4d9115 Add missing swedish core admin translations 2022-08-16 23:27:15 +00:00