yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-29 03:50:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 114 Branches 486 Tags
Commit Graph

1705 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
soupette
43ad5ca083 Fix pageSize compo 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 07:44:09 +02:00
soupette
c475c96722 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 05:54:12 +02:00
Convly
a303b0e5c4 Don't run shadowCRUD related operations if it's disabled 2021-09-22 18:17:51 +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
mfrachet
9e9c35a657 fix tests 2021-09-22 16:43:17 +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
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
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
Marvin Frachet
38d1a5582e
ML iteration (#11042) 2021-09-22 14:13:52 +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
Convly
8b139ec162 Merge branch 'releases/v4' into v4/graphql-schema-generation-refactor 2021-09-22 10:48:29 +02:00
Marvin Frachet
2f3f5790b3
Upload pending selected (#11023) 2021-09-21 15:25:50 +02:00
Alexandre Bodin
5b0ac47435 Merge branch 'releases/v4' into v4/db-migrations 2021-09-21 15:17:02 +02:00
cyril lopez
864569357a
Merge pull request #11018 from strapi/cm/edit-links 
Add links to edit view
 2021-09-21 09:14:56 +02:00
mfrachet
12708c1dc4 Fix soupette's review 2021-09-21 08:59:45 +02:00
mfrachet
389166481f Add Upload from computer step 2021-09-21 08:57:08 +02:00
soupette
646e9f220d Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-21 05:39:45 +02:00
ronronscelestes
c58d04bc3b replaced all headers button with size L + updated tests 2021-09-20 17:09:52 +02:00
soupette
03a6f854c3 init D&P status 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-20 12:32:26 +02:00
mfrachet
18e7477efd Fix snapshot 2021-09-20 09:39:28 +02:00
mfrachet
331e952721 Update tests 2021-09-20 08:40:54 +02:00
mfrachet
3623fa3186 Make add URL work with pending step 2021-09-20 08:40:54 +02:00
Pierre Noël
b3f22bac5d use of strapi.dirs 2021-09-17 14:10:48 +02:00
Marvin Frachet
19c2d20388
Bump parts to alpha 32 (#10995) 2021-09-16 16:09:51 +02:00
soupette
715a1af676 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-16 09:23:18 +02:00
Convly
620cbc809a Merge branch 'v4/graphql-schema-generation-refactor' of github.com:strapi/strapi into v4/graphql-schema-generation-refactor 2021-09-15 15:50:55 +02:00
Convly
7e765de7cd Remove useless schema.graphql.js file for the upload plugin 2021-09-15 15:50:37 +02:00
mfrachet
751d2e0c83 Pending asset step init 2021-09-15 15:47:16 +02:00
Jean-Sébastien Herbaux
5a7a5dc987
[V4] GraphQL - Migrate Users & Permissions GraphQL config to V4 (#10979) 
* Migrate UsersPermissions's GQL configuration to V4

* Remove old graphql configuration
 2021-09-15 15:44:42 +02:00
mfrachet
5c478a41ed Pending asset step init 2021-09-15 15:40:20 +02:00
Marvin Frachet
cdc12adccb
Bump strapi parts to alpha 31 (#10977) 
* Bump strapi parts to alpha 31

* Fix tests
 2021-09-15 14:25:36 +02:00
cyril lopez
2496f2559b
Merge pull request #10973 from strapi/init-asset-upload-dialog 
Init the upload asset dialog
 2021-09-15 12:13:01 +02:00
soupette
b43986b959 Fix tests messages 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-15 11:29:13 +02:00
mfrachet
c5ddd9a039 Init the upload asset dialog 2021-09-15 10:56:26 +02:00
mfrachet
5f022f865e Fix review comments 2021-09-15 09:57:23 +02:00
mfrachet
48fe09616b Fix tests 2021-09-14 14:47:58 +02:00
mfrachet
a7ce7501b2 Initialize asset cards in ML 2021-09-14 14:21:42 +02:00
mfrachet
5f113f84a0 Fix from soupette 2021-09-14 09:17:54 +02:00
mfrachet
b545c9ca82 Fix stuff 2021-09-14 09:17:25 +02:00
mfrachet
1335b01ca7 fixing lint 2021-09-14 09:17:24 +02:00
mfrachet
c593115d65 Revert console 2021-09-14 09:17:24 +02:00
mfrachet
04f65a3312 Revert console 2021-09-14 09:17:24 +02:00
mfrachet
8f08a928b4 Add MediaLibrary empty states and layout 2021-09-14 09:17:23 +02:00
Alexandre Bodin
0f3f984ea7 Init migration v4 
- Hooks registry
- D&P CT migrations
- i18N CT migrations
- Umzug with js / sql migrations
- Eslint updates
 2021-09-13 12:03:12 +02:00