28296 Commits

Author SHA1 Message Date
Ben Irvin
d79d962006
Merge branch 'features/data-transfer' into data-transfer/fix-transfer-transaction-close 2023-02-24 14:56:53 +01:00
Convly
8f6058aacd Merge branch 'main' of github.com:strapi/strapi into features/data-transfer 2023-02-24 14:47:47 +01:00
Convly
632e90270b Merge branch 'features/data-transfer' of github.com:strapi/strapi into features/data-transfer 2023-02-24 14:47:36 +01:00
Fernando Chávez
c4b1d365ac
Merge pull request #15849 from strapi/enhancement/cloud-box-on-homepage
Add cloud section on homepage!
2023-02-24 13:11:53 +01:00
Simone
96c256b509
Merge pull request #15815 from strapi/data-transfer/delete-token-confirmation-msg
Confirmation message when deleting a transfer token or an API token from the list
2023-02-24 12:44:24 +01:00
Ben Irvin
1de054d71f always return a message to client instead of throwing error on server and await rollbacks
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
2023-02-24 12:08:25 +01:00
Simone Taeggi
5ac3299212 update snapshots 2023-02-24 11:51:45 +01:00
Simone Taeggi
ce992fbb16 fix stopPropagation location 2023-02-24 11:40:12 +01:00
Simone Taeggi
9ef53d1e39 add event stopPropagation on the onClick value of the DeleteButton 2023-02-24 11:35:17 +01:00
Fernando Chavez
8d1193b561 Merge branch 'main' of github.com:strapi/strapi into enhancement/cloud-box-on-homepage 2023-02-24 11:19:37 +01:00
Simone Taeggi
1b4dddf59e remove stopPropagation and update tests to use getByRole 2023-02-24 11:18:48 +01:00
Simone Taeggi
7094638c38 remove useless snapshot and the act 2023-02-24 10:54:57 +01:00
Ben Irvin
5889463574 Merge branch 'data-transfer/progress' into data-transfer/fix-transfer-transaction-close 2023-02-24 10:07:47 +01:00
Ben Irvin
e85b3a18aa cleanup 2023-02-24 09:58:54 +01:00
Ben Irvin
fa6df72fa7 handle errors from ws response
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
2023-02-24 09:46:03 +01:00
Ben Irvin
06aea362c4 close transactions on failed transfer
Co-authored-by: Christian <christiancp100@gmail.com>
Co-authored-by: Bassel Kanso <basselkanso82@gmail.com>
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
2023-02-23 18:00:06 +01:00
Simone Taeggi
610b2d0fa4 fix eslint error 2023-02-23 14:28:45 +01:00
Josh
85ff7d107f
Merge pull request #15892 from strapi/fix/front-unit-tests 2023-02-23 09:41:18 +00:00
Josh
8f632df07a fix: frontend unit tests 2023-02-23 09:16:32 +00:00
Convly
1cadd5a8ae Merge branch 'releases/4.6.2' into main 2023-02-22 19:10:05 +01:00
Convly
bae505f44c v4.6.2 v4.6.2 2023-02-22 19:06:25 +01:00
Convly
f03ab1201b Fix wrong import names for some icons in the CTB 2023-02-22 18:48:54 +01:00
Jean-Sébastien Herbaux
d42ec294a5
Merge pull request #15887 from strapi/fix/ctb-icon-imports 2023-02-22 18:46:58 +01:00
Convly
befa37377a Fix wrong import names for some icons in the CTB 2023-02-22 18:45:46 +01:00
Jean-Sébastien Herbaux
139e0dc260
Merge pull request #15886 from strapi/fix/sqlite-database-template-typescript 2023-02-22 17:23:36 +01:00
Convly
fd10b9b587 Fix the relative path for sqlite database in the default database configuration 2023-02-22 17:08:08 +01:00
Convly
fcfb8f6e00 Merge branch 'main' of github.com:strapi/strapi into features/data-transfer 2023-02-22 17:05:36 +01:00
Fernando Chavez
d4c2098fd5 Fix error with cloud flags .svg 2023-02-22 16:44:03 +01:00
Marc
e2eab7c842
Merge pull request #15881 from strapi/fix/for-each-async 2023-02-22 16:10:41 +01:00
Josh
bae8209625
Merge pull request #15884 from strapi/revert-15842-fix/build-not-exiting 2023-02-22 15:10:24 +00:00
Fernando Chavez
99efdd921b use new version of the flag .svg 2023-02-22 16:00:02 +01:00
Alexandre BODIN
1bc4627746
Revert "Call process.exit after successful build" 2023-02-22 15:49:47 +01:00
Marc-Roig
1ee884586a replace for each for map async 2023-02-22 15:01:10 +01:00
Christian Capeans
6733ffab9f Abstract logging progress logic 2023-02-22 14:08:06 +01:00
Simone Taeggi
79dc8b2b6d add unit test for the delete button, refactor the confirm dialog 2023-02-22 10:18:27 +01:00
Fernando Chavez
d5820fd2ae remove height from cloud bg component 2023-02-22 10:01:34 +01:00
Convly
58200a9930 init progress 2023-02-22 09:59:29 +01:00
Fernando Chávez
9146b9cae8
Update packages/core/admin/admin/src/pages/HomePage/CloudBox.js
Co-authored-by: Gustav Hansen <gustav.hansen@strapi.io>
2023-02-22 09:59:22 +01:00
Simone Taeggi
670173a892 update design-system dependencies and snapshot tests 2023-02-21 16:55:19 +01:00
Fernando Chavez
986a25ec23 Change units on cloudbox, add test case and translations 2023-02-21 16:46:31 +01:00
Simone Taeggi
573dfc5636 Merge branch 'features/data-transfer' into data-transfer/delete-token-confirmation-msg 2023-02-21 16:23:50 +01:00
Simone Taeggi
3a4a8c995e update snapshots 2023-02-21 16:22:37 +01:00
Simone Taeggi
dba158774e remove automatically eslint fix 2023-02-21 15:10:32 +01:00
Convly
6762ca1ed8 Merge branch 'main' into features/data-transfer 2023-02-21 12:01:45 +01:00
Fernando Chavez
2b65848338 compress strapi cloud images 2023-02-21 11:31:28 +01:00
Fernando Chavez
aad76c6c92 Merge branch 'main' of github.com:strapi/strapi into enhancement/cloud-box-on-homepage 2023-02-21 11:08:39 +01:00
Fernando Chavez
f210c24695 change custom css to use more design system and components props 2023-02-21 11:08:26 +01:00
Josh
cf179e35d3
Merge pull request #15831 from strapi/fix/useConfig-returns-null 2023-02-21 09:05:46 +00:00
Simone Taeggi
bf3981d5ed merge features/data-transfer and fix conflicts 2023-02-21 09:49:40 +01:00
Gustav Hansen
2acd06c23f
Merge pull request #15843 from strapi/fix/crop-asset-folder
EditAssetDialog: Only send the folderId when saving the cropped asset
2023-02-21 09:30:40 +01:00