yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,860 Commits 122 Branches 507 Tags
Commit Graph

4338 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
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
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
ddb9cf4484 Adds test for the transfer token service and fix validation 2023-02-03 12:08:08 +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
Simone Taeggi
6d9a93ad3c fix regenerate action 2023-02-02 18:01:07 +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
Simone Taeggi
a6f9fd5904 replace axiosInstance with useFetchClient inside the Edit and List Transfer tokens page 2023-02-02 16:14:37 +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
Convly
236275ab4d Merge branch 'main' of github.com:strapi/strapi into features/data-transfer 2023-02-02 10:10:48 +01:00
Christian
c557588829
Merge branch 'main' into tracking-system-ct-components-dz 2023-02-01 12:50:25 +01:00
dependabot[bot]
a4223ffce6
chore(deps): bump mini-css-extract-plugin from 2.4.4 to 2.7.2 
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 2.4.4 to 2.7.2.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v2.4.4...v2.7.2)

---
updated-dependencies:
- dependency-name: mini-css-extract-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-01 09:06:32 +00:00
markkaylor
5c565ae9e1
Merge pull request #15606 from strapi/chore/cm-json-input 
[Content Manager] Add the new JSONInput from the DS to the CM
 2023-01-31 11:00:15 +01:00
dependabot[bot]
acf7129596
chore(deps): bump immer from 9.0.15 to 9.0.19 
Bumps [immer](https://github.com/immerjs/immer) from 9.0.15 to 9.0.19.
- [Release notes](https://github.com/immerjs/immer/releases)
- [Commits](https://github.com/immerjs/immer/compare/v9.0.15...v9.0.19)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-31 09:04:01 +00:00
Christian Capeans
6f2e86e562 Add small changes to improve context 2023-01-30 17:59:37 +01:00
Christian Capeans
c7f048918e Add TODOs to rename properties in v5 2023-01-30 15:55:58 +01:00
Julie Plantey
0ff34ed15e
Merge pull request #15525 from c3pxuo/patch-1 
Update ru.json
 2023-01-30 15:08:51 +01:00
Julie Plantey
c2bd1a799f
Merge pull request #15584 from sergixnet/translate-strapi-to-eu 
Add translation Euskara for Admin UI
 2023-01-30 15:06:47 +01:00
Gustav Hansen
6d2fcafab4 Chore: Update webpack loaders 2023-01-30 12:04:30 +01:00
Gustav Hansen
9d8710feb8 Chore: Update webpack dependencies 2023-01-30 11:19:55 +01:00
Gustav Hansen
baa50378d6
Merge pull request #15627 from strapi/chore/babel-deps-upgrade 
Chore: Update and unpin babel dependencies
 2023-01-30 11:19:18 +01:00
Gustav Hansen
7c9e6918d8 Chore: Update and unpin babel dependencies 2023-01-30 09:48:25 +01:00
Gustav Hansen
f095a13fdb Chore: Bump react-intl from v5 to 6.2.7 2023-01-30 09:39:49 +01:00
Mark Kaylor
f882ec69c0 Add the new JSONInput from the DS to the CM 2023-01-27 11:46:31 +01:00
Convly
40af165c0c uncomment the data transfer feature from the cli & the admin 2023-01-27 11:35:35 +01:00
markkaylor
a3ff110fc4
Merge pull request #15604 from strapi/chore/audit-logs-modal-scroll 
[Audit logs] Make JSON input the size of its content
 2023-01-27 11:16:50 +01:00
Mark Kaylor
e45fb7d63f Make JSON input the size of its content 2023-01-27 10:21:44 +01:00
Gustav Hansen
39db250758 Browserslist: exclude dead browsers (IE) 
Co-authored-by: Laurens Kling <laurens@goedideemedia.nl>
 2023-01-26 17:15:12 +01:00
Serge Sh
0590995f2c
Merge branch 'main' into patch-1 2023-01-26 16:19:51 +03:00
Gustav Hansen
d7a70fd5fd
Merge pull request #15570 from strapi/enhancement/use-inject-reducer-hook 
Add new useInjectReducer() hook
 2023-01-26 12:32:23 +01:00
Sergio Peña
11fb7a89df
Merge branch 'main' into translate-strapi-to-eu 2023-01-26 09:57:20 +01:00
sergixnet
63660df410 Add translation Euskara for Admin UI 2023-01-26 09:49:53 +01:00
Convly
a9e55435c4 v4.6.0 2023-01-25 21:17:20 +01:00
Jean-Sébastien Herbaux
b23bba9ba6
Merge pull request #15147 from strapi/chore/online-license-skeleton 2023-01-25 20:37:25 +01:00
Jean-Sébastien Herbaux
3fd5bbc4bb
Merge pull request #15036 from strapi/features/deits 2023-01-25 20:27:19 +01:00
Gustav Hansen
ef4f25ae89 Chore: Remove fontawesome dependencies 2023-01-25 20:03:28 +01:00
fdel-car
a0b344e575 Fix audit logs test 2023-01-25 19:52:07 +01:00
fdel-car
950dda7877 Update SSO error message 2023-01-25 19:52:07 +01:00
fdel-car
f3550cea82 Add audit logs support & update the features API 2023-01-25 19:52:07 +01:00