yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-27 08:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,194 Commits 118 Branches 505 Tags
Commit Graph

6458 Commits

Author SHA1 Message Date
soupette
2d8bf888a9 Remove webpackbar when developing in the admin gto have better logs 2019-09-24 14:10:57 +02:00
soupette
d186d14721 Add config to devserver 2019-09-24 12:09:29 +02:00
soupette
9d3bdb585a Fix paths 2019-09-24 11:50:56 +02:00
soupette
ce2be875ce refacto code 2019-09-24 07:10:02 +02:00
soupette
f8f0284469 Add comments 2019-09-23 19:35:48 +02:00
soupette
1453f3e1e6 Created watch command to develop for front-end development 2019-09-23 19:27:40 +02:00
soupette
348d8d083c Add command to create cache dir 2019-09-23 12:42:17 +02:00
soupette
e033b8687e Enable plugins admin override 2019-09-23 11:50:36 +02:00
Alexandre BODIN
e6e1a70c2b
Merge branch 'master' into fix/media-preview 2019-09-23 09:44:45 +02:00
Alexandre BODIN
8df794bf9d
Merge pull request #3910 from ntsvetkova-roi/feature/instagram_provider 
Add Instagram provider
 2019-09-20 11:53:02 +02:00
Alexandre BODIN
234c20a73d
Merge pull request #3957 from jasongitmail/step-any-fix 
Fix input number step
 2019-09-20 09:44:25 +02:00
Alexandre BODIN
fe2a8f72bb
Merge pull request #3992 from fitztrev/patch-1 
Update minimum webpack version for strapi-admin
 2019-09-20 09:42:35 +02:00
Virginie Ky
92f71d777d reviews feedback 2019-09-19 10:17:20 +02:00
HuyNQ
712848b378
Fix filterOption of SelectMany to enable searching in multiple select 2019-09-19 11:02:47 +07:00
jasongitmail
d5e8b8dc50
Merge branch 'master' into step-any-fix 2019-09-18 18:27:56 +00:00
Virginie Ky
1a82ba625e constant naming 2019-09-18 18:56:04 +02:00
Virginie Ky
dfe3922ca7 add const 2019-09-18 18:25:50 +02:00
Virginie Ky
0c6508af52 count fix 2019-09-18 18:11:31 +02:00
Natalia Tsvetkova
a4a26be4b3 Merge branch 'master' into feature/instagram_provider 2019-09-18 14:36:18 +02:00
Alexandre Bodin
84adbf3bcf v3.0.0-beta.16.5 2019-09-18 14:00:21 +02:00
Alexandre Bodin
c9a3bfc763 Clean code styling 2019-09-18 13:26:56 +02:00
Alexandre Bodin
9eaabb1d58 Add tests on graphql upload and user perm graphql 2019-09-18 12:07:59 +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
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
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