yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 10:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,860 Commits 121 Branches 507 Tags
Commit Graph

8481 Commits

Author SHA1 Message Date
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
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
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
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
Ben Irvin
22b88161c3 test missing remote strapi 2023-02-03 12:18:13 +01:00
Ben Irvin
12cc5e83b7
Merge branch 'features/data-transfer' into data-transfer/transfer-tests-cleanup 2023-02-03 12:12:27 +01:00
Convly
149cdb58e6 Merge branch 'features/data-transfer' into data-transfer/transfer-tokens 2023-02-03 12:12:18 +01:00
Convly
baa1aa5212 Merge branch 'main' into data-transfer/transfer-tokens 2023-02-03 12:11:17 +01:00
Convly
cafceb9e5e Merge branch 'features/data-transfer' of github.com:strapi/strapi into features/data-transfer 2023-02-03 12:11:02 +01:00
Convly
2a4fa835e6 Merge branch 'main' into features/data-transfer 2023-02-03 12:10:52 +01:00
Convly
ddb9cf4484 Adds test for the transfer token service and fix validation 2023-02-03 12:08:08 +01:00
Ben Irvin
8f7194ea2e clean up tests 2023-02-03 12:06:40 +01:00
Ben Irvin
89b165bfc6 clean up transfer command 2023-02-03 11:47:51 +01:00
Convly
5c327ad6ef Adds tests for the transfer token controllers 2023-02-03 11:15:12 +01:00
Convly
08d0d484cb Fix api token service, to use lodash fp insead of lodash 2023-02-03 11:14:50 +01:00
Convly
7d20788ff4 Add a getter for the engine providers in the transfer permission service 2023-02-03 11:14:32 +01:00
Convly
e5e86a5361 Adds getByName to the transfer token service 2023-02-03 11:12:46 +01:00
Simone Taeggi
ea15154849 squash and merge all the code related to the axios migration to use useFetchClient and getFetchClient in the admin 2023-02-03 10:41:34 +01:00
Ben Irvin
e6a24038fe fix invalid version strategy and jsdoc 2023-02-03 09:52:59 +01:00
Simone Taeggi
6d9a93ad3c fix regenerate action 2023-02-02 18:01:07 +01:00
Ben Irvin
9097f30f9a fix commands 2023-02-02 17:47:58 +01:00
Ben Irvin
ac600ed0dc typo 2023-02-02 17:15:37 +01:00
Simone Taeggi
bd48dc4c80 regenerate transfer token 2023-02-02 17:15:15 +01:00
Convly
95dea87bf4 Merge branch 'data-transfer/transfer-tokens' of github.com:strapi/strapi into data-transfer/transfer-tokens 2023-02-02 17:03:53 +01:00
Convly
17bad93089 Create an auth strategy for data-transfer 
Co-authored-by: Bassel Kanso <basselkanso82@gmail.com>
Co-authored-by: Ben Irvin <innerdvations@users.noreply.github.com>
Co-authored-by: Simone <simone.taeggi@strapi.io>
 2023-02-02 17:03:41 +01:00
Nathan Pichon
fa8a108af9
Merge branch 'main' into fix/issue-9308-File_upload_related_fields_returning_null 2023-02-02 16:16:48 +01:00
Simone Taeggi
a6f9fd5904 replace axiosInstance with useFetchClient inside the Edit and List Transfer tokens page 2023-02-02 16:14:37 +01:00
Ben Irvin
04f36c71b1 prompt for missing token 2023-02-02 16:01:28 +01:00
Simone Taeggi
a1b2f6bc62 Merge branch 'main' into data-transfer/transfer-tokens 2023-02-02 15:57:15 +01:00
Ben Irvin
8ef88bcf94 comments 2023-02-02 15:52:46 +01:00
Ben Irvin
7b705d7111 add restore confirmation only when needed 2023-02-02 15:49:29 +01:00
Ben Irvin
6c68da11f7 vaildate token exists 2023-02-02 15:39:38 +01:00
Ben Irvin
542e0faf28 pass tokens to remote provider 2023-02-02 15:27:46 +01:00
Marc
b697228833
Merge pull request #15669 from strapi/fix/support-avif-format 2023-02-02 14:35:19 +01:00
Christian Capeans
fe1bb44299 Create transfer tokens 
Co-authored-by: Bassel Kanso <basselkanso82@gmail.com>
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
Co-authored-by: Simone <simone.taeggi@strapi.io>
Co-authored-by: Ben Irvin <innerdvations@users.noreply.github.com>
 2023-02-02 13:15:41 +01:00
Gustav Hansen
7eda598106
Merge pull request #15679 from strapi/dependabot/npm_and_yarn/storybook/react-6.5.16 
chore(deps-dev): bump @storybook/react from 6.5.11 to 6.5.16
 2023-02-02 11:31:49 +01:00
Jamie Howard
aaf50db93c
Merge pull request #15656 from strapi/fix/AttributeIcon 2023-02-02 10:04:19 +00:00
Convly
236275ab4d Merge branch 'main' of github.com:strapi/strapi into features/data-transfer 2023-02-02 10:10:48 +01:00
dependabot[bot]
3948a2e257
chore(deps-dev): bump @storybook/react from 6.5.11 to 6.5.16 
Bumps [@storybook/react](https://github.com/storybookjs/storybook/tree/HEAD/app/react) from 6.5.11 to 6.5.16.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.16/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.16/app/react)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-02 09:02:56 +00:00