7070 Commits

Author SHA1 Message Date
Josh
0da42fea47 fix: icon size and alignment 2022-11-21 11:53:10 +00:00
Josh
5169732007 Merge branch 'main' into fix/card-badge 2022-11-21 11:27:15 +00:00
Bassel
8a0db019bc make sure integrity check passes for import 2022-11-21 13:21:11 +02:00
Convly
634897bed7 Use .enc instead of .gpg, remove useless comment 2022-11-21 11:25:45 +01:00
Jamie Howard
d20563d4ec fix(entity-validator): failing API tests 2022-11-21 10:20:50 +00:00
Mark Kaylor
53166af4fe Rename prp grid => columns 2022-11-21 11:18:31 +01:00
Mark Kaylor
ba6361a266 Fix ErrorBoundary fallback component 2022-11-21 11:11:42 +01:00
Convly
2459e20282 Merge branch 'main' of github.com:strapi/strapi into features/morphs-populate 2022-11-21 11:02:59 +01:00
Convly
7c1837bbe1 Add test + update logic 2022-11-21 11:02:38 +01:00
Simone
a45e27372a
Merge branch 'main' into chore/tracking-edit-field-name 2022-11-21 10:30:05 +01:00
Bassel
aaf033514f fix import 2022-11-21 11:10:45 +02:00
Simone
ef8983f905
Merge branch 'main' into enhancement/axios-refactoring 2022-11-21 10:09:23 +01:00
Bassel
33880b2afe Merge branch 'features/deits' into deits/restore-mechanism 2022-11-21 10:54:36 +02:00
Ben Irvin
85c4f11ef3 add schemasMatching 2022-11-21 09:52:52 +01:00
Ben Irvin
fe2ddd91b8 confirm conflictStrategy restore choice on import 2022-11-21 09:51:05 +01:00
Nathan Pichon
d69430584f
Merge branch 'main' into fix/file-upload-components 2022-11-21 09:47:16 +01:00
Ben Irvin
b702d5690b
Merge branch 'features/deits' into deits/engine-tests 2022-11-21 09:18:06 +01:00
Ben Irvin
08ce543276 add back missing async 2022-11-21 09:16:43 +01:00
Ben Irvin
2945ce4b14
Merge branch 'features/deits' into deits/fix-typescript-projects 2022-11-21 09:14:00 +01:00
Ben Irvin
744c2d98c1 refactor 2022-11-21 09:12:05 +01:00
Josh
e033275bd0
Merge pull request #14872 from strapi/chore/update-codecov-gh-action 2022-11-21 08:07:50 +00:00
Pierre Noël
f4ed17809a
Merge pull request #14909 from strapi/fix/schema-support-postgres
Fix schema support for postgres when using raw queries
2022-11-19 11:51:19 +01:00
Pierre Noël
c11ce77597 remove console log 2022-11-19 02:22:59 +01:00
Pierre Noël
b016113ded remove throw error 2022-11-19 02:15:12 +01:00
Pierre Noël
6a530cbbfc put add-schema in knex util file 2022-11-19 00:01:10 +01:00
Pierre Noël
0c76c5ae1a add error management 2022-11-18 23:57:46 +01:00
Simone Taeggi
3c1a4d6327 Merge branch 'main' into chore/tracking-edit-field-name 2022-11-18 17:25:18 +01:00
Simone Taeggi
9fe9a4aca9 Merge branch 'chore/tracking-edit-field-name' of github.com:strapi/strapi into chore/tracking-edit-field-name 2022-11-18 17:24:23 +01:00
Simone Taeggi
5a64455135 remove comment 2022-11-18 17:23:35 +01:00
Simone
ba46ace661
Merge branch 'main' into enhancement/axios-refactoring 2022-11-18 17:20:26 +01:00
Gustav Hansen
2c23ca234b Chore: Update codecov uploader 2022-11-18 17:10:45 +01:00
Gustav Hansen
9ea56017f2
Merge pull request #14929 from strapi/fix/configure-the-view-cm-break
CM: Fix ToggleInput wrapping for configure the view
2022-11-18 17:01:14 +01:00
Christian Capeans
e735ca0187 Merge branch 'features/deits' of https://github.com/strapi/strapi into deits/schema-validation 2022-11-18 16:20:53 +01:00
Simone
0a1adb5c8d
Merge branch 'main' into enhancement/axios-refactoring 2022-11-18 16:05:25 +01:00
Simone Taeggi
feab74b178 test the axios.create argument 2022-11-18 16:04:14 +01:00
Bassel
6d2ea2b675 Merge branch 'features/deits' into deits/restore-mechanism 2022-11-18 16:32:30 +02:00
Gustav Hansen
9ad596d6e9 Chore: Update snapshot tests 2022-11-18 15:32:13 +01:00
Gustav Hansen
0c8c269461 Chore: Update snapshot tests 2022-11-18 15:29:26 +01:00
Gustav Hansen
9ad552d548 CM: Fix ToggleInput wrapping for configure the view 2022-11-18 15:10:24 +01:00
Simone
ed38c3e91d
Merge branch 'main' into chore/tracking-edit-field-name 2022-11-18 15:04:29 +01:00
Simone Taeggi
3c3cab3cad test response interceptor on 401 2022-11-18 15:04:09 +01:00
Gustav Hansen
a25fb27316 CM: Fix RelationMultiple text wrapping 2022-11-18 14:59:52 +01:00
Convly
7e25e72981 Merge branch 'features/deits' of github.com:strapi/strapi into deits/export-archive 2022-11-18 14:41:57 +01:00
Bassel
30412784b8 add some changes 2022-11-18 15:14:11 +02:00
Simone Taeggi
f9123cfd92 add the event to track when we edit the Collection name in the content-type-builder 2022-11-18 12:38:05 +01:00
Josh
6c8dcaa832 chore: add webpack fullySpecified comment 2022-11-18 10:27:10 +00:00
Josh
4ad46e481f Revert "chore: replace imports"
This reverts commit 1c8b34c3fa7002c0e44d3c583c844367e006f631.
2022-11-18 10:01:22 +00:00
Josh
73b2f95cf0 fix: use find-root because otherwise node resolutions are used and can fail 2022-11-18 09:10:37 +00:00
Josh
1c8b34c3fa chore: replace imports 2022-11-18 08:56:10 +00:00
Ben Irvin
f20a6ea0f2 fix import 2022-11-18 09:55:02 +01:00