6731 Commits

Author SHA1 Message Date
Alexandre BODIN
2574c22b30
Merge pull request #14961 from strapi/chore/fix-webpack-build 2022-11-22 16:45:50 +01:00
Julie Plantey
a6c2f79bbc
Merge pull request #14922 from 5idereal/patch-1
update Traditional Chinese translation
2022-11-22 16:03:02 +01:00
Josh
e4dd1b262e chore: use stable 1.3.1 of DS 2022-11-22 15:30:02 +01:00
Josh
ff02218d28 chore: use alpha version of DS 2022-11-22 15:30:02 +01:00
Mark Kaylor
eabeef4790 Use reselect for createAttributesLayout 2022-11-22 15:16:30 +01:00
Josh
2dbeca22b7 chore: update snapshots 2022-11-22 13:40:24 +00:00
Josh
9ed9a59202 fix: define a default border color 2022-11-22 13:28:29 +00:00
Mark Kaylor
ef8291dabe Restructure createAttributesList 2022-11-22 14:03:14 +01:00
5idereal
bd4bdede39
add missing translations 2022-11-22 20:26:07 +08:00
Julie Plantey
e664fa94d0 fix conflicts with main branch 2022-11-22 12:01:46 +01:00
Julie Plantey
aaf42dc0c5
Merge pull request #14865 from bart-webleads/patch-4
Update/add dutch translations
2022-11-22 11:44:12 +01:00
Convly
5da0015215 Merge branch 'main' of github.com:strapi/strapi into features/morphs-populate 2022-11-22 11:41:18 +01:00
Convly
c49df55a67 Update tests & add type util to convert query params 2022-11-22 11:40:37 +01:00
Jean-Sébastien Herbaux
7824bc0db9
Merge pull request #14931 from strapi/deits/export-archive
[DEITS] Export the backup as a tar archive
2022-11-22 11:11:12 +01:00
Convly
725dbeccdf Merge branch 'features/deits' into deits/export-archive 2022-11-22 10:30:14 +01:00
Ben Irvin
1b7222a16a Merge branch 'features/deits' into deits/engine-tests 2022-11-22 10:29:25 +01:00
Ben Irvin
1323aae017 fix duplex stream for node 14
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
2022-11-22 10:28:22 +01:00
Simone
f1ea1f05e8
Merge branch 'main' into chore/tracking-access-CTB 2022-11-21 22:50:06 +01:00
Convly
ae68de46ad Merge branch 'features/deits' into deits/export-archive 2022-11-21 17:22:29 +01:00
Convly
b9bd6a8efc Merge branch 'features/deits' into deits/engine-tests 2022-11-21 17:20:57 +01:00
Convly
0bf53f3416 Merge branch 'main' into features/deits 2022-11-21 17:19:39 +01:00
Alexandre BODIN
8faf635975
Merge branch 'main' into fix/relation-mysql-below-8 2022-11-21 17:12:53 +01:00
Convly
dba3f9ba9c Fix the gzip compression 2022-11-21 17:03:15 +01:00
Simone
8ee3f35c83
Merge branch 'main' into chore/tracking-access-CTB 2022-11-21 16:30:20 +01:00
Simone Taeggi
326521d6fd change event name 2022-11-21 15:44:59 +01:00
Simone Taeggi
63fa62e87f Merge branch 'main' into chore/tracking-access-CTB 2022-11-21 15:44:13 +01:00
Alexandre Bodin
69a5133b60 Rename to more generic window functions 2022-11-21 15:00:31 +01:00
Alexandre Bodin
ce6143790c Group supportX functions 2022-11-21 14:46:06 +01:00
Jamie Howard
874205860d chore(upload) 2022-11-21 13:44:14 +00:00
markkaylor
69af39fc5a
Merge branch 'main' into chore/refactor-edit-view 2022-11-21 14:33:48 +01:00
Mark Kaylor
90975c5d93 Remove layout prop in favor of useSelector 2022-11-21 14:31:20 +01:00
Alexandre Bodin
25507f8328 Simplify main PR 2022-11-21 14:30:55 +01:00
Convly
b784135413 Fix typo 2022-11-21 14:20:59 +01:00
Ben Irvin
68a76aa185 remove stream-mock 2022-11-21 14:15:30 +01:00
Ben Irvin
96846061b5 remove comments 2022-11-21 13:58:49 +01:00
Ben Irvin
839664012c
Update packages/core/data-transfer/lib/engine/index.ts
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
2022-11-21 13:51:37 +01:00
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
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
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