yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-28 02:35:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,264 Commits 116 Branches 491 Tags
Commit Graph

12264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
virginieky
da82757c95
Merge branch 'develop' into chore/remove-saga 2020-02-12 13:58:51 +01:00
virginieky
b21c112de3
Merge branch 'develop' into chore/ctm-remove-redux-saga 2020-02-12 13:58:16 +01:00
Virginie Ky
540830a7a6 Merge branch 'develop' of github.com:strapi/strapi into develop 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-12 13:53:51 +01:00
Alexandre Bodin
5d1e7c101e Handles clearing defaults and non existing targetField on update 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-12 11:28:08 +01:00
Alexandre Bodin
63c248bfde Add maxLength rules to UID validators 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-12 10:57:37 +01:00
Alexandre Bodin
f9a4b94040 Add default uid value validation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-12 10:46:56 +01:00
soupette
081bdb613f Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-12 10:46:44 +01:00
soupette
f5a2ddc98d Merge branch 'chore/ctm-remove-redux-saga' of github.com:strapi/strapi into chore/ctm-remove-redux-saga 2020-02-12 10:37:19 +01:00
soupette
57d01a8031 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-12 10:36:37 +01:00
soupette
1a5a3fad67 Add comments 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-12 10:14:10 +01:00
Alexandre Bodin
9012e7a0ca Add UID in CTB validators 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-12 09:06:38 +01:00
Alexandre BODIN
3014cd58c5
Merge pull request #5220 from strapi/single-types/kind-switch 
Single types/kind switch
 2020-02-11 18:19:06 +01:00
Alexandre Bodin
5e79e9c275 Add appropriate tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-11 18:15:56 +01:00
Alexandre Bodin
aff529d09e Check db count when switching kind 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-11 18:15:56 +01:00
Alexandre Bodin
fc8d72baaa Handle switching between single type and collection type. This rebuilds the api entierly 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-11 18:15:55 +01:00
Alexandre BODIN
9b415eda0f
Merge pull request #5219 from strapi/single-types/core-api 
Single types/core api
 2020-02-11 18:15:00 +01:00
soupette
597cf9709d Add marketplace plugins to the admin reducer 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 17:52:01 +01:00
Alexandre Bodin
04f6050ae1 Cleanup feedbacks 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-11 17:35:09 +01:00
soupette
86dcf65c20 Use logo from the plugin object instead of the one from github in the user-permissions plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 17:29:14 +01:00
soupette
f924a53a8a Add pluginLogo to the plugin object in order to prevent fetching the logo from github 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 17:15:53 +01:00
HichamELBSI
4f5cd5a209 Reskin and refacto the left admin menu and add Single type section 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-11 17:13:31 +01:00
soupette
945e1047d3 Update link with next single type feature 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 16:53:34 +01:00
soupette
f955ed733d Fix link to create a new collectionType 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 16:50:47 +01:00
soupette
41d649f725 Remove saga from Onboarding container and simplified the logic a little 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 16:45:10 +01:00
Alexandre Bodin
5723af75c5 Fix issue with using local pakcage as dependency 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-11 16:24:06 +01:00
virginieky
0bacc59641
Merge branch 'develop' into chore/ctm-remove-redux-saga 2020-02-11 15:16:54 +01:00
soupette
825721713a Fixes #4131 2020-02-11 15:02:58 +01:00
soupette
662a79d080 Remove saga from listview 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 14:02:03 +01:00
Alexandre Bodin
eec7d04b20 Fix policy tests after prefix renaming 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-11 10:06:17 +01:00
Alexandre Bodin
49b6a44078 Fix lint 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:40:13 +01:00
Alexandre Bodin
628b2e54e6 Refactor graphql plugin structure 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:40 +01:00
Alexandre Bodin
76393d860b Clean Resolver buildShadowCRUD 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:40 +01:00
Alexandre Bodin
49f0fdad8c Refactor schema definition language utils 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:40 +01:00
Alexandre Bodin
f1cbc014da Cleanup old graphql code 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:39 +01:00
Alexandre Bodin
3ce852af61 User :: in policies prefix and update documentation accordingly 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:39 +01:00
Alexandre Bodin
04476e32a6 Cleanup graphql 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:39 +01:00
Alexandre Bodin
3f5f839b4c Build mutation and resolves in shadowCrud and then only build the missing ones 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:38 +01:00
Alexandre Bodin
7e6c23d0b7 Init cleanup graphql 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:38 +01:00
Alexandre Bodin
900cec28f4 Change mutaion definition for single types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:37 +01:00
Alexandre Bodin
0285c7bd96 Add metadatas to resolvers to know where they are created 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:37 +01:00
Alexandre Bodin
0c6d39297f Add graphql tests for single-types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:37 +01:00
Alexandre Bodin
c0bf015eb6 Refactor core api and add tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:36 +01:00
Alexandre Bodin
0a1d7c77db Add tests for CORE api single-types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:36 +01:00
Alexandre Bodin
dbca2ef5d9 Add ctb tests for single type relation diff 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:35 +01:00
Alexandre Bodin
c02625e438 Split graphql schema generator code 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:35 +01:00
Alexandre Bodin
44b7ab6858 Add some basic testing on new functions 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:35 +01:00
Alexandre Bodin
023bda1f9e Generate single query for single type and update core api service 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:34 +01:00
Alexandre Bodin
f20f609324 Clean aggregation schema 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:10 +01:00
Alexandre Bodin
e4a028f664 More refactoring 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:10 +01:00
Alexandre Bodin
2cbaecaa4d use mergeSchemas fucntion to keep code cleaner 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:09 +01:00