4423 Commits

Author	SHA1	Message	Date
Jim LAURIE	bc6cc25a58	Merge branch 'master' into fix/vulnerabilityAlert	2018-10-29 13:05:44 +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
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
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	bf169a9194	Merge branch 'master' into master	2018-10-26 16:11:24 +02:00
Jim LAURIE	2fdf98f046	Merge branch 'master' into master	2018-10-26 15:21:17 +02:00
Jim LAURIE	9900ffe3b4	Merge branch 'master' into njb/add-me-graphql-query	2018-10-26 11:35:16 +02:00
Jim LAURIE	01a2442e7d	3.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	7d309242a8	Fix publish .gitignore strapi-generate-admin	2018-10-25 16:36:41 +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	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	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	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
Jim LAURIE	b79d763dc5	Merge branch 'master' into fix/sso-not-working-in-the-wild	2018-10-22 19:36:29 +02:00
Jim LAURIE	fcb393c088	Merge branch 'master' into patch-1	2018-10-22 19:00:50 +02:00
Jim LAURIE	b2fd87b641	Merge branch 'master' into patch-4	2018-10-22 18:02:03 +02:00
Jan Brachhold	1e7696861e	#1620 - Translation keys missing in DE language	2018-10-21 14:50:19 +02:00
Nick Bolles	e09879223c	Merge branch 'master' into njb/add-me-graphql-query	2018-10-19 10:14:01 -05: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	c81f7fc5be	Merge branch 'master' into remove-logs-graphql	2018-10-19 09:27:38 +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
Jim LAURIE	4ced536eaf	Remove logs Graphql	2018-10-18 14:33:08 +02:00
Jim LAURIE	e42e532f1a	Merge branch 'master' into revert-1928-master	2018-10-18 10:41:38 +02:00
cyril lopez	b3e9c0ec48	Merge branch 'master' into fix/#2097	2018-10-18 10:39:22 +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
Ben Weller	a90b16b6c5	Merge branch 'master' into bugfix/graphql-json-type-not-string	2018-10-17 10:21:53 -05:00
Jim LAURIE	75ecd2d790	Merge branch 'master' into master	2018-10-17 16:35:23 +02:00
Jim LAURIE	3d149ffc68	Merge branch 'master' into clean-dependencies	2018-10-17 16:14:26 +02:00
Jim LAURIE	70bc03242f	Merge branch 'master' into fix-upload	2018-10-17 15:16:23 +02:00
Jim LAURIE	6039dc4964	Merge branch 'master' into update/doc-menu	2018-10-17 15:04:56 +02:00
Jim LAURIE	f629e94450	Merge branch 'master' into add-missing-pl-translations	2018-10-17 14:48:05 +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	a21dba22c6	Merge branch 'master' into fix/2011	2018-10-13 18:50:44 +01:00