9273 Commits

Author SHA1 Message Date
Nick Bolles
e09879223c
Merge branch 'master' into njb/add-me-graphql-query 2018-10-19 10:14:01 -05:00
Aurélien GEORGET
023844afa7
Add roadmap section to the readme 2018-10-19 17:08:43 +02:00
Jim LAURIE
ea5c63a77f
Merge pull request #2167 from entwicklerfr/enhancement/Creating-indexes-should-use-the-suffix-IF-NOT-EXISTS#1850
Add IF NOT EXISTS parameter for creating indexes with PG
2018-10-19 11:39:17 +02:00
Jim LAURIE
61f0b66d49
Merge branch 'master' into enhancement/Creating-indexes-should-use-the-suffix-IF-NOT-EXISTS#1850 2018-10-19 11:39:09 +02:00
Jim LAURIE
684a0350df
Merge pull request #2170 from strapi/add-ga-doc
Add ga in documentation
2018-10-19 11:00:01 +02:00
Jim LAURIE
e90890b0da Add ga doc 2018-10-19 10:58:30 +02:00
Jim LAURIE
9b4714e070
Merge pull request #2163 from strapi/update-hook-doc
Update hook documentation
2018-10-19 09:28:18 +02:00
Jim LAURIE
ee1f18dac2
Merge branch 'master' into update-hook-doc 2018-10-19 09:28:10 +02:00
Jim LAURIE
bda3498b45
Merge pull request #2164 from strapi/remove-logs-graphql
Remove logs Graphql
2018-10-19 09:27:43 +02:00
Jim LAURIE
c81f7fc5be
Merge branch 'master' into remove-logs-graphql 2018-10-19 09:27:38 +02:00
Jim LAURIE
404afec5de Prefix providers 2018-10-19 09:26:09 +02:00
Jim LAURIE
357274f280
Merge pull request #2168 from maturanomx/feature/spanishTranslation
Add missing keys in ES translation
2018-10-19 09:20:07 +02:00
Alberto Maturano
60dae60890 Add missing keys in ES translation
close #1621
2018-10-18 17:48:50 -05:00
entwicklerfr
bf7809f3dd Add IF NOT EXISTS parameter for creating indexes in postgresql case 2018-10-18 22:34:22 +02:00
Nick Verwymeren
dc7f06194f
Allow the use of .graphql or .graphql.js
Previously schema files could only end in .graphql files. This caused a problem with IDE's since these files are actually javascript files. This pull request should also detect ```.graphql.js``` files while keeping backward compatibility with the ```.graphql``` extension.
2018-10-18 10:01:29 -05:00
Jim LAURIE
4ced536eaf Remove logs Graphql 2018-10-18 14:33:08 +02:00
Jim LAURIE
7c8da2100e Update hook documentation 2018-10-18 11:25:09 +02:00
Jim LAURIE
651cf3198b
Merge pull request #2112 from strapi/revert-1928-master
Revert "Font-family declarations fixed"
2018-10-18 10:41:45 +02:00
Jim LAURIE
e42e532f1a
Merge branch 'master' into revert-1928-master 2018-10-18 10:41:38 +02:00
Jim LAURIE
051c07202f
Merge pull request #2114 from strapi/fix/#2097
Fix bugs related to Firefox
2018-10-18 10:40:18 +02:00
cyril lopez
b3e9c0ec48
Merge branch 'master' into fix/#2097 2018-10-18 10:39:22 +02:00
Jim LAURIE
297bad9b8e
Merge pull request #2137 from e9labs/bugfix/graphql-json-type-not-string
Fix for JSON attributes types in GraphQL
2018-10-18 10:09:47 +02:00
Jim LAURIE
f362a8cf92
Merge branch 'master' into bugfix/graphql-json-type-not-string 2018-10-18 10:09:37 +02:00
Jim LAURIE
d8f520409c
Merge pull request #2155 from strapi/fix/prevent_docs_to_lint
Prevent lint run in docs
2018-10-18 09:54:30 +02:00
entwicklerfr
aada9332a5 multi lines in content type description#1543 2018-10-17 23:54:30 +02:00
entwicklerfr
8b78daf3e7 multi lines in content type description#1543 2018-10-17 23:13:35 +02:00
Nick Verwymeren
d123b14ae5
Fixes issues when doing an 'IN' query
When doing an 'IN' query it looks like this will incorrectly loop over the values and put them into multiple where clauses. This additional check on the symbol should leave the array untouched and pass it on into the orm for processing.
2018-10-17 11:50:43 -05:00
aDeve
c10678bd26 Prevent lint to run in docs 2018-10-17 18:16:59 +02:00
Ben Weller
a90b16b6c5
Merge branch 'master' into bugfix/graphql-json-type-not-string 2018-10-17 10:21:53 -05:00
Jim LAURIE
a9e0e920f5
Merge pull request #2135 from xargr/master
Fix bug delete file from AWS S3
2018-10-17 16:35:37 +02:00
Jim LAURIE
75ecd2d790
Merge branch 'master' into master 2018-10-17 16:35:23 +02:00
Jim LAURIE
c3ea0a213d
Merge pull request #2033 from strapi/clean-dependencies
Clean dependencies
2018-10-17 16:21:22 +02:00
Jim LAURIE
3d149ffc68
Merge branch 'master' into clean-dependencies 2018-10-17 16:14:26 +02:00
Jim LAURIE
1f66cd272c
Merge pull request #2145 from henrych4/fix-upload
Use hash filename as unique tag id in File Upload section
2018-10-17 15:16:48 +02:00
Jim LAURIE
70bc03242f
Merge branch 'master' into fix-upload 2018-10-17 15:16:23 +02:00
Jim LAURIE
f6ced24c2b
Merge pull request #2139 from strapi/update/doc-menu
Update doc menu
2018-10-17 15:05:08 +02:00
Jim LAURIE
6039dc4964
Merge branch 'master' into update/doc-menu 2018-10-17 15:04:56 +02:00
Jim LAURIE
c14f447ba8
Merge pull request #2138 from mleko-forks/add-missing-pl-translations
Update PL translations
2018-10-17 14:48:46 +02:00
Jim LAURIE
f629e94450
Merge branch 'master' into add-missing-pl-translations 2018-10-17 14:48:05 +02:00
Jim LAURIE
69c5489db8
Merge pull request #2127 from sylvaingirardbe/patch-1
Fix linguistic issue on deployment guide
2018-10-17 14:22:39 +02:00
Jim LAURIE
fcf4da8b19
Merge branch 'master' into patch-1 2018-10-17 14:22:29 +02:00
NickBolles
b23bbff6a1 Use the UserPermissionsMeRole 2018-10-15 11:03:00 -05:00
henrych4
18d809ce66 use hashed filename as unique tag id 2018-10-15 21:48:01 +08:00
NickBolles
fc8931bb39 Add a special return type for the me graphql query
This helps avoid returning roles and permissions that the user doesn't have access to.
2018-10-14 21:14:02 -05:00
Ben Weller
e6bd209c08 Merge remote-tracking branch 'upstream/master' into bugfix/graphql-json-type-not-string 2018-10-13 13:10:13 -05:00
Jim LAURIE
54a0748931 Update doc menu 2018-10-13 19:07:25 +01:00
Jim LAURIE
546f389746
Merge pull request #2119 from strapi/fix/2011
Fix plugin install version
2018-10-13 18:51:43 +01:00
Jim LAURIE
a21dba22c6
Merge branch 'master' into fix/2011 2018-10-13 18:50:44 +01:00
Daniel Król
fb7e9c2a8f Add missing PL translations 2018-10-13 10:49:36 +02:00
Ben Weller
1249909c46 re-add support for JSON graphql types 2018-10-12 13:29:18 -05:00