yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-05 22:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 120 Branches 493 Tags
Commit Graph

9273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
soupette
cc1669faf5 Fix sort query bookshelf users-permissions 2018-05-22 18:27:07 +02:00
soupette
1fae3e9852 Fix ctm bookshelf find query with sort 2018-05-22 18:23:03 +02:00
soupette
d1dfb7fc40 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-22 18:17:56 +02:00
soupette
7d3dd2ad0c Clean user model 2018-05-22 17:56:13 +02:00
soupette
185350f07c Fix count routes for mongoose 2018-05-22 17:11:35 +02:00
Jim LAURIE
acbf4581aa
Merge branch 'master' into fix-typo 2018-05-22 17:06:13 +02:00
soupette
685930e551 Apply filters with URI 2018-05-22 16:55:58 +02:00
soupette
c2e187da8c Handle filters when modifying all params 2018-05-22 15:59:01 +02:00
soupette
c07d5a8f56 Apply filters from the URI 2018-05-22 15:25:21 +02:00
Raul Riera
0e4c6064ce Updated content type builder 2018-05-22 08:38:08 -04:00
Jim LAURIE
0a9fff5a30
Merge pull request #1249 from strapi/update-issue-template 
Remove issue template checkbox
 2018-05-22 14:17:12 +02:00
Jim Laurie
7056a6d65b Remove issue template checkbox 2018-05-22 14:16:25 +02:00
soupette
4c1ddf5bc4 Display filter content and remove then 2018-05-22 11:52:29 +02:00
soupette
42146a0118 Display applied filters 2018-05-22 10:19:16 +02:00
KuongKnight
f6bea4fd0a
Fix configable id type 2018-05-22 10:35:25 +07:00
Raul Riera
262182fd00 Fix a typo in the error key 2018-05-21 14:14:09 -04:00
soupette
cf4cfafa06 Add hide option 2018-05-21 17:45:23 +02:00
soupette
7260bbe309 Add actions to filterpicker 2018-05-21 17:16:04 +02:00