yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-29 20:10:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,985 Commits 115 Branches 486 Tags
Commit Graph

363 Commits

Author SHA1 Message Date
ronronscelestes
6016485f3c merge bis bis + fix merge conflicts 2022-01-28 15:32:19 +01:00
Convly
5b48053946 v4.0.6 2022-01-28 15:08:27 +01:00
ronronscelestes
31ea7896ca merge bis + fix merge conflicts 2022-01-28 14:45:51 +01:00
Jean-Sébastien Herbaux
824c7d32d5
Merge pull request #12298 from strapi/fix/admin 
Admin enhancements & fixes
 2022-01-28 14:38:13 +01:00
ronronscelestes
4af5e6ded3 Merge branch 'master' of https://github.com/strapi/strapi into fix/required-field 2022-01-28 13:53:56 +01:00
ronronscelestes
bb222c995d
Required-field: Bump ds 74 (#12335) 2022-01-28 11:47:47 +01:00
HichamELBSI
fdfd0b12a2 Fix markdown preview 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-01-27 11:40:31 +01:00
Mark Kaylor
27708c51a9 bump axios to v0.25.0 2022-01-26 14:49:45 +01:00
Alexandre BODIN
45020eee06 v4.0.5 2022-01-19 18:44:22 +01:00
HichamELBSI
a158fd9b00 Add document name 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-01-18 16:52:10 +01:00
Alexandre Bodin
d81919ac22 v4.0.4 2022-01-10 09:05:07 -08:00
soupette
29d48f24a3 Upgrade storybook dependencies 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-10 16:24:57 +01:00
Alexandre Bodin
48893ae3fc v4.0.3 2022-01-05 16:50:20 +01:00
soupette
b234d91c4f Merge branch 'master' of github.com:strapi/strapi into upgrade-webpack-config 2022-01-04 15:30:26 +01:00
soupette
b768b327e3 Fixes #12089 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-04 09:52:27 +01:00
soupette
64d2436cd7 Remove unneeded depenendencies 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-03 12:42:48 +01:00
soupette
61fe669fb6 Specify minimum node version to be 12.22.0 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-03 11:55:52 +01:00
soupette
6b89565995 Upgrade babel dependencies 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-03 11:46:15 +01:00
HichamELBSI
891b8b98eb Add confirm alert on close modal (upload) & bump DS version 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-12-30 14:58:41 +01:00
Alexandre Bodin
fd656a4769 v4.0.2 2021-12-22 16:04:10 +01:00
Alexandre Bodin
e2cd01e8c6 v4.0.1 2021-12-22 10:43:38 +01:00
Alexandre BODIN
0c03cbe793
Merge pull request #11870 from matsubaraDaisuke/test/pxToRem 
add test of pxToRem
 2021-12-15 09:46:38 +01:00
Alexandre BODIN
687eb623e9
Merge pull request #10968 from strapi/chore/test-config 
Rework test config to get a better monorepo experience
 2021-12-14 17:34:00 +01:00
Alexandre BODIN
8ae6fd5ae7
Merge branch 'master' into chore/test-config 2021-12-14 15:56:27 +01:00
soupette
d1b68991f1 Use asset module 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-14 11:46:47 +01:00
matsubara
77fc12b75c add test of pxToRem 2021-12-10 23:04:59 +09:00
vincentbpro
36bfa44b70 Merge branch 'master' of github.com:strapi/strapi into v4/product-copy-text-changes-v1 2021-12-01 18:15:44 +01:00
vincentbpro
6e07df58bd feat: added empty contentmanager CTA 2021-12-01 15:24:07 +01:00
Fabien del Carmen
e1ff4b052c
Merge branch 'master' into chore/test-config 2021-12-01 11:20:39 +01:00
Alexandre Bodin
57ec94a4ce Remove snyk files. We switched to their github integration instead 2021-11-30 14:22:48 +01:00
fdel-car
3864399eb8 Merge branch 'master' into chore/test-config 2021-11-30 12:36:11 +01:00
Alexandre Bodin
8b9d095388 Update snapshots 2021-11-30 12:00:44 +01:00
vincentbpro
86ed94f16e style: text change empty layout 2021-11-30 10:25:38 +01:00
Alexandre Bodin
b181702f02 v4.0.0 2021-11-29 20:16:44 +01:00
Alexandre Bodin
bda6c8a95b Merge master 2021-11-29 18:46:14 +01:00
Dieter Stinglhamber
cb7f44ea41 make author and maintainers field consistent accross packages 2021-11-29 16:23:55 +01:00
Alexandre Bodin
c288dcb902 Cleanup and normalize package.json files 2021-11-29 15:13:33 +01:00
Marvin Frachet
62e35985ec
Bump parts alpha 70 (#11694) 
Co-authored-by: ronronscelestes <julie.plantey@gmail.com>
 2021-11-26 18:48:14 +01:00
Marvin Frachet
4cd5c4d982
Bump parts alpha 69 (#11684) 2021-11-25 17:23:37 +01:00
ELABBASSI Hicham
29cde404a1
Bump DS to 68 (#11663) 
* Bump DS to 68

Signed-off-by: HichamELBSI <elabbassih@gmail.com>

* fixed Strikethrough import in WysiwygNav

Co-authored-by: ronronscelestes <julie.plantey@gmail.com>
 2021-11-23 18:29:08 +01:00
soupette
9266b629d8 Fix timestamps field 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-18 17:25:51 +01:00
soupette
443c4d0785 Fix ctb navigation and upgrade DS version 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-18 16:21:49 +01:00
cyril lopez
1a7f02a19d
Merge pull request #11618 from strapi/dnd-preview-box 
DnD SelectedStep in ML / CM
 2021-11-18 15:40:54 +01:00
mfrachet
ee67d766d2 add story 2021-11-18 15:18:35 +01:00
mfrachet
1e004fb3cc Drag and drop 2021-11-18 14:31:52 +01:00
soupette
e7c1eb4ed3 Fix some ui bugs 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-17 14:07:56 +01:00
soupette
8ddebe5cc0 Fix password icon color 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-17 11:36:40 +01:00
cyril lopez
91f256e36f
Merge pull request #11585 from strapi/chore/remove-buffetjs 
[v4] Remove all Buffetjs dependencies
 2021-11-16 14:00:17 +01:00
soupette
faa557ecbf Remove buffetjs dependencies 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-16 08:10:36 +01:00
soupette
52c0752b11 Merge branch 'releases/v4' of github.com:strapi/strapi into ctb/default-values 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-15 18:24:44 +01:00