33691 Commits

Author SHA1 Message Date
Kamal Bennani
4c3d5da8ee
Cast candidate ObjectID to Mongoose ObjectID 2018-10-28 23:42:19 +01:00
Kamal Bennani
e5ce8c1b42
use the new method to generate the collection name 2018-10-28 23:42:19 +01:00
Kamal Bennani
3593046c41
Add some docs 2018-10-28 23:42:18 +01:00
Kamal Bennani
f8d844a48a
Update user-permissions query logic for both bookshelf/mongoose 2018-10-28 23:42:18 +01:00
Kamal Bennani
ff0a87df7a
Update Bookshelf/Mongoose service template to support relation attribute filtering 2018-10-28 23:42:18 +01:00
Kamal Bennani
5506aef710
feat(filters): add logic to parse relations filter if exist 2018-10-28 23:42:18 +01:00
Kamal Bennani
de878dac4d
Add a utility function to get the table name for a many-to-many relation 2018-10-28 23:42:17 +01:00
Kamal Bennani
9d158303ff
Add pluralize lib to strapi-utils 2018-10-28 23:42:17 +01:00
Jim LAURIE
8e393492d2
Merge pull request #2218 from strapi/improvement/documentation
Documentation improvements
2018-10-28 11:15:06 +01:00
Pierre Burgy
e61d64fee5 Fix conflict 2018-10-28 08:16:13 +01:00
Pierre Burgy
f5780683ce Improve documentation 2018-10-28 08:15:31 +01:00
entwicklerfr
dfca24c908 FIX Creating a user in AdminUI does not properly set provider type to local 2018-10-28 00:47:09 +02:00
Jim LAURIE
2f79437108
Merge pull request #2212 from jacargentina/fix-2211
Fix Content-Manager save not handling beforeSave hook throw error
2018-10-27 18:14:24 +02:00
Jim LAURIE
b7e850fed6
Merge branch 'master' into fix-2211 2018-10-27 18:14:17 +02:00
Jim LAURIE
7c583b7268
Update code style 2018-10-27 18:13:54 +02:00
Jim LAURIE
813bc90f5f
Merge pull request #2209 from feysalikbal/Fix/Added-missing-translation-keys-JA-language
Added missing translation key in JA language
2018-10-27 17:41:09 +02:00
Jim LAURIE
51618f651f
Update packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js
Co-Authored-By: entwicklerfr <39570370+entwicklerfr@users.noreply.github.com>
2018-10-27 02:06:20 +02:00
Alberto Maturano
3d177d9984 Avoid alert vulnerability on github for projects 2018-10-26 18:09:03 -05:00
Javier Castro
ed924b057a Fix #2211: Content-Manager: save not handling beforeSave hook throw error 2018-10-26 13:49:14 -03:00
feysalikbal
7e323beee6 Added missing translation key in JA language 2018-10-26 19:22:40 +03:00
Jim LAURIE
afbc90ce9c
Merge pull request #2204 from virtual/patch-1
Fix typo getting started
2018-10-26 16:38:19 +02:00
Jim LAURIE
5845eedd0a
Merge branch 'master' into patch-1 2018-10-26 16:38:09 +02:00
Jim LAURIE
69f9c65a7b
Merge pull request #2199 from MartinMuzatko/docs
Fix search context filter in docs
2018-10-26 16:23:43 +02:00
Jim LAURIE
8e0e9a2c9e
Merge branch 'master' into docs 2018-10-26 16:23:19 +02:00
Jim LAURIE
5fe0fde52e
Merge pull request #2194 from peterjanes/master
Fix plugin installation when installed with yarn
2018-10-26 16:11:38 +02:00
Jim LAURIE
bf169a9194
Merge branch 'master' into master 2018-10-26 16:11:24 +02:00
Jim LAURIE
78aa126c38
Merge pull request #2190 from navinweb/master
Change to english lang by default & add russian translation in admin
2018-10-26 15:21:27 +02:00
Jim LAURIE
2fdf98f046
Merge branch 'master' into master 2018-10-26 15:21:17 +02:00
Jim LAURIE
22a21b51cc
Merge pull request #2116 from NickBolles/njb/add-me-graphql-query
Add Graphql Query For The Current User
2018-10-26 14:20:05 +02:00
Alberto Maturano
7e87e7da97
use more descriptive startsWith than indexOf
Co-Authored-By: MartinMuzatko <martin@happy-css.com>
2018-10-26 14:19:04 +02:00
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