yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-19 13:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,134 Commits 123 Branches 496 Tags
Commit Graph

24134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi de Juvigny
51feb183c0
Update packages/generators/app/lib/utils/merge-template.js 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-10-27 13:23:35 +02:00
Rémi de Juvigny
0369700e26 Fix isFile check 2021-10-27 13:22:15 +02:00
soupette
8f3398a780 Fix snapshots 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-27 13:05:15 +02:00
soupette
951a0efd93 Fix input uid 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-27 12:58:01 +02:00
cyril lopez
434831f855
Merge pull request #11359 from strapi/fix-background 
Fix background overflow
 2021-10-27 12:50:00 +02:00
cyril lopez
8333d64d2c
Merge pull request #11370 from strapi/fix-boolean-null-ui 
Fix boolean null state
 2021-10-27 12:46:23 +02:00
cyril lopez
d4d9d12236
Merge pull request #11376 from strapi/chore/rename-all-icons 
[V4] Update all icons with the new set
 2021-10-27 12:45:58 +02:00
soupette
be154b6ddd Upgrade DS 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-27 12:42:09 +02:00
soupette
c7dbfc6f88 Update all icons with the new set 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-27 12:30:54 +02:00
Marvin Frachet
c581e4406a
Asset selection in ML CM (#11371) 2021-10-27 11:23:46 +02:00
cyril lopez
85cf6f979c
Merge pull request #11373 from strapi/chore/change-ds-package 
[v4] Chore: rename design system package
 2021-10-27 10:48:35 +02:00
Alexandre Bodin
674acadcc6 Cast only for filters that require it 2021-10-27 10:44:16 +02:00
soupette
e137f46d85 Change parts import name 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-27 10:36:00 +02:00
cyril lopez
9526077a51
Merge pull request #11369 from strapi/v4/ctb-fixes 
[V4] CTB:  bug fix
 2021-10-27 10:09:21 +02:00
Alexandre Bodin
f73d302129 Type cast filters 2021-10-27 10:03:09 +02:00
Rémi de Juvigny
85740cd59b Merge remote-tracking branch 'origin/releases/v4' into v4/npm-templates 2021-10-27 09:52:02 +02:00
soupette
3d4dbe36df Fix boolean null state 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-27 08:54:57 +02:00
soupette
c56e8b8c79 Fix validation max 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-27 08:44:44 +02:00
soupette
d3bd5d5294 Fix jest config 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-27 08:26:57 +02:00
cyril lopez
3b7c7ce0c7
Merge pull request #11358 from strapi/v4/ml-filters 
Fix ML filters
 2021-10-27 08:26:07 +02:00
cyril lopez
28cb34cfc7
Merge pull request #11360 from strapi/preparing-browse-step 
Prepare asset fetching in browse step
 2021-10-27 08:24:52 +02:00
soupette
50b197a982 Fix redirection when creating a ct and fix list alignment 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-27 07:52:07 +02:00
soupette
967806f305 Fix redirection 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-27 07:35:51 +02:00
Alexandre Bodin
74919aafee Fix invalid yup version being used v4.0.0-beta.6 2021-10-26 21:02:59 +02:00
Rémi de Juvigny
9f3d7a4860 Apply feedback 2021-10-26 20:01:26 +02:00
Alexandre Bodin
16df03eacd Fix service overwrite 2021-10-26 19:57:45 +02:00
Alexandre BODIN
7e7365d347
Merge pull request #11355 from strapi/v4/paths-and-prefix-refactoring 
[V4] Cleanup paths used in strapi and prefix for apis
v4.0.0-beta.5 		2021-10-26 17:50:01 +02:00
ELABBASSI Hicham
53989d1097
Merge pull request #11218 from utajum/releases/v4 
Dont show native password reveal on Edge browser
 2021-10-26 17:15:13 +02:00
Alexandre Bodin
4fa751d519 Move u&p providers urls 2021-10-26 16:51:29 +02:00
Alexandre Bodin
5bb802fb06 Move all admin config 2021-10-26 16:18:32 +02:00
Alexandre Bodin
11a170eb03 Strict CSP config 2021-10-26 16:14:39 +02:00
mfrachet
21e11340a7 Prepare asset fetching in browse step 2021-10-26 16:03:44 +02:00
Alexandre BODIN
c761aebb96
Merge pull request #11357 from strapi/v4/admin-config-refacto 
Admin config refacto
 2021-10-26 15:39:41 +02:00
Marvin Frachet
c777e83536
Preparing the Modal Layout for ML in CM (#11356) 2021-10-26 14:57:14 +02:00
soupette
40f9d71f5b Fix users validation for role 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-26 14:49:08 +02:00
soupette
dd581f3a8d Fix background overflow 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-26 14:20:02 +02:00
soupette
6e1b33508b Fix ML filters 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-26 13:48:51 +02:00
Alexandre Bodin
9cd59197b1 Fix tests and move api token config to use camelcase naming 2021-10-26 12:18:53 +02:00
Alexandre Bodin
a33d9e56be Move admin config to config/admin.js 2021-10-26 12:12:02 +02:00
Rémi de Juvigny
0b073e9c95 Fix template semver check 2021-10-26 11:58:56 +02:00
Rémi de Juvigny
3f4fb48a41 Add semver template check 2021-10-26 11:58:56 +02:00
Rémi de Juvigny
a85d7afcf7 add allowed files to templates 2021-10-26 11:55:00 +02:00
Rémi de Juvigny
68a7771ffa Fix dependencies 2021-10-26 11:54:59 +02:00
Rémi de Juvigny
114d69f60b Support local templates 2021-10-26 11:51:40 +02:00
Rémi de Juvigny
44d2cc0038 Don't allow config folder 2021-10-26 11:51:40 +02:00
Rémi de Juvigny
3656d7b181 Use npm to host templates instead of github 2021-10-26 11:51:39 +02:00
Rémi de Juvigny
0cc1c0bea0 Update allowed template contents 2021-10-26 11:49:58 +02:00
Rémi de Juvigny
4fef307c46 Re-enable templates 2021-10-26 11:49:57 +02:00
Alexandre Bodin
b26baee106 Cleanup paths used in strapi and prefix for apis 2021-10-26 11:18:36 +02:00
Alexandre BODIN
e3418695b6
Merge pull request #11352 from strapi/v4/middleware-generator 
Add middleware generator
 2021-10-26 10:17:15 +02:00