yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-20 14:49:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 117 Branches 490 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
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
Alexandre Bodin
1ee76ce6e3 chore: udpate docusaure config 2022-08-19 14:03:16 +02:00
Bassel Kanso
61923e62ae modify test 2022-08-19 14:56:31 +03:00
Alexandre Bodin
142cb086ff Merge branch 'main' of github.com:strapi/strapi 2022-08-19 13:54:37 +02:00
Rémi de Juvigny
7e9394f66e
Merge pull request #14137 from strapi/custom-fields/cm-settings 
[Custom fields] Apply content manager settings on custom fields
 2022-08-19 13:54:25 +02:00
Alexandre Bodin
bae43881b8 chore: update docusaurus version 2022-08-19 13:54:25 +02:00
Rémi de Juvigny
620146187f Translate format indicator 2022-08-19 12:19:02 +02:00
Bassel Kanso
96f23ec774 Merge branch 'main' into features/api-token-v2 2022-08-19 12:36:25 +03:00
Alexandre BODIN
f589ccef26
Merge pull request #14118 from strapi/chore/automated-releases 
Automated nightly releases
 2022-08-19 11:25:58 +02:00
Alexandre Bodin
8f44422e8e Handles sqlite not able to add an increment table 2022-08-19 11:14:38 +02:00
dependabot[bot]
6815378001
Bump nexus from 1.2.0 to 1.3.0 
Bumps [nexus](https://github.com/graphql-nexus/nexus) from 1.2.0 to 1.3.0.
- [Release notes](https://github.com/graphql-nexus/nexus/releases)
- [Changelog](https://github.com/graphql-nexus/nexus/blob/main/CHANGELOG.md)
- [Commits](https://github.com/graphql-nexus/nexus/commits/v1.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-19 09:12:05 +00:00
dependabot[bot]
55ab41d694
Bump @sentry/node from 6.19.6 to 6.19.7 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 6.19.6 to 6.19.7.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/6.19.6...6.19.7)

---
updated-dependencies:
- dependency-name: "@sentry/node"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-19 09:08:22 +00:00
Rémi de Juvigny
752b671487
Merge pull request #14130 from strapi/custom-fields/cm-input 
[Custom fields] Add custom field input component in CM edit view
 2022-08-19 10:43:35 +02:00
Alexandre Bodin
714268f310 Add primary keys to relational table 2022-08-19 09:58:20 +02:00
Julie Plantey
1079234a55
Merge pull request #14074 from strapi/dependabot/npm_and_yarn/date-fns-2.29.1 
Bump date-fns from 2.28.0 to 2.29.1
 2022-08-19 09:44:48 +02:00
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