yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,084 Commits 138 Branches 514 Tags
Commit Graph

7735 Commits

Author SHA1 Message Date
Alexandre Bodin
cd4f873be6 Add testing 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-21 12:32:37 +01:00
Alexandre Bodin
98570f0663 Support single types in entity service 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-21 11:46:39 +01:00
Alexandre Bodin
90408d5119 content-manager: list content types on kind 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-21 11:46:38 +01:00
Alexandre Bodin
dce6bd432c Merge branch 'develop' into features/single-types 2020-01-21 11:46:26 +01:00
Alexandre Bodin
daaf1392d2 Merge branch 'master' into develop 2020-01-21 11:46:04 +01:00
Alexandre BODIN
4bebeb7d6d
Merge branch 'master' into master 2020-01-21 10:39:37 +01:00
Alexandre BODIN
4cfaad4940
Merge branch 'master' into fix/remove-auto-populate 2020-01-21 10:35:46 +01:00
Alexandre Bodin
323e76b5f3 Merge branch 'develop' into features/single-types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-20 17:33:58 +01:00
Alexandre BODIN
1d05cc01b2
Merge branch 'develop' into features/webhooks 2020-01-20 17:21:14 +01:00
Alexandre BODIN
5895d8d357
Merge branch 'master' into fix-graphql-role-query 2020-01-20 17:12:36 +01:00
virginieky
c85ed7a6f6
Merge pull request #5025 from strapi/review/functionnal 
Review/functionnal
 2020-01-20 17:01:20 +01:00
Jim LAURIE
8027b135e1 fix: fix get role via graphql 
Find one role issue due to params sharing in the GraphQL schema.
fix #5013
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-01-20 17:00:20 +01:00
Virginie Ky
3747f3e516 media update disabled comment 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 16:43:37 +01:00
Virginie Ky
f47523302c Disabled events 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 16:31:56 +01:00
Alexandre Bodin
b2e21fba1d Merge branch 'develop' into features/single-types 2020-01-20 16:27:35 +01:00
Alexandre Bodin
f38ff0c801 Merge branch 'develop' into features/webhooks 2020-01-20 16:27:12 +01:00
soupette
6960a0c7a6 Merge branch 'master' of github.com:strapi/strapi into fix/ctm-error 2020-01-20 16:22:51 +01:00
soupette
3d5b224183 Rename prop to isNested for better understanding 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-20 16:22:43 +01:00
Virginie Ky
bfe0cf321e remove onblur 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 15:59:25 +01:00
Virginie Ky
8b4886515c events errors 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 15:25:34 +01:00
Virginie Ky
b828f06add trigger button headers errors and notification translation 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 15:22:30 +01:00
soupette
8147a188ed Fix icons when error state, improve drag experience 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-20 15:16:55 +01:00
cyril lopez
b76cdb10bb
Merge pull request #5014 from strapi/front/webhooks-editview 
Front/webhooks editview
 2020-01-20 10:25:21 +01:00
Virginie Ky
bb22226a86 log clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 09:58:07 +01:00
Ky
588d472ee2 layout icon fix 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-01-19 17:58:41 +01:00
Ky
665512e656 actions fix 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-01-19 17:11:24 +01:00
nurikabe
4ab268b134 RFC-822 doesn't require double quotes around the descriptive name in an email address 2020-01-18 16:39:27 -05:00
Mathieu Wrzesien
8f8092209b Add scheduling parameters to SendGrid Provider 
Signed-off-by: Mathieu Wrzesien <mathieu.wrzesien@outlook.com>
 2020-01-17 23:06:06 -05:00
Virginie Ky
0764448c75 eslint dep disable fix 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 20:34:02 +01:00
Virginie Ky
bc0d0afcd1 eslint dep disable fix 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 20:32:50 +01:00
Virginie Ky
9ebc543bdd eslint dep 2020-01-17 20:27:16 +01:00
Virginie Ky
249bfbdde9 remove abortcontroller dep 2020-01-17 20:23:03 +01:00
Virginie Ky
f36b1c6288 remove events onblur effect 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 20:20:57 +01:00
cyril lopez
7ccd012ada
Merge pull request #4962 from strapi/front/webhooks-editview 
Front/webhooks editview
 2020-01-17 18:59:50 +01:00
Virginie Ky
af578e9df7 log remove 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 18:21:26 +01:00
Virginie Ky
2753a66315 editview methods reorder 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 17:28:46 +01:00
Virginie Ky
e444cf0119 events input ref 2020-01-17 17:20:27 +01:00
Patai Adam
3f0034bc32
Merge branch 'master' into fix/remove-auto-populate 2020-01-17 14:15:16 +01:00
Patai Adam
c290e37470
Update content-type-builder.js 2020-01-17 14:08:58 +01:00
Virginie Ky
27786d1d1f event onblur fix 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 13:37:21 +01:00
Alexandre Bodin
4f039b2df8 Clean lint 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-17 10:43:17 +01:00
Alexandre Bodin
70fe8c93d4 Init CTB tests for content types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-17 10:43:17 +01:00
Virginie Ky
84d042736d Code review apply 2020-01-16 18:17:30 +01:00
Alexandre Bodin
44d2c7d5de Init CTB tests for content types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 16:56:15 +01:00
Alexandre Bodin
d1600dec21 Fix user-permissions bootstrap issue 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 16:56:14 +01:00
Alexandre Bodin
b7a875afb5 Refactor loaders into one module 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 16:56:14 +01:00
Alexandre Bodin
469dd33374 Make kind optional but use collectionType as default 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 16:56:14 +01:00
Alexandre Bodin
88a5a0a654 Add kind in bootstrap and relations can only be created with collection types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 16:56:13 +01:00
Alexandre Bodin
57122c4acb Add kind property to content-type-builder 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 16:56:13 +01:00
Alexandre Bodin
ab8d2c5d77 Merge branch 'develop' into features/webhooks 2020-01-16 16:55:27 +01:00