yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-20 22:10:06 +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
Julie Plantey
93f4a43b27 remove unnecessary translation key 2022-08-25 17:49:16 +02:00
Julie Plantey
62c50bedfb loadingMessage prop, label structure + loading style improvements 2022-08-25 17:46:45 +02:00
Jean-Sébastien Herbaux
cf7b2fb6e0
Merge pull request #14220 from strapi/api-token-v2/fix-expiration-date-checks 
Fix expiration date checks
 2022-08-25 17:06:26 +02:00
Convly
29cea1d7cb null guard for expiration checks 2022-08-25 16:56:50 +02:00
Convly
d834bf6f48 Fix tests 2022-08-25 16:27:18 +02:00
Simone Taeggi
0b4ca50191 show the regenerate button only on update and after creation 2022-08-25 16:19:33 +02:00
Bassel Kanso
4d72da1257 Merge branch 'features/api-token-v2' into api-token-v2/permissions-route 2022-08-25 16:59:12 +03:00
Bassel Kanso
a772f8a8ac add content type permissions to the permissions route 2022-08-25 16:57:45 +03:00
Convly
87520328bd Fix expiration date checks on api token strategy 2022-08-25 15:44:10 +02:00
Convly
3568034cb4 Add test for create & update custom token permissions 2022-08-25 15:16:53 +02:00
Julie Plantey
be5c3d23d6 added loading and ellipsis 2022-08-25 14:35:31 +02:00
Fabien del Carmen
342ceb68c6 Update paths-ignore patterns 2022-08-25 14:33:21 +02:00
fdel-car
5bd7b0545d Ensure docs files are filtered out 2022-08-25 14:33:21 +02:00
fdel-car
48801b3b28 Limit the amount of GitHub Actions time consumed by tests 2022-08-25 14:33:20 +02:00
dependabot[bot]
3205914d16
Bump @storybook/addon-essentials from 6.5.9 to 6.5.10 
Bumps [@storybook/addon-essentials](https://github.com/storybookjs/storybook/tree/HEAD/addons/essentials) from 6.5.9 to 6.5.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.10/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.10/addons/essentials)

---
updated-dependencies:
- dependency-name: "@storybook/addon-essentials"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-25 12:26:16 +00:00
Convly
8732d07555 Prevent duplicate permissions on create too 2022-08-25 14:25:09 +02:00
Convly
2c71d7d069 Fix permissions update for custom token (uniqueness) 2022-08-25 14:23:36 +02:00
ivanThePleasant
a1ea7439ea Merge branch 'main' into chore/user-level-data 2022-08-25 15:21:39 +03:00
Gustav Hansen
c39ddc8bb0
Merge pull request #14210 from strapi/dependabot/npm_and_yarn/storybook/addon-links-6.5.10 
Bump @storybook/addon-links from 6.5.9 to 6.5.10
 2022-08-25 14:19:30 +02:00
Jean-Sébastien Herbaux
4c6c5e5218
Merge pull request #14214 from strapi/api-token-v2/fix-update-checks 
Fix API tokens' update due to wrong enum values
 2022-08-25 14:12:46 +02:00
Convly
46b28db877 Fix invalid enum value used to assert 'changingTypeToCustom' 2022-08-25 13:56:24 +02:00
Ben Irvin
b3fe16b3c6
Merge pull request #14186 from strapi/api-token-v2/backend-expirations 
Api token v2/backend expirations
 2022-08-25 13:14:27 +02:00
Gustav Hansen
ffa6a0bc53
Merge pull request #14206 from gitstart/STRAP-65 
0 values are not handled correctly in relations
 2022-08-25 12:54:50 +02:00
Simone Taeggi
ca44733f41 add the regenerate button 2022-08-25 12:31:52 +02:00
Julie Plantey
792ec2f776
Merge pull request #14189 from strapi/relation-input/proptype-fix 
[RelationInput] Proptypes update
 2022-08-25 12:12:44 +02:00
Mark Kaylor
308f0375f0 Remove comment and respect naming convention 2022-08-25 12:05:10 +02:00
Ben Irvin
9e42345011 yup blocks unexpected fields 2022-08-25 12:01:52 +02:00
Mark Kaylor
76e01be4cd Add custom fields plugin and color-picker custom field 2022-08-25 12:01:13 +02:00
dependabot[bot]
9d76db0380
Bump @storybook/addon-links from 6.5.9 to 6.5.10 
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) from 6.5.9 to 6.5.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.10/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.10/addons/links)

---
updated-dependencies:
- dependency-name: "@storybook/addon-links"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-25 09:08:55 +00:00
Bassel Kanso
88e1d6592e remove generic typing form GenericeService 2022-08-25 12:00:39 +03:00
Julie Plantey
9cdf50e757 remove isDraft from proptypes, added id 2022-08-25 10:46:01 +02:00
Simone Taeggi
cce909d1ae add the access action to the e2e tests 2022-08-25 10:00:52 +02:00
Mark Kaylor
fc78298ae4 Merge branch 'main' of github.com:strapi/strapi into features/custom-fields v4.4.0-alpha.0 2022-08-25 09:37:19 +02:00
markkaylor
00adfc166b
Merge pull request #14207 from strapi/custom-fields/remove-map-components 
[Custom fields] Remove all traces of map custom field
 2022-08-25 09:26:45 +02:00
Mark Kaylor
a5d56169de Remove all traces of map custom field 2022-08-25 09:16:07 +02:00
Simone Taeggi
6a88df20c4 Merge branch 'features/api-token-v2' into api-token-v2/settings-access-api-token 2022-08-25 09:10:26 +02:00
Simone Taeggi
826f9eaf40 Merge branch 'main' into features/api-token-v2 2022-08-25 09:09:48 +02:00
Simone Taeggi
3017fd5e41 update e2e test 2022-08-25 08:52:42 +02:00
gitstart
f67f226102 0 values are not handled correctly in relations 2022-08-25 06:48:27 +00:00
Ben Irvin
2195e9a2f2 fix comment 2022-08-24 19:05:13 +02:00
Ben Irvin
3ca863d80b fix failing test 2022-08-24 19:02:38 +02:00
Alexandre BODIN
a5ae7a818c
Merge pull request #14173 from strapi/dependabot/npm_and_yarn/koa/cors-3.4.1 
Bump @koa/cors from 3.1.0 to 3.4.1
 2022-08-24 18:56:59 +02:00
Simone Taeggi
d8cbe58dd5 Merge branch 'features/api-token-v2' into api-token-v2/settings-access-api-token 2022-08-24 18:20:28 +02:00
Ben Irvin
2b30007f86 lifespan must be greater than zero 2022-08-24 18:05:51 +02:00
Ben Irvin
2359ca1cc6 fix tests 2022-08-24 18:05:36 +02:00
Ben Irvin
53be3b5d30 make name unique 2022-08-24 18:04:12 +02:00
Bassel Kanso
64663febef Merge branch 'features/api-token-v2' into api-token-v2/permissions-route 2022-08-24 18:58:27 +03:00
Bassel Kanso
ea2db51fda update permissions package version 2022-08-24 18:57:36 +03:00
Simone Taeggi
37135ac742 Merge branch 'features/api-token-v2' into api-token-v2/settings-access-api-token 2022-08-24 17:26:07 +02:00
Bassel Kanso
ef922ec0fd Merge branch 'features/api-token-v2' into api-token-v2/permissions-route 2022-08-24 18:09:43 +03:00