yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-14 03:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,892 Commits 117 Branches 489 Tags
Commit Graph

231 Commits

Author SHA1 Message Date
Alexandre Bodin
7a3b64016c Hotfix mongo aggregate policy verifications 2019-11-28 18:33:02 +01:00
Abdón Rodríguez Davila
aa534b1a5c Use plugin in the GraphQL aggregation queries (#4508) 2019-11-13 16:19:47 +01:00
Mickael D
9ae81b9dc9 fix(#2971): fix resolvers not correctly generated when model contains private attributes (#4441) 2019-11-07 09:19:35 +01:00
Alexandre Bodin
84b41f407e Fix multiple query in one graphql request 2019-10-23 01:20:13 +02:00
soupette
931551813d Merge branch 'master' of github.com:strapi/strapi into develop 2019-10-22 10:18:59 +02:00
Alexandre BODIN
abe6b17392
Merge branch 'master' into fix/graphql-many-many-nested 2019-10-22 10:09:00 +02:00
Alexandre Bodin
349b21fd6f Check if many-many relation is populated before laoding it 2019-10-21 09:39:56 +02:00
Don Masakayan
93319d8c47 Context params moved earlier 2019-10-19 19:33:06 +08:00
Don Masakayan
aa91ca7a96 Made ctx.params and ctx.query available to policies executed via graphql requests 2019-10-16 22:42:47 +08:00
soupette
beef6e5510 Fix conflicts 2019-10-10 06:34:31 +02:00
Alexandre Bodin
6306b157b0 Fix mutation resolver name selecter 2019-10-08 11:03:28 +02:00
Alexandre BODIN
5af4740502
Merge branch 'master' into fix/graphql-group-relations 2019-10-07 13:51:24 +02:00
Alexandre Bodin
0b21fd4e7f Create a dataloader for every model 2019-10-07 13:47:47 +02:00
Alexandre BODIN
5e4c2bd394
Merge branch 'master' into fix/graphql-queries-context 2019-10-07 10:46:54 +02:00
Alexandre Bodin
0a98b13e8d Pass graphqlContext to custom queries 2019-10-07 10:05:08 +02:00
Alexandre Bodin
ba828dc8f6 Merge branch 'master' into chore/admin-development 2019-10-04 09:46:06 +02:00
Alexandre Bodin
03784d6df0 Add alias when necessary 2019-10-02 16:38:06 +02:00
soupette
66104d9e11 Fix conflicts 2019-10-01 17:56:52 +02:00
Alexandre Bodin
0ad7a7e719 Improve graphql perf 2019-10-01 17:45:16 +02:00
soupette
6f8b23d254 Fix conflicts 2019-09-27 16:26:09 +02:00
Jelmer Visser
3111ee4942 Fix for null values with manyToMany and manyWay 2019-09-26 16:07:53 +02:00
Alexandre Bodin
6c2d413ba0 Fix user-permissions graphql permissions and update user 2019-09-18 12:07:45 +02:00
Alexandre BODIN
2e95a31627
Merge branch 'master' into fix/graphql-issues 2019-09-17 10:37:04 +02:00
cyril lopez
8657453ea2
Merge branch 'master' into eslint-update 2019-09-17 10:11:11 +02: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
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
Abdón Rodríguez Davila
187a669d1e Merge branch 'master' into eslint-update 
# Conflicts:
#	.eslintrc.js
#	package.json
#	packages/strapi-admin/admin/src/containers/HomePage/CommunityContent.js
#	packages/strapi-admin/admin/src/containers/HomePage/WelcomeContent.js
#	packages/strapi-helper-plugin/lib/src/components/InputTextWithErrors/index.js
#	packages/strapi-hook-bookshelf/lib/index.js
#	packages/strapi-hook-bookshelf/lib/utils/graphql.js
#	packages/strapi-hook-bookshelf/lib/utils/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/InputWithAutoFocus.js
#	packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/SelectOne/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/TableHeader/index.js
#	packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js
#	packages/strapi-plugin-content-manager/admin/src/containers/SettingPage/index.js
#	packages/strapi-plugin-content-manager/config/policies/routing.js
#	packages/strapi-plugin-content-manager/services/ContentManager.js
#	packages/strapi-plugin-content-type-builder/admin/src/components/TableListRow/index.js
#	packages/strapi-plugin-content-type-builder/admin/src/containers/AttributesPickerModal/index.js
#	packages/strapi-utils/lib/models.js
#	yarn.lock
 2019-09-09 15:26:35 +02:00
Abdón Rodríguez Davila
30a8cf638d Disable no-async-promise-executor rule in one line 2019-08-28 12:20:27 +02:00
Alexandre Bodin
6e48232c85 Merge branch 'master' into develop 2019-08-13 10:55:37 +02:00
Jelmer Visser
f0e8df63c5 Fix custom mutation returning null and not executing policies (#3735) 
Fix custom mutation returning null and not executing policies
 2019-08-13 10:55:12 +02:00
Alexandre Bodin
2d871abf6a Merge branch 'master' into develop 2019-07-23 11:20:57 +02:00
Aamir Mahmood
1f0a2e3f81 removed extra comments 2019-07-22 14:45:09 +05:00
Aamir Mahmood
fa1da631a1 fixes #3648 if no limit set get it from aomuntLimit 2019-07-22 14:44:17 +05:00
Alexandre Bodin
3e20bd3a28 Allow types and groups without attributes 2019-07-18 19:37:33 +02:00
Alexandre Bodin
06a1b023c3 Clean up code 2019-07-18 19:37:32 +02:00
Alexandre Bodin
136056ce2f Handle mutation with group ids to avoid recreating the groups every time 2019-07-18 19:37:31 +02:00
Alexandre Bodin
103b8c3964 Add group resolvers for nested relations 2019-07-18 19:37:30 +02:00
Alexandre Bodin
07cca4139c Add group inputs 2019-07-18 19:37:30 +02:00
Alexandre Bodin
fbfe41e1d1 Create group type 2019-07-18 19:37:29 +02:00
Alexandre Bodin
939645f97d Support manyWay in graphql 2019-07-09 11:24:11 +02:00