yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-29 08:04:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,369 Commits 138 Branches 514 Tags
Commit Graph

6553 Commits

Author SHA1 Message Date
Alexandre Bodin
df236d0642 v3.0.0-beta.16.4 2019-09-17 12:14:39 +02:00
Alexandre BODIN
b031fa7685
Merge branch 'master' into fix/mongo-group-relation-issue 2019-09-17 11:39:29 +02:00
Alexandre Bodin
293dbb89d9 Populate groups 1st level relations 2019-09-17 11:32:57 +02:00
Alexandre BODIN
f8bfb636cd
Merge branch 'master' into fix/group-navigation 2019-09-17 10:46:13 +02:00
Alexandre BODIN
67ed10a56f
Merge branch 'master' into fix/#4026 2019-09-17 10:42:24 +02:00
Alexandre BODIN
16155ef6c4
Merge branch 'master' into fix/group-relation-plugin-doc 2019-09-17 10:37:28 +02:00
Alexandre BODIN
2e95a31627
Merge branch 'master' into fix/graphql-issues 2019-09-17 10:37:04 +02:00
soupette
8ad1256fab Fixes #4026 2019-09-17 10:22:20 +02:00
Alexandre Bodin
548c77aebf Pass group associations as second param 2019-09-17 10:18:34 +02:00
cyril lopez
8657453ea2
Merge branch 'master' into eslint-update 2019-09-17 10:11:11 +02:00
Don Masakayan
443eda174d Merge branch 'master' into graphql_plugin_mutations_fix-v3 2019-09-17 11:55:26 +08:00
Alexandre Bodin
295c18acbd Fix lint 2019-09-16 23:19:12 +02:00
Alexandre Bodin
23ab277472 Fix _q count. still does nott work with group by 2019-09-16 23:19:11 +02:00
Alexandre Bodin
c1f818958a Fix bad conversion of id to _id in graphql and aggregations 2019-09-16 23:19:11 +02:00
Alexandre Bodin
0026819119 Fix files resolver graphql 2019-09-16 23:19:10 +02:00
Alexandre BODIN
9cf90a9a67
Merge branch 'master' into fix/3874-bookshelf-unicode-fix 2019-09-16 23:10:56 +02:00
Alexandre BODIN
8a6c162095
Merge branch 'master' into chore/routing-x-forwarded 2019-09-16 23:07:54 +02:00
jasongitmail
2f2ecb587c
Merge branch 'master' into step-any-fix 2019-09-16 18:32:51 +00:00
jasongitmail
603d3ed757
Change to step={props.step} 2019-09-16 18:30:35 +00:00
soupette
d2c8d5e419 Fixes #4013 2019-09-16 17:47:43 +02:00
cyril lopez
7457673df0
Merge branch 'master' into features/media-preview 2019-09-16 16:37:38 +02:00
Don Masakayan
c5e6110292 Fixed issue where GraphQL Mutations that use actions in plugins didn't work. 
This now works, as it should:

```
Mutation: {
  customMutation:
    resolver: {
      plugin: "custom-plugin",
        handler: "Post.customMutation"
      }
    }
  }
}
```
 2019-09-15 15:51:26 +08:00
Don Masakayan
d3a968aa62 Pass easier-to-understand options instead of arguments to Mutation.composeMutationResolver() and Query.composeQueryResolver() 2019-09-15 15:51:25 +08:00
Don Masakayan
79a253f5bc Simplified ctx.state.user fix 2019-09-15 15:51:25 +08:00
Don Masakayan
ef82e486e6 Fixed issue where all policies triggered by GraphQL Mutations and Queries had ctx.state.user as undefined 2019-09-15 15:51:23 +08:00
Don Masakayan
fd02d99b28 Fixed issue where custom GraphQL Mutation resolvers never triggered policies 2019-09-15 15:51:23 +08:00
Don Masakayan
17c4244f14 Pass easier-to-understand options instead of arguments to Mutation.composeMutationResolver() and Query.composeQueryResolver() 2019-09-15 15:51:06 +08:00
Don Masakayan
8d3d79fd18 Simplified ctx.state.user fix 2019-09-15 15:51:05 +08:00
Don Masakayan
0bead70c2c Fixed issue where all policies triggered by GraphQL Mutations and Queries had ctx.state.user as undefined 2019-09-15 15:51:04 +08:00
Don Masakayan
e0dd6dc602 Fixed issue where custom GraphQL Mutation resolvers never triggered policies 2019-09-15 15:51:03 +08:00
Alexandre BODIN
c66eb5d2cf
Merge branch 'master' into chore/routing-x-forwarded 2019-09-13 17:40:50 +02:00
Trevor Fitzgerald
fd88eeb6db
Update minimum webpack version for strapi-admin 2019-09-13 10:54:40 -04:00
virginieky
5fc8600506
Merge branch 'master' into features/media-preview 2019-09-13 16:16:36 +02:00
Virginie Ky
1b53286c71 merge 2019-09-13 16:05:10 +02:00
Virginie Ky
4f9065f19e last review apply 2019-09-13 16:04:15 +02:00
Alexandre Bodin
36e4e73ad3 v3.0.0-beta.16.3 2019-09-13 15:08:44 +02:00
soupette
9ad9fafd6b Fixes #3987 #3954 2019-09-13 14:46:31 +02:00
Alexandre BODIN
09a227c3d8
Merge branch 'master' into fix/json-array-pg 2019-09-13 10:56:28 +02:00
Alexandre Bodin
852be46911 Stringify json input for pg to support arrays 2019-09-13 10:41:21 +02:00
Alexandre Bodin
ae6492dab2 Allow group mainField and defaultSortBy to be id 2019-09-13 10:36:48 +02:00
Alexandre BODIN
b11e9375c9
Merge branch 'master' into features/media-preview 2019-09-13 10:19:55 +02:00
jasongitmail
eb8be740a2
Merge branch 'master' into step-any-fix 2019-09-13 01:06:43 +00:00
jasongitmail
83173d8882
Change InputNumber.js defaultProps to step: 'any' 2019-09-12 18:03:16 +00:00
cyril lopez
087226b5e4
Merge branch 'master' into styled-components/email 2019-09-12 17:41:05 +02:00
Abdón Rodríguez Davila
54c383fd44
Merge branch 'master' into eslint-update 2019-09-12 15:05:53 +02:00
Alexandre Bodin
6ec284180a sanitize user model data 2019-09-12 10:50:52 +02:00
Alexandre Bodin
e20d781383 Merge branch 'master' into chore/routing-x-forwarded 2019-09-12 09:59:11 +02:00
Alexandre Bodin
7207184648 v3.0.0-beta.16.2 2019-09-11 19:22:05 +02:00
soupette
2077e3d782 Fix PR feedback 2019-09-11 18:56:37 +02:00
Alexandre BODIN
bdea8bd887
Merge branch 'master' into fix/image-multi 2019-09-11 16:49:31 +02:00