28700 Commits

Author SHA1 Message Date
Simone Taeggi
4eef90d73a Merge branch 'data-transfer/transfer-tokens' of github.com:strapi/strapi into data-transfer/transfer-tokens 2023-02-06 10:55:34 +01:00
Simone Taeggi
38e5e42769 Merge branch 'features/data-transfer' into data-transfer/transfer-tokens 2023-02-06 10:54:42 +01:00
Christian Capeans
2fb83a58cf Merge branch 'features/data-transfer' into data-transfer/transfer-tokens 2023-02-06 10:53:43 +01:00
Ben Irvin
78d344a4f0
Merge pull request #15716 from strapi/data-transfer/fix-cli 2023-02-06 10:46:42 +01:00
Ben Irvin
064d7accf5 remove invalid option 2023-02-06 10:42:07 +01:00
Marc-Roig
f8d787192b remove todo 2023-02-06 10:41:55 +01:00
Rémi de Juvigny
0d82afe489
Merge pull request #15690 from strapi/docs/event-hub
Add event hub page to contributor docs
2023-02-06 10:30:48 +01:00
Marc-Roig
57a410c6b7 convert pagination query params for load 2023-02-06 10:28:01 +01:00
Convly
635c8a708d Merge branch 'data-transfer/transfer-tokens' of github.com:strapi/strapi into data-transfer/transfer-tokens 2023-02-06 10:16:36 +01:00
Rémi de Juvigny
939f654212 Merge remote-tracking branch 'origin/main' into docs/event-hub 2023-02-06 10:14:43 +01:00
Convly
47c5867688 Remove integer constraint from the API token validation 2023-02-06 10:13:17 +01:00
Jean-Sébastien Herbaux
ffb0b9497a
Update packages/core/admin/server/controllers/transfer/token.js
Co-authored-by: Ben Irvin <ben@innerdvations.com>
2023-02-06 10:12:36 +01:00
Jean-Sébastien Herbaux
9085b98717
Update packages/core/admin/server/controllers/transfer/token.js
Co-authored-by: Ben Irvin <ben@innerdvations.com>
2023-02-06 10:11:31 +01:00
Convly
44c13b9497 Fix jsdoc for TransferToken.permissions 2023-02-06 10:10:29 +01:00
Convly
d3ae89280d Fix API test typo 2023-02-06 10:09:26 +01:00
Convly
bec1dfd555 Remove integer constraint from the transfer token validation 2023-02-06 10:07:56 +01:00
Convly
386579ff66 Update transfer services, fix api tests 2023-02-06 10:03:08 +01:00
markkaylor
18dec12617
Merge branch 'main' into fix/json-input-validation 2023-02-06 09:38:15 +01:00
DMehaffy
7ae4d1c802
Update .github/workflows/issues_handleLabel.yml
Co-authored-by: Ben Irvin <ben@innerdvations.com>
2023-02-03 14:11:29 -07:00
Josh
2aa03b8d94
Merge pull request #15711 from strapi/chore/contributor-docs 2023-02-03 17:17:37 +00:00
Josh
e5e24c0898 chore: tidy-up contributor docs 2023-02-03 17:12:20 +00:00
Simone Taeggi
2c0fa4897a refactor unit test 2023-02-03 18:05:12 +01:00
Simone Taeggi
f3ee8e94fe unit test for the ListView in TransferToken 2023-02-03 17:47:27 +01:00
Simone Taeggi
1ad7b79862 remove DynamicTable from the TransferTokens 2023-02-03 17:25:30 +01:00
Simone Taeggi
916c9f23d5 refactor TransferTokenListView 2023-02-03 17:19:24 +01:00
Simone Taeggi
832bf9981a change table component in ApiTokens 2023-02-03 17:04:41 +01:00
Christian Capeans
275df7345d Merge branch 'data-transfer/transfer-tokens' of https://github.com/strapi/strapi into data-transfer/transfer-tokens 2023-02-03 16:36:40 +01:00
Christian Capeans
3ca95c223a Delete duplicated code 2023-02-03 16:36:17 +01:00
Convly
65bf4cf12f Update permission snapshots 2023-02-03 16:34:21 +01:00
Jean-Sébastien Herbaux
1d791e47ea
Update packages/core/admin/server/controllers/api-token.js
Co-authored-by: Ben Irvin <ben@innerdvations.com>
2023-02-03 16:21:55 +01:00
Jean-Sébastien Herbaux
e10cbe8885
Update packages/core/admin/server/config/admin-actions.js
Co-authored-by: Ben Irvin <ben@innerdvations.com>
2023-02-03 16:21:25 +01:00
Jean-Sébastien Herbaux
b7ae385c7e
Update packages/core/admin/server/controllers/transfer/token.js
Co-authored-by: Ben Irvin <ben@innerdvations.com>
2023-02-03 16:19:02 +01:00
Fernando Chavez
a5a1967d00 Check auth strategy to log events on audit logs 2023-02-03 16:18:53 +01:00
Bassel
a364ee79e4 fix generation of transfer token salt 2023-02-03 16:14:34 +02:00
Ben Irvin
d6d1846372
Merge branch 'features/data-transfer' into data-transfer/transfer-tokens 2023-02-03 15:00:13 +01:00
Ben Irvin
3d4b9ad1da Merge branch 'main' into features/data-transfer 2023-02-03 14:59:52 +01:00
Bassel
20a8fa0c0e add transaction to update, revoke and delete 2023-02-03 15:59:04 +02:00
Simone Taeggi
6afff24137 Merge branch 'main' into data-transfer/transfer-tokens 2023-02-03 14:49:36 +01:00
Mark Kaylor
4bc7afc769 Update snapshots 2023-02-03 14:48:38 +01:00
Simone
8383e33e69
Merge pull request #15245 from strapi/enhancement/axios-migration-admin
replace axiosInstance with getFetchClient inside the admin
2023-02-03 14:40:46 +01:00
Ben Irvin
b678b164d2
Merge pull request #15703 from strapi/data-transfer/transfer-tests-cleanup 2023-02-03 14:36:17 +01:00
Convly
60c4103b8f Rename test files 2023-02-03 14:35:12 +01:00
Convly
b8c8dc1f53 Merge branch 'data-transfer/transfer-tokens' of github.com:strapi/strapi into data-transfer/transfer-tokens 2023-02-03 14:34:29 +01:00
Convly
da05f15f7b Fix possible undefined auth configuration 2023-02-03 14:34:16 +01:00
Bassel
c16cd28385 fixing unit tests 2023-02-03 14:53:49 +02:00
Mark Kaylor
321a800022 Bump design system from 1.6.1 to 1.6.2 2023-02-03 13:19:28 +01:00
Bassel
ad9060b296 adding api tests for transfer token crud 2023-02-03 13:46:11 +02:00
Convly
8ad3612978 Remove useless test 2023-02-03 12:32:04 +01:00
Ben Irvin
1c1052903d more precise error test 2023-02-03 12:27:11 +01:00
Ben Irvin
8b1159c329 remove debugging 2023-02-03 12:20:15 +01:00