yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,704 Commits 122 Branches 507 Tags
Commit Graph

536 Commits

Author SHA1 Message Date
Alexandre Bodin
0ad7a7e719 Improve graphql perf 2019-10-01 17:45:16 +02:00
Alexandre Bodin
dbd621e6d8 v3.0.0-beta.16.7 2019-10-01 12:15:48 +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
6305bee43b v3.0.0-beta.16.6 2019-09-26 14:35:06 +02:00
Alexandre Bodin
84adbf3bcf v3.0.0-beta.16.5 2019-09-18 14:00:21 +02:00
Alexandre Bodin
6c2d413ba0 Fix user-permissions graphql permissions and update user 2019-09-18 12:07:45 +02:00
Alexandre Bodin
df236d0642 v3.0.0-beta.16.4 2019-09-17 12:14:39 +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
Alexandre Bodin
36e4e73ad3 v3.0.0-beta.16.3 2019-09-13 15:08:44 +02:00
Abdón Rodríguez Davila
54c383fd44
Merge branch 'master' into eslint-update 2019-09-12 15:05:53 +02:00
Alexandre Bodin
7207184648 v3.0.0-beta.16.2 2019-09-11 19:22:05 +02:00
Alexandre Bodin
7d51b8625d v3.0.0-beta.16.1 2019-09-10 16:33:22 +02:00
Abdón Rodríguez Davila
d4b72a958c Merge branch 'master' into eslint-update 
# Conflicts:
#	yarn.lock
 2019-09-09 16:45:56 +02: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
1015540af9 Update koa dependencies 2019-09-09 14:39:57 +02:00
Alexandre Bodin
05597970fa v3.0.0-beta.16 2019-09-09 13:35:57 +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
57315af263 Test graphql delete returns the entity 2019-08-23 14:15:24 +02:00
Alexandre Bodin
7c5f1484ba Use koa-router and fix graphql-uploads 2019-08-22 15:04:27 +02:00
Alexandre Bodin
80989ee8ec Make hook loading async 2019-08-19 09:37:37 +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
ebf3922905 Merge branch 'master' into develop 2019-08-12 09:39:59 +02:00
Alexandre Bodin
fe2c2dccb3 v3.0.0-beta.15 2019-08-12 09:35:27 +02:00
Alexandre Bodin
8e8433662b rename wysiwyg type to richtext for future plans 2019-07-29 18:05:18 +02:00
Alexandre Bodin
04d4b60056 Merge branch 'master' into develop 2019-07-25 15:05:07 +02:00
Alexandre Bodin
6a34fe519c v3.0.0-beta.14 2019-07-25 12:00:42 +02:00
Alexandre Bodin
1dea89ca8f Support type wysiwyg instead of appearance param 2019-07-23 13:36:06 +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