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

24134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
c71cf813d9 Merge branch 'main' of github.com:strapi/strapi 2022-08-26 18:41:56 +02:00
Alexandre Bodin
fba04f1219 Add some example in the docs 2022-08-26 18:41:48 +02:00
fdel-car
1bfb12eceb Rename platform to osPlatform 2022-08-26 18:35:19 +02:00
Fabien del Carmen
2f13051a23
Merge pull request #14201 from strapi/chore/update-tests-workflow 
Limit the amount of GitHub Actions time consumed by tests
 2022-08-26 18:23:45 +02:00
DMehaffy
e2568a0611
Merge branch 'main' into fix/add-relational-pks 2022-08-26 09:15:55 -07:00
Simone Taeggi
1cf7daf64b remove global.regenerate 2022-08-26 18:00:18 +02:00
Simone Taeggi
abae2c1e01 use theme spaces 2022-08-26 17:57:38 +02:00
Simone Taeggi
372b03fcc2 Merge branch 'features/api-token-v2' into api-token-v2/regenerate-an-api-token 2022-08-26 17:53:14 +02:00
Marc-Roig
867376ec1d add entity attributes when deleting components 2022-08-26 17:46:44 +02:00
Simone Taeggi
bfa840a610 Merge branch 'features/api-token-v2' into api-token-v2/notification-text-save-button-triggered 2022-08-26 17:32:33 +02:00
Simone
8625c98089
Merge pull request #14231 from strapi/api-token-v2/integrate-BE-on-save-token 
[FE] Integrate the BE to Save a Token in Creation and Update
 2022-08-26 17:30:48 +02:00
Simone Taeggi
0a63f1b69c update snapshots 2022-08-26 16:27:24 +02:00
Ben Irvin
697662421f allow empty array of permissions 2022-08-26 16:11:08 +02:00
Simone Taeggi
0987baaf4b add type selection 2022-08-26 15:48:04 +02:00
Pierre Wizla
e56c8caaca Update documentation link for custom fields 
This URL will have to be changed again after the stable release
(docs-next.strapi.io will become docs.strapi.io)
 2022-08-26 15:45:10 +02:00
Simone Taeggi
73a9f3c40c first attempt to fix the save action in both creation and updating 2022-08-26 15:39:09 +02:00
Ben Irvin
16537f199e validate lifespan 2022-08-26 15:27:47 +02:00
Jean-Sébastien Herbaux
d3357b87af
Merge pull request #14216 from strapi/api-token-v2/fix-update-custom-token-permissions 
Fix permissions update for custom API tokens
 2022-08-26 15:24:06 +02:00
Marc-Roig
2c388c291f update delete many to delete compos from db 2022-08-26 15:03:07 +02:00
Marc-Roig
c396c899b7 fix entity service webhook test 2022-08-26 15:00:10 +02:00
Marc-Roig
84352c1e88 update getComponents typing 2022-08-26 14:25:11 +02:00
Marc-Roig
4efd991865 update getComponents typing 2022-08-26 14:24:02 +02:00
Marc-Roig
6f2134bcd6 load components from entity manager load 2022-08-26 14:22:05 +02:00
Bassel Kanso
2e53c78e8f fix token type state 2022-08-26 14:52:18 +03:00
Bassel Kanso
061be9d747 Merge branch 'features/api-token-v2' into api-token-v2/refactor-frontend 2022-08-26 14:19:04 +03:00
Bassel Kanso
6f31ddefbe fix test and make single actions selectable 2022-08-26 14:12:30 +03:00
Bassel Kanso
025c4d154f
Merge pull request #14200 from strapi/api-token-v2/permissions-route 
Api token layout route
 2022-08-26 12:44:12 +03:00
dependabot[bot]
29041540c4
Bump sqlite3 from 5.0.2 to 5.0.11 
Bumps [sqlite3](https://github.com/TryGhost/node-sqlite3) from 5.0.2 to 5.0.11.
- [Release notes](https://github.com/TryGhost/node-sqlite3/releases)
- [Commits](https://github.com/TryGhost/node-sqlite3/compare/v5.0.2...v5.0.11)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-26 09:08:33 +00:00
Ben Irvin
14c183ce51 validate lifespan 2022-08-26 10:33:18 +02:00
Alexandre BODIN
414a0fe90c
Merge pull request #14227 from strapi/chore/contributing-e2e-u 
Docs: Expand on how to use e2e snapshot tests with jest arguments
 2022-08-26 10:10:59 +02:00
Simone Taeggi
2f3ca60c63 Merge branch 'main' into features/api-token-v2 2022-08-26 10:06:17 +02:00
Gustav Hansen
54c5ee640b Docs: Expand on how to use e2e snapshot tests with jest arguments 2022-08-26 09:59:35 +02:00
Bassel Kanso
db4c3af1f9 remove test 2022-08-26 10:42:01 +03:00
Bassel Kanso
3ce256e279 add content api permissions controller to it's separate file 2022-08-26 10:02:13 +03: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
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
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