yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-20 22:59:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 119 Branches 490 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
1addba7398 Fixes #1231 2018-05-25 17:54:16 +02:00
Aurelsicoko
a7a1143523 Update doc and pass depthLimit in config 2018-05-25 17:40:03 +02:00
soupette
5ec54d522c Remove comment 2018-05-25 17:30:19 +02:00
soupette
5366b1c6ad GraphQL filters 2018-05-25 17:03:43 +02:00
Jim LAURIE
2844d34ad1
Merge pull request #1266 from johannpinson/patch-graphql-timestamp 
Change names for timestamp fields in GraphQL plugin
 2018-05-25 16:46:54 +02:00
Jim Laurie
519f4344c9 Add releation update tests 2018-05-25 16:36:50 +02:00
Jim LAURIE
e68bfba121
Merge branch 'master' into patch-graphql-timestamp 2018-05-25 16:24:22 +02:00
Aurelsicoko
217aae2d1b Fixes #1058 - Amount limiting and depth limiting 2018-05-25 16:08:51 +02:00
soupette
48514fa8c4 Fix strapi utils convert params function 2018-05-25 15:57:07 +02:00
Aurelsicoko
3805f3bc95 Fixes #1164 2018-05-25 15:31:30 +02:00
Aurelsicoko
1f2a0e5b8b Fixes #1174 2018-05-25 15:23:13 +02:00
soupette
688f44be7c Fix inputCheckbox proptypes 2018-05-25 14:43:04 +02:00
soupette
c95be9312d Merge branch 'fix/graphql' of github.com:strapi/strapi into content-manager-filters 2018-05-25 13:33:52 +02:00
soupette
3847fd8c67 Fix filter for decimal 2018-05-25 13:21:57 +02:00
soupette
88d5cc2c37 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-25 12:23:55 +02:00
Jim Laurie
d6b036074e Add delete API tests 2018-05-25 11:49:46 +02:00
Raul Riera
50cdabd5c9
Merge branch 'master' into additional-variables-mongoose 2018-05-24 21:45:37 -04:00
Jim LAURIE
40d5860d21
Merge pull request #1260 from johannpinson/patch-3 
Fix generate GraphQL schema if ShadowCRUD is false
 2018-05-24 19:26:13 +02:00
Jim LAURIE
93eb13e7dd
Merge branch 'master' into patch-3 2018-05-24 18:58:26 +02:00
Jim LAURIE
ab78d0a121
Merge pull request #1261 from johanbaath/fix-duplicate-permissions 
Fix clean up of duplicate permissions
 2018-05-24 18:58:09 +02:00
Jim LAURIE
b291cf1ab8
Merge branch 'master' into fix-duplicate-permissions 2018-05-24 18:48:05 +02:00
Jim LAURIE
88c598450c
Merge pull request #1245 from johannpinson/patch-2 
Update Union type creation rules for GraphQL
 2018-05-24 18:47:25 +02:00
Aurelsicoko
71ade27999 Fixes #1232 2018-05-24 18:41:36 +02:00
Jim LAURIE
27d37f970f
Merge branch 'master' into patch-2 2018-05-24 18:37:54 +02:00
Johann Pinson
4e8e495275 fix(admin): adjust modal size + position #1062 2018-05-24 18:29:19 +02:00
soupette
eecccbcbd8 Remove Json from available filters 2018-05-24 18:15:35 +02:00
Johann Pinson
93151ac2e2 fix(ui): add min-height for line in table content-type-builder #1076 2018-05-24 17:51:55 +02:00
soupette
81a96bcc46 Unmount InputWithAutofocus after close 2018-05-24 17:49:17 +02:00
Aurelsicoko
c111aaba13 Fixes #1247 2018-05-24 17:20:32 +02:00
Johann Pinson
534fa00c0b fix(graphql): change timestamp format snake_case to camelCase 2018-05-24 17:13:14 +02:00
Johann Pinson
340aecc743 fix(ui): input min-width for helper #1214 2018-05-24 17:06:47 +02:00
Johann Pinson
6ddafb4fe3 fix(admin): handle click if specified #1257 2018-05-24 16:04:00 +02:00
Jim Laurie
b8b1afa103 Use request to send form 
axios not support FormData request from nodejs script
 2018-05-24 15:12:15 +02:00
soupette
20d896c92a Open FilterPickWrapper when clicking on a filter with correct input autofocus 2018-05-24 14:40:43 +02:00
soupette
2ece502650 Add refs to inputs Date Select & Select 2018-05-24 13:59:58 +02:00
soupette
4155de3cfc Prepare FilterOptions to enable autofocus 2018-05-24 12:33:10 +02:00
soupette
95d907235f Change boolean type in filteroptions 2018-05-24 11:02:40 +02:00
KuongKnight
7af1becc15 Merge remote-tracking branch 'upstream/master' 2018-05-24 11:02:25 +07:00
soupette
3076235a17 Fix FilterOptions InputDate desgin 2018-05-23 18:35:12 +02:00
soupette
34eb67afca Improve UX and fix design 2018-05-23 18:23:27 +02:00
soupette
739447b5c6 Use reactstrap instead of csstransition 2018-05-23 17:40:36 +02:00
soupette
9740705d08 Update filters documentation. 
Remove deprecated filter options on sorting: Allow only _sort=attr:ASC or _sort=attr:DESC
 2018-05-23 14:49:11 +02:00
soupette
ef859c83ea Fix filter date display. 
Fixes #1257
 2018-05-23 14:46:20 +02:00
soupette
6068ed3f00 Fix date filter 2018-05-23 14:35:22 +02:00
Johann Pinson
e71063920f
Fix generate GraphQL schema if ShadowCRUD is false 2018-05-23 14:27:23 +02:00
Johan Baath
1cdb1dfc76 fix clean up of duplicate permissions 2018-05-23 14:25:32 +02:00
soupette
94447b072f Fix sort for bookshelf 2018-05-23 11:27:39 +02:00
soupette
9f58443d79 Fix ctm select many and select one 2018-05-23 10:57:51 +02:00
soupette
87d70a8d34 Fix count query bookshelf in ctm & users-permissions 2018-05-23 10:29:04 +02:00
Austin Bratcher
077b7ad69e Added support in email plugin for Mailgun and Sendgrid 
Added basic support for using Mailgun and Sendgrid (as opposed to the Sendmail) package in the email plugin. Configuration is done in plugins/email/config/settings.json
 2018-05-23 00:18:39 -05:00