yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-31 21:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 106 Branches 487 Tags
Commit Graph

9899 Commits

Author SHA1 Message Date
Convly
033d3274d2 Merge branch 'releases/v4' into v4/graphql-schema-generation-refactor 2021-09-23 10:05:31 +02:00
Pierre Noël
199dd54e42 migrate user functions folder 2021-09-23 09:14:09 +02:00
ronronscelestes
42756ae054 feedback fix 2021-09-23 08:49:34 +02:00
soupette
ea24390355 Upgrade parts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 08:23:33 +02:00
soupette
3fb4297cae Upgrade parts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 08:19:53 +02:00
cyril lopez
ce708cfc9a
Merge pull request #11052 from strapi/cm-lv-fix 
Migration/ CM LV fix
 2021-09-23 07:44:41 +02:00
soupette
43ad5ca083 Fix pageSize compo 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 07:44:09 +02:00
soupette
522dce5b8a Add count remaining files 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 07:37:46 +02:00
soupette
1cf1a6655b Merge branch 'v4/ds-migration' of github.com:strapi/strapi into cm-lv-fix 2021-09-23 07:16:02 +02:00
soupette
b009fd59bc Fix multiple rerenders 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 06:18:14 +02:00
soupette
c475c96722 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 05:54:12 +02:00
Alexandre Bodin
704ff5a612 Fix components ordering 2021-09-22 20:10:48 +02:00
ronronscelestes
2f870b88a9 replaced popupwarning by confirm dialog for cancel changes in ctb 2021-09-22 19:17:16 +02:00
Alexandre Bodin
549773698a Fix distinct 2021-09-22 18:49:04 +02:00
Convly
a303b0e5c4 Don't run shadowCRUD related operations if it's disabled 2021-09-22 18:17:51 +02:00
ronronscelestes
ef98a2391b remove label select + tooltip on file badge 2021-09-22 17:35:48 +02:00
Alexandre Bodin
7855b7acbb Fix merge error 2021-09-22 17:20:31 +02:00
Alexandre Bodin
c5f9d16105 Rename creator fields 2021-09-22 17:06:16 +02:00
Alexandre Bodin
65eba8f63b Rename timestamps in front 2021-09-22 17:06:16 +02:00
Alexandre Bodin
fe85273301 Move published_at to publishedAt in frontend 2021-09-22 17:06:15 +02:00
Alexandre Bodin
58e024d3ad use columnName snake casing and rename timestamp attributes 2021-09-22 17:05:30 +02:00
cyril lopez
5ec7a14250
Merge pull request #11049 from strapi/ml-iteration-2 
Pending state, error state, uploads
 2021-09-22 16:51:30 +02:00
cyril lopez
fa07ff3895
Merge pull request #11048 from strapi/cm/components 
Cm/components
 2021-09-22 16:46:45 +02:00
mfrachet
9e9c35a657 fix tests 2021-09-22 16:43:17 +02:00
soupette
73287b519f Update snapshots 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-22 16:34:03 +02:00
soupette
db86bc3f2e Merge branch 'v4/ds-migration' of github.com:strapi/strapi into qa-board-smo 2021-09-22 16:32:21 +02:00
mfrachet
b519373202 fix tests 2021-09-22 16:30:37 +02:00
mfrachet
955a98eeb0 Cancelling assets 2021-09-22 16:30:37 +02:00
mfrachet
d7a2affe48 Cancelling assets 2021-09-22 16:30:37 +02:00
mfrachet
2213d36f9c ml iterations 2021-09-22 16:30:36 +02:00
soupette
77a335c65b Merge branch 'v4/ds-migration' of github.com:strapi/strapi into cm/components 2021-09-22 16:21:32 +02:00
cyril lopez
9099409692
Merge pull request #11047 from strapi/bump-parts-alpha-37 
Bump parts alpha 37
 2021-09-22 16:21:14 +02:00
soupette
7dd1515c6d Add repeatable components 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-22 16:16:24 +02:00
soupette
fc0e27eb7e Add component initializer 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-22 15:35:22 +02:00
bulby97
d474a05c94 Fix issue in CM 2021-09-22 15:28:40 +02:00
bulby97
8faab4c825 RBAC roles - horizontal fix 2021-09-22 15:28:40 +02:00
bulby97
3633f5be40 Add click on row in tables 2021-09-22 15:28:40 +02:00
bulby97
673d06929e Table headers neutral600 colors 2021-09-22 15:28:39 +02:00
bulby97
912b97a099 Fix table icons to the right 2021-09-22 15:28:38 +02:00
Convly
f23d375e2d Merge branch 'releases/v4' into v4/graphql-schema-generation-refactor 2021-09-22 15:01:56 +02:00
mfrachet
9afcf943d4 Fix tests 2021-09-22 14:53:36 +02:00
Marvin Frachet
8f74fcd520
Filters ml (#11028) 2021-09-22 14:48:54 +02:00
mfrachet
e400700cee Bump parts to alpha 37 2021-09-22 14:44:33 +02:00
soupette
f46c20e50d Add reset component 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-22 14:33:00 +02:00
Marvin Frachet
38d1a5582e
ML iteration (#11042) 2021-09-22 14:13:52 +02:00
soupette
9fc7f8f8b3 Delete old compo 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-22 13:49:49 +02:00
soupette
10a7503dd7 Init components 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-22 13:49:27 +02:00
cyril lopez
f338217f9d
Merge pull request #11009 from strapi/roles-console-errors 
Migration/ Roles console errors fix
 2021-09-22 12:39:21 +02:00
soupette
b06ec444aa Add kitchensink app 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-22 12:38:12 +02:00
soupette
be072348e2 Merge branch 'releases/v4' of github.com:strapi/strapi into v4/ds-migration 2021-09-22 12:25:29 +02:00