yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 00:09:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,134 Commits 112 Branches 488 Tags
Commit Graph

24134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi de Juvigny
b6925b19ac Fix color input hint and error 2022-08-18 11:56:26 +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
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
Alexandre BODIN
482c00e90b
Merge pull request #14095 from seyti67/master 
Completed the (fr) French locale for the i18n plugin
 2022-08-18 11:11:48 +02:00
Ben Irvin
1e3144b002 Merge branch 'main' into fix/typescript-special-char-path 2022-08-18 11:09:38 +02: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
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
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
Gustav Hansen
1194616a24 Eslint: turn off no-process-exit to avoid warnings in PRs 2022-08-18 09:35:47 +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
Alexandre Bodin
7f111ab95b Adds nightly releases 2022-08-17 15:03:18 +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
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
06596f5e4d leave the original values alone 2022-08-17 11:09:27 +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
Alve Svarén
047f4d9115 Add missing swedish core admin translations 2022-08-16 23:27:15 +00:00
Hertak
4f6c049504
Update Main language 2022-08-16 18:44:35 -03:00
Hertak
863511fe9f
Update es.json 2022-08-16 17:01:41 -03: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
Julie Plantey
85105c0943 eslint fix 2022-08-16 17:15:34 +02:00