6761 Commits

Author SHA1 Message Date
Jim LAURIE
9900ffe3b4
Merge branch 'master' into njb/add-me-graphql-query 2018-10-26 11:35:16 +02:00
Jeanine Schoessler
11393ca3b5
small grammar fix :)
change "your using" to "you're using"
2018-10-25 18:20:33 -06:00
Jim LAURIE
65f3c1e99c
Merge pull request #2202 from strapi/3.0.0-alpha.14.4
3.0.0 alpha.14.4.0
2018-10-25 22:24:23 +02:00
Martin Muzatko
02edab8053
fixed comment for version context 2018-10-25 20:59:49 +02:00
Nick Verwymeren
513558c8e9
Update GraphQL.js 2018-10-25 13:48:28 -05:00
Nick Verwymeren
9d9125a8c7
Fixes Cannot read property 'toJSON' of null
Related to:
https://github.com/strapi/strapi/issues/2132
2018-10-25 11:08:33 -05:00
Martin Muzatko
6c49ab55db fixed searchcontext filter in docs 2018-10-25 17:26:59 +02:00
Jim LAURIE
01a2442e7d 3.0.0-alpha.14.4.0 v3.0.0-alpha.14.4.0 2018-10-25 17:18:26 +02:00
Jim LAURIE
379331f822 3.0.0-alpha.14.4 2018-10-25 16:41:07 +02:00
Jim LAURIE
74249729e2
Merge pull request #2198 from strapi/fix-publish-generate-admin
Fix publish .gitignore strapi-generate-admin
2018-10-25 16:39:13 +02:00
Jim LAURIE
7d309242a8 Fix publish .gitignore strapi-generate-admin 2018-10-25 16:36:41 +02:00
Jim LAURIE
b648b794f7
Merge pull request #2107 from matsupa/japanese_localization
Add JA translations
2018-10-25 13:55:31 +02:00
Jim LAURIE
32b7db465d
Merge branch 'master' into japanese_localization 2018-10-25 13:54:50 +02:00
Peter Janes
099446506c Fix plugin installation when installed with yarn. Fixes #1798. 2018-10-24 13:08:56 -04:00
navinweb
c429ef391d
Merge branch 'master' into master 2018-10-24 15:01:09 +03:00
Jim LAURIE
93c2b2c0eb
Merge pull request #2188 from devaublanc/master
Fix error 500 when user trying to signin with bad credentials
2018-10-24 09:41:29 +02:00
Jim LAURIE
45d815ee00
Merge branch 'master' into master 2018-10-24 09:41:15 +02:00
takeshi_matsushita
07d86b4ce4 update for flag 2018-10-24 12:13:24 +09:00
navinweb
9673ef01e5 change english lang by default | add russian lang 2018-10-23 23:34:35 +03:00
Benjamin Devaublanc
0383c4a6ba Check if user exists before testing user.confirmed 2018-10-23 18:49:49 +02:00
Jim LAURIE
dcaa4e9705
Merge pull request #2184 from moersoy/master
Update TR translations
2018-10-23 18:08:53 +02:00
Jim LAURIE
449412a1a3
Merge branch 'master' into master 2018-10-23 18:08:45 +02:00
Benjamin Devaublanc
a468f82da0 Fix error 500 when user trying to signin with bad credentials 2018-10-23 13:17:27 +02:00
Jim LAURIE
7bee86cdf7
Merge pull request #2083 from mikmar88/patch-5
Update IT translations
2018-10-23 10:32:14 +02:00
Jim LAURIE
6e5c2db0ad
Merge branch 'master' into patch-5 2018-10-23 10:32:04 +02:00
Özgür ERSOY
aa39900f31 update missing translate 2018-10-22 22:15:33 +03:00
Özgür ERSOY
8d7bc75b20
Merge pull request #5 from strapi/master
sync
2018-10-22 22:09:18 +03:00
Jim LAURIE
64e6ccccf2
Merge pull request #2102 from ryubro/fix/sso-not-working-in-the-wild
Fixed that SSO didn't work in some environment
2018-10-22 19:36:37 +02:00
Jim LAURIE
b79d763dc5
Merge branch 'master' into fix/sso-not-working-in-the-wild 2018-10-22 19:36:29 +02:00
Jim LAURIE
332533f67c
Merge pull request #2156 from greatwitenorth/patch-1
Fixes issues when doing an 'IN' query
2018-10-22 19:01:04 +02:00
Jim LAURIE
fcb393c088
Merge branch 'master' into patch-1 2018-10-22 19:00:50 +02:00
Jim LAURIE
bedf8f679b
Merge pull request #2082 from mikmar88/patch-4
Update IT translations
2018-10-22 18:02:58 +02:00
Jim LAURIE
b2fd87b641
Merge branch 'master' into patch-4 2018-10-22 18:02:03 +02:00
Jim LAURIE
c5b2f8979e
Merge pull request #2177 from Jan10/master
Update DE translations
2018-10-22 18:00:47 +02:00
Jim LAURIE
425beb849d
Merge branch 'master' into master 2018-10-22 18:00:39 +02:00
Jim LAURIE
1b2818f3d9
Merge pull request #2173 from strapi/add-roadmap
Add roadmap section to the readme
2018-10-22 15:31:07 +02:00
Jan Brachhold
1e7696861e #1620 - Translation keys missing in DE language 2018-10-21 14:50:19 +02:00
cyril lopez
3e67bd6e08 Remove fs extra and use shelljs in tests 2018-10-19 18:58:11 +02:00
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