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
26,053 Commits 112 Branches 488 Tags
Commit Graph

6989 Commits

Author SHA1 Message Date
Julie Plantey
5a80b2ce6f LoadingMessage component for ReactSelect 2022-08-29 16:02:19 +02:00
Julie Plantey
2208bdee55 undo ReactSelect changes 2022-08-29 15:42:12 +02:00
Julie Plantey
e43004f870 loadingMessage fix 2022-08-29 15:40:45 +02:00
Pierre Noël
6c4039e3f1 remove useless code 2022-08-29 15:22:47 +02:00
Simone Taeggi
82dd45f219 Merge branch 'features/api-token-v2' into api-token-v2/regenerate-an-api-token 2022-08-29 14:25:01 +02:00
Gustav Hansen
f6856af241
Merge pull request #14241 from strapi/chore/bump-ds-1-2-2 
Chore: Bump @strapi/design-system to 1.2.2
 2022-08-29 13:56:30 +02:00
Gustav Hansen
ecb3643ab5
Merge pull request #14178 from strapi/fix/list-settings-view-tests 
CM: Fix test errors in ListSettingsView
 2022-08-29 13:56:04 +02:00
Gustav Hansen
c4f77eee2d
Merge pull request #14240 from strapi/dependabot/npm_and_yarn/react-refresh-0.14.0 
Bump react-refresh from 0.11.0 to 0.14.0
 2022-08-29 12:54:16 +02:00
Ben Irvin
3cd1a9b183
Merge branch 'features/api-token-v2' into api-token-v2/restrict-lifespans 2022-08-29 12:37:53 +02:00
Ben Irvin
0213ee2e1a
Merge pull request #14238 from strapi/api-token-v2/rename-api-token-permission 
rename token-permission to api-token-permission
 2022-08-29 12:35:21 +02:00
Ben Irvin
b4c8cae41d
Merge pull request #14234 from strapi/api-token-v2/allow-empty-permissions-array 
allow empty array of permissions
 2022-08-29 12:34:57 +02:00
Gustav Hansen
c2419b5a0d chore: Update snapshot tests 2022-08-29 12:14:20 +02:00
Gustav Hansen
f05ad58f69 Chore: Bump @strapi/design-system to 1.2.2 2022-08-29 12:12:33 +02:00
Simone Taeggi
531e9babf2 fix lint error and the redirection after creation of a token 2022-08-29 11:58:51 +02:00
dependabot[bot]
c376fdcf94
Bump react-refresh from 0.11.0 to 0.14.0 
Bumps [react-refresh](https://github.com/facebook/react/tree/HEAD/packages/react) from 0.11.0 to 0.14.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v0.14.0/packages/react)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-29 09:41:46 +00:00
Gustav Hansen
681e9dfce6
Merge pull request #14209 from strapi/dependabot/npm_and_yarn/storybook/addon-essentials-6.5.10 
Bump @storybook/addon-essentials from 6.5.9 to 6.5.10
 2022-08-29 11:41:38 +02:00
Simone Taeggi
c641c5d71d Merge branch 'features/api-token-v2' into api-token-v2/regenerate-an-api-token 2022-08-29 11:31:38 +02:00
Simone
4f7db2ef72
Merge pull request #14180 from strapi/api-token-v2/settings-access-api-token 
RBAC on API tokens settings access
 2022-08-29 11:30:26 +02:00
Simone
3f3ec98101
Merge pull request #14108 from strapi/api-token-v2/last-activity-of-an-api-token 
Add last activity column in the API tokens list
 2022-08-29 11:29:18 +02:00
Simone
8e73c40e86
Merge pull request #14174 from strapi/api-token-v2/notification-text-save-button-triggered 
Change notification message when we successfully save a created or edited token
 2022-08-29 11:28:51 +02:00
Ben Irvin
2dea049a8c fix test 2022-08-29 10:50:46 +02:00
Simone Taeggi
09cb0f42a6 add the regenerate logic 2022-08-29 10:40:32 +02:00
Ben Irvin
7ed24a9edf
Merge pull request #14192 from strapi/api-token-v2/regenerate-tokens-api 
Api Token v2/add regenerate controller tests
 2022-08-29 10:38:42 +02:00
Kevin Antonio Rateni Iatauro
df30b7a6c1
Merge branch 'main' into fix/settings-button-sizes 2022-08-29 09:51:12 +02:00
WalkingPizza
a25d813b6c Update snapshots 2022-08-29 09:50:46 +02:00
Ben Irvin
9aed7d9540 rename token-permission to api-token-permission 2022-08-29 09:17:31 +02:00
Marc-Roig
b2abaa9018 Merge branch 'main' into fix/delete-components-when-deleting-entity 2022-08-29 09:08:59 +02:00
Simone Taeggi
0a5f5c1d86 Merge branch 'features/api-token-v2' into api-token-v2/regenerate-an-api-token 2022-08-28 17:13:21 +02:00
Simone Taeggi
d95151a556 fix Expiration date when unlimited lifespan and the initial value of the Token duration in creation 2022-08-28 17:10:18 +02:00
Marc-Roig
6f76aee4d7 check if there are no components 2022-08-27 20:30:59 +02:00
Marc-Roig
2200f279ab clean webhook tests 2022-08-27 14:15:11 +02:00
Pierre Noël
3327196cce remove populate false only for the rest api, not in db layer 2022-08-26 21:01:50 +02:00
Pierre Noël
69945fd9bb handle populate: false 2022-08-26 21:01:50 +02:00
Pierre Noël
0ab458fe0d Allow the use of true, t, false, f, 1, 0 in addition to * when populating a field 2022-08-26 21:01:50 +02:00
fdel-car
1bfb12eceb Rename platform to osPlatform 2022-08-26 18:35:19 +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