yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 01:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,053 Commits 115 Branches 488 Tags
Commit Graph

6989 Commits

Author SHA1 Message Date
Simone Taeggi
8a66474297 Merge branch 'features/api-token-v2' into api-token-v2/api-tokens-design-details 2022-08-24 09:38:16 +02:00
Simone Taeggi
14866143d1 Merge branch 'features/api-token-v2' into api-token-v2/notification-text-save-button-triggered 2022-08-24 09:37:37 +02:00
Simone Taeggi
1cb18d767e Merge branch 'features/api-token-v2' into api-token-v2/change-primary-button-size-on-api-token-list 2022-08-24 09:36:45 +02:00
Simone Taeggi
9f634ac98f Merge branch 'features/api-token-v2' into api-token-v2/settings-access-api-token 2022-08-24 09:35:42 +02:00
Ben Irvin
43465af282 improve lifespan validation 2022-08-24 09:10:30 +02:00
Ben Irvin
3850c9452b Merge branch 'features/api-token-v2' into api-token-v2/backend-expirations 2022-08-24 09:00:04 +02:00
Ben Irvin
af6e7d8f41
Merge pull request #14145 from strapi/api-token-v2/regenerate-tokens-api 
Api token v2/regenerate tokens api
 2022-08-23 23:06:00 +02:00
Ben Irvin
6d4bf5e4b2 Merge branch 'features/api-token-v2' into api-token-v2/fix-syncActions 2022-08-23 21:04:51 +02:00
Gustav Hansen
43a81dd943 CM: Fix test errors for EditSettingsView 2022-08-23 20:36:19 +02:00
Ben Irvin
d4c3c6e9af Merge branch 'api-token-v2/fix-failing-e2e-tests' into api-token-v2/regenerate-tokens-api 2022-08-23 20:18:13 +02:00
Ben Irvin
0b8ecaaccb sort permissions to compare 2022-08-23 20:08:45 +02:00
Ben Irvin
5085f5ed45 actually fix test 2022-08-23 19:19:56 +02:00
Ben Irvin
353efdf84c fix test 2022-08-23 18:28:34 +02:00
Ben Irvin
205c909885 fix failing test 2022-08-23 17:59:06 +02:00
Simone Taeggi
e3174b8a72 add the access permission in the main array 2022-08-23 17:38:54 +02:00
Ben Irvin
97f91dd7a5 fix failing tests 2022-08-23 17:24:29 +02:00
Bassel Kanso
48188bdf36 Merge branch 'main' into fix/service-typings 2022-08-23 18:14:14 +03:00
Convly
3944677650 Add unit tests for the content-api permissions 2022-08-23 17:10:10 +02:00
Convly
f3c1812e00 Remove useless warning 2022-08-23 17:09:48 +02:00
Gustav Hansen
4eb360c720
Merge pull request #14172 from strapi/dependabot/npm_and_yarn/react-intl-5.25.1 
Bump react-intl from 5.20.2 to 5.25.1
 2022-08-23 17:09:08 +02:00
Gustav Hansen
be53440a97 CM: Fix test errors in ListSettingsView 2022-08-23 16:51:06 +02:00
Simone Taeggi
3e7a45fdb8 define a new action to prevent the access of the api token page in the settings 2022-08-23 16:27:26 +02:00
Bassel Kanso
4fd4c7f8ac Merge branch 'main' into fix/service-typings 2022-08-23 17:22:03 +03:00
Bassel Kanso
7b6ca0ad4e Merge branch 'main' into fix/service-typings 2022-08-23 17:14:37 +03:00
Bassel Kanso
326e2ed566 fix generic service typings 2022-08-23 17:14:26 +03:00
Convly
1d6b42efbe Use local instance of strapi instead of the global 2022-08-23 16:05:47 +02:00
Convly
6abea9cd85 Expose "get actions as map" & update sync actions 
Co-authored-by: Ben Irvin <innerdvations@users.noreply.github.com>
 2022-08-23 16:02:45 +02:00
Ben Irvin
7e446b7414 add token usage tests 2022-08-23 15:04:24 +02:00
Simone Taeggi
1add0f07fa change the save button size inside the api tokens page 2022-08-23 15:01:25 +02:00
Ben Irvin
8803dbbd46 fix tests 2022-08-23 14:14:04 +02:00
Gustav Hansen
bb4e94e343 DynamicZone: Fix prop-types 2022-08-23 14:06:44 +02:00
Gustav Hansen
58a696436f Breadcrumbs: Update snapshot tests & fix prop-types 2022-08-23 14:04:06 +02:00
Gustav Hansen
fc3940fe19 UseCasePage: Fix snapshot tests 2022-08-23 14:02:36 +02:00
Gustav Hansen
6da2461d3c BulkMoveButton: Fix prop-types 2022-08-23 13:55:54 +02:00
Ben Irvin
e47db1a490 add comment 2022-08-23 13:52:33 +02:00
Ben Irvin
3c724eb483 rename tests 2022-08-23 13:52:00 +02:00
Ben Irvin
dbe79dc605 fix data type 2022-08-23 13:51:23 +02:00
Gustav Hansen
1a91b52e7c ML: Fix header prop-types 2022-08-23 13:50:13 +02:00
Ben Irvin
e54e5f7ddc fix lastUsedAt 2022-08-23 13:45:27 +02:00
Gustav Hansen
a228ad66bc AssetDialog: Fix prop-types 2022-08-23 13:39:32 +02:00
Gustav Hansen
2d2b721d58 DynamicTable: Fix RelationSingle test prop-types 2022-08-23 13:21:45 +02:00
Ben Irvin
7b389e49a9 add test todos 2022-08-23 13:03:15 +02:00
Ben Irvin
36b53e8046 more tests and fixes 2022-08-23 12:53:20 +02:00
Simone Taeggi
d245413c52 Merge branch 'features/api-token-v2' into api-token-v2/last-activity-of-an-api-token 2022-08-23 12:35:22 +02:00
Simone Taeggi
ca656201ec add the correct messages when we save or edit a token 2022-08-23 11:58:21 +02:00
dependabot[bot]
ac52015273
Bump react-intl from 5.20.2 to 5.25.1 
Bumps [react-intl](https://github.com/formatjs/formatjs) from 5.20.2 to 5.25.1.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/react-intl@5.20.2...react-intl@5.25.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-23 09:10:41 +00:00
Ben Irvin
28f078be0a lifespan validation 2022-08-23 10:51:53 +02:00
Ben Irvin
1cf0cb5c4c fix test 2022-08-23 10:49:27 +02:00
Ben Irvin
cb87200099 use strapi.log 2022-08-22 18:52:14 +02:00
Ben Irvin
da00ba89e1 lifespan unit test 2022-08-22 18:46:22 +02:00