yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 17:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,474 Commits 115 Branches 488 Tags
Commit Graph

2222 Commits

Author SHA1 Message Date
soupette
c953baaae9 Fix dnd 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-02 12:45:45 +01:00
soupette
ce2cd176e0 Merge branch 'cm-rep-component' of github.com:strapi/strapi into cm-improvements 2021-11-02 11:46:38 +01:00
soupette
89f68b460c Merge branch 'releases/v4' of github.com:strapi/strapi into cm-dynamic-zone 2021-11-02 11:38:06 +01:00
cyril lopez
644110d37e
Merge pull request #11431 from strapi/upgrade-dsystem 
[v4] Upgrade design system
 2021-11-02 11:13:25 +01:00
soupette
cac3498ceb Upgrade design system 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-02 10:50:53 +01:00
Dieter Stinglhamber
8191be8a10 enable API token strategy 2021-11-02 10:48:15 +01:00
soupette
4af2e8c47a Fix app version 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-02 10:31:08 +01:00
soupette
d82785f2f6 Add explicit error when creating a user 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-02 10:06:37 +01:00
Marvin Frachet
001bcf8dcb
Remove old ML code (#11410) 2021-11-02 08:52:06 +01:00
ronronscelestes
2d416b0a41 fixed icon button 2021-10-29 23:13:34 +02:00
ronronscelestes
979527c264 fixed box shadow 2021-10-29 23:09:03 +02:00
ronronscelestes
b2f563eeed fixed already created component in dz 2021-10-29 19:19:22 +02:00
ronronscelestes
268c878032 fixed creation component in dz 2021-10-29 19:15:08 +02:00
ronronscelestes
1430669f37 added dragging sibbling component 2021-10-29 18:47:45 +02:00
ronronscelestes
b65bc47e08 updated drag preview 2021-10-29 17:06:23 +02:00
ronronscelestes
ffd8ec4f3b added dnd 2021-10-29 16:36:46 +02:00
mfrachet
b7007e4645 Fix conflicts 2021-10-29 16:29:26 +02:00
ronronscelestes
173de9a25b accordion group custom to deal with style 2021-10-29 16:14:29 +02:00
mfrachet
cc8463b434 Merge branch 'releases/v4' of https://github.com/strapi/strapi into v4/media-library-cm 2021-10-29 16:13:54 +02:00
Dieter Stinglhamber
b7cc931628 fix copy paste notification 2021-10-29 15:22:15 +02:00
soupette
d8f2c4ea71 Fix magiclink with sso 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-29 12:01:15 +02:00
ronronscelestes
e39dead324 accordion ready for dnd 2021-10-29 11:15:41 +02:00
ronronscelestes
0800d65e6b init rep component 2021-10-29 10:50:03 +02:00
cyril lopez
ac8a8086ba
Merge pull request #11377 from strapi/v4/fix-api-token-ui 
Fix ui interaction for API token
 2021-10-29 09:55:49 +02:00
mfrachet
12f2f13d21 Aligning items 2021-10-29 09:55:31 +02:00
soupette
53996d4015 Fix Filter button 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-29 09:46:51 +02:00
Dieter Stinglhamber
a3ebb020e5 fix icon alignement 2021-10-29 09:43:25 +02:00
mfrachet
5c13cc82ba DnD on ML / CM for the carousel empty state 2021-10-29 09:22:32 +02:00
soupette
29c7c1fb1c Upgrade design system 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-29 08:58:02 +02:00
cyril lopez
b6cfa13358
Merge pull request #11401 from strapi/cm/required-fields 
[v4] Add required field sign in CM edit view
 2021-10-29 08:50:13 +02:00
soupette
23d2be6b7c Add required field sign in CM edit view 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-29 08:43:51 +02:00
soupette
cd12a97ef9 Fix buttons spacing 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-29 07:55:36 +02:00
cyril lopez
467a2e2999
Merge pull request #11396 from strapi/cm/settings-view 
Cm/settings view
 2021-10-29 07:34:59 +02:00
Rémi de Juvigny
0609389b5a Disable templates prompt 2021-10-28 18:50:41 +02:00
ronronscelestes
60ad60af4a PR review fix 2021-10-28 18:28:43 +02:00
ronronscelestes
628126be3e Merge branch 'releases/v4' of https://github.com/strapi/strapi into filter-cm-fix 2021-10-28 18:27:20 +02:00
ronronscelestes
106b34b8e7 attempt to fix search closing after typing 2021-10-28 18:15:56 +02:00
HichamELBSI
cff429b2f9 Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-10-28 17:35:54 +02:00
mfrachet
7b5bc13216 AssetDialog split 2021-10-28 17:30:39 +02:00
mfrachet
d4c662f431 Carousel extraction 2021-10-28 17:22:14 +02:00
Marvin Frachet
10830fab7c
Modify CM form with ML data (#11395) 2021-10-28 17:13:21 +02:00
ronronscelestes
42a761c25d last attempt to fix filters blur in CM 2021-10-28 16:33:43 +02:00
HichamELBSI
511e09f56c Fix tests 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-10-28 16:33:08 +02:00
HichamELBSI
e4b3e6edff Merge branch 'cm/settings-view' into edit-settings/modal-submit 2021-10-28 16:27:16 +02:00
ronronscelestes
90e6bc6e87 merge conflicts 2021-10-28 16:25:52 +02:00
Marvin Frachet
4a98943411
Add an new asset directly in the CM / ML (#11388) 2021-10-28 16:24:03 +02:00
ronronscelestes
350f3b54fa new attempt to fix filters's CM onBlur 2021-10-28 16:23:09 +02:00
HichamELBSI
d38914a134 Change picture to media icon 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-10-28 16:19:39 +02:00
HichamELBSI
7722306f6b Merge branch 'cm/settings-view' into migration/edit-settings-view 2021-10-28 16:15:12 +02:00
cyril lopez
f1789c9f3d
Merge pull request #11389 from strapi/fix/ctb-ui-bugs 
[v4] CTB: Fix ui
 2021-10-28 16:11:39 +02:00