yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-30 11:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,918 Commits 113 Branches 491 Tags
Commit Graph

3161 Commits

Author SHA1 Message Date
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
soupette
c546768aa3 updgrade design system 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-28 16:11:11 +02:00
Alexandre BODIN
842269a04f
Merge pull request #11390 from strapi/v4/pg-ignore-common-extension-tables 
Ignore postgis tables
 2021-10-28 16:07:26 +02:00
Dieter Stinglhamber
62c168fabe fix ContentBox unit test 2021-10-28 16:04:42 +02:00
Dieter Stinglhamber
cc74571b35 fix icon button alignment 2021-10-28 16:00:34 +02:00
Dieter Stinglhamber
aa5aea975f fix ui interaction for API token 2021-10-28 16:00:33 +02:00
soupette
80367ad1e1 Add publish button in create view 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-28 15:50:32 +02:00
HichamELBSI
a6bf799d1a Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-10-28 15:18:11 +02:00
ronronscelestes
2764c72902 onBlur for CM's filters 2021-10-28 14:45:56 +02:00
Alexandre Bodin
3feadd6bc2 Ignore postgis tables 2021-10-28 14:33:17 +02:00
soupette
ca79184561 Fix searchbar width 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-28 14:17:47 +02:00
soupette
87c0e3559e Fix border radius 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-28 14:12:22 +02:00
soupette
73449e1d9f Fix modal paddingTop 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-28 14:08:36 +02:00
soupette
e398529277 Fix keyboard navigation 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-28 13:58:01 +02:00
Marvin Frachet
d7e07e8157
Iteration ml cm carousel (#11380) 2021-10-28 11:08:58 +02:00
Alexandre BODIN
3d42d4bb11
Merge pull request #11372 from strapi/v4/type-casting 
[v4] Type cast filters
 2021-10-28 10:46:52 +02:00
Alexandre Bodin
d62878cda0 Add more tests 2021-10-28 09:41:59 +02:00
HichamELBSI
465bce479a Migrate edit settings view without DnD 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-10-28 09:29:01 +02:00
DMehaffy
e527ed157f
[v4] Fix improper english on API Token (#11364) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2021-10-27 10:48:51 -07:00