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

211 Commits

Author SHA1 Message Date
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
Alexandre Bodin
864a6ecaea Refactor middleware loading 2019-06-11 18:22:07 +02:00
Alexandre Bodin
d9b396821d Fix primaryKey not found for custom resolvers 2019-06-11 15:01:46 +02:00
Alexandre Bodin
3104204e20 Fix amountLimit in graphql queries 2019-06-11 13:56:24 +02:00
grom194
c814c5dc46 fix: remove graphql special condition for delete request 2019-06-04 15:22:31 +03:00
Alexandre Bodin
31a222ecb1 Start lint fixes 2019-05-29 17:25:56 +02:00
Alexandre Bodin
50b371b853 Merge branch 'beta' into tech/core-api 2019-04-19 08:26:13 +02:00
Alexandre Bodin
9103e3a2fa Fix missing populate in graphql queries 2019-04-18 12:03:40 +02:00
Alexandre Bodin
99e6dc31aa Fix issue with graphql loaders 2019-04-17 16:27:25 +02:00
Alexandre Bodin
59dc3eea36 Fix tests 2019-04-16 18:05:12 +02:00
Alexandre Bodin
710e3ab52f Save plugins models in extensions folder 2019-04-16 09:05:46 +02:00
Alexandre Bodin
eb7c4534f8 Exports schema.graphql in devmode, load extensions folder and run merge config and overwrites 2019-04-16 09:00:24 +02:00
Alexandre Bodin
2fa8afbb1a Fix graphql and some styling 2019-04-16 08:50:47 +02:00
Derrick Mehaffy
88e1ce2c57 Fix return of long type 2019-04-05 06:17:20 -07:00
Derrick Mehaffy
457e689297 Add GraphQL-Type-Long to types 2019-04-05 05:51:09 -07:00
Alexandre Bodin
9bc56a3535 Apply review changes 2019-03-29 16:53:25 +01:00
Derrick Mehaffy
73f215f0ba PR Feedback fixes 2019-03-29 06:58:32 -07:00
Alexandre Bodin
b8dc116ff6 Fix relations and graphql nested lookups for both mongo and sql 2019-03-28 12:13:32 +01:00
Alexandre Bodin
aa0ee1b56a Refactor relations update to fix many to many append 
- Fix loaders / resolvers graphql
 2019-03-27 21:32:24 +01:00
Alexandre Bodin
3098309369 Use mongoose.find on simple queries for a perf boost 2019-03-26 14:57:02 +01:00
Alexandre Bodin
aee779c751 Try to use mongo 3.6.6 on travis to allow for new lookup feature 2019-03-26 08:57:50 +01:00