yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-21 14:31:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 123 Branches 496 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
ecc7a08ed6
Merge pull request #14136 from strapi/dependabot/npm_and_yarn/actions/core-1.9.1 
Bump @actions/core from 1.9.0 to 1.9.1
 2022-08-19 09:36:10 +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
dependabot[bot]
aca6529b9d
Bump @actions/core from 1.9.0 to 1.9.1 
Bumps [@actions/core](https://github.com/actions/toolkit/tree/HEAD/packages/core) from 1.9.0 to 1.9.1.
- [Release notes](https://github.com/actions/toolkit/releases)
- [Changelog](https://github.com/actions/toolkit/blob/main/packages/core/RELEASES.md)
- [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/core)

---
updated-dependencies:
- dependency-name: "@actions/core"
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-18 19:59:39 +00: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
Rémi de Juvigny
d81ecff2b4 Show options on custom field example 2022-08-18 18:15:50 +02:00
Julie Plantey
2ae55c2739 fix ApiTokens LV tests 2022-08-18 17:59:44 +02:00
Rémi de Juvigny
09230a8b78 Show custom field icon on CM settings modal 2022-08-18 17:45:49 +02:00
Rémi de Juvigny
3f756b83d9 Use string type for color custom field 2022-08-18 17:45:49 +02:00
Rémi de Juvigny
c383b3fe36 Remove customFieldUid from generic input 2022-08-18 17:44:34 +02:00
Rémi de Juvigny
b70870a233 Move suspense up the tree 2022-08-18 17:41:09 +02:00
Rémi de Juvigny
785639c5ec Move custom field type out of helper plugin 2022-08-18 17:32:51 +02:00
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
d980dbf9e3
Merge pull request #14093 from strapi/fix/typescript-special-char-path 
Fix new typescript  projects with special characters in path
 2022-08-18 14:04:30 +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
Gustav Hansen
f4035f45ca
Merge pull request #14119 from strapi/chore/ignore-process-exit-warnings 
Chore: Ignore process.exit eslint warnings
 2022-08-18 12:58:52 +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
Rémi de Juvigny
27f67bfbe9 Simplify label 2022-08-18 12:16:18 +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
Rémi de Juvigny
b6925b19ac Fix color input hint and error 2022-08-18 11:56:26 +02:00
Valentin Dimitroff
d98afc6e0b Add baseUrl and rootPath properties to s3 uploader configuration 2022-08-18 11:55:04 +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
WalkingPizza
97ccf5ece1 Throw when trying to create a Strapi app via CLI with another flag as template name 2022-08-18 10:57:50 +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
WalkingPizza
0bbe493407 Add CORS configuration to S3 provider README 2022-08-18 10:39:48 +02:00