1295 Commits

Author	SHA1	Message	Date
aDeve	429973f814	code review : remove longline, and invers logic condition	2018-11-02 11:47:04 +01:00
aDeve	f39e917ab1	fix #2108 : handle redirect after reset password	2018-10-31 17:36:00 +01:00
Jim LAURIE	02d935188d	Fix test launch	2018-10-31 17:20:09 +01:00
Kamal Bennani	b9ad12f920	Add missing strapi-utils in the user-permissions package	2018-10-28 23:44:43 +01:00
Kamal Bennani	957368b8b2	Add a support of deep filter in bookshelf	2018-10-28 23:44:38 +01:00
Kamal Bennani	0ed9b7643a	Merge where and relation payload	2018-10-28 23:42:22 +01:00
Kamal Bennani	5bdb5c25e0	use stage functions from the relation file	2018-10-28 23:42:22 +01:00
Kamal Bennani	ce534cf568	Take into account user model	2018-10-28 23:42:21 +01:00
Kamal Bennani	f8d844a48a	Update user-permissions query logic for both bookshelf/mongoose	2018-10-28 23:42:18 +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	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	32b7db465d	Merge branch 'master' into japanese_localization	2018-10-25 13:54:50 +02:00
Benjamin Devaublanc	0383c4a6ba	Check if user exists before testing user.confirmed	2018-10-23 18:49:49 +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	b79d763dc5	Merge branch 'master' into fix/sso-not-working-in-the-wild	2018-10-22 19:36:29 +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
Jim LAURIE	e42e532f1a	Merge branch 'master' into revert-1928-master	2018-10-18 10:41:38 +02:00
NickBolles	b23bbff6a1	Use the UserPermissionsMeRole	2018-10-15 11:03:00 -05: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
NickBolles	df9f6d6aee	add graphql query for the current user	2018-10-09 21:05:13 -05:00
ByoungYong Kim	a51b030e82	Made hold public base url and Auth controller utilize the value.	2018-10-09 13:03:59 +02:00
Jim LAURIE	bcb71242a8	Revert "Font-family declarations fixed"	2018-10-09 12:31:16 +02:00
ByoungYong Kim	1c7102381d	Using optional proxy config to generate url for and	2018-10-09 11:09:34 +02:00
takeshi_matsushita	930d0170f9	Add ja.json	2018-10-09 07:49:55 +09:00
ByoungYong Kim	94aa36bd20	Merge branch 'master' into fix/sso-not-working-in-the-wild	2018-10-08 18:39:12 +02:00
ByoungYong Kim	c6ee00003f	Revert "Fixed that protocol was hardcoded as 'http' and couldn't be configured regarding sso." ... This reverts commit 17d5e295b53953a97fb5636ba8f373d7ff60a4fe.	2018-10-08 18:37:24 +02:00
cyril lopez	5c391f49e4	Merge branch 'master' of github.com:strapi/strapi into improve/admin-auth	2018-10-08 17:50:13 +02:00
Jim LAURIE	4dd93f4b78	Merge branch 'master' into split-admin-dev	2018-10-08 17:44:35 +02:00
Jim LAURIE	87c3af3d1e	3.0.0-alpha.14.3	2018-10-08 17:14:19 +02:00
ByoungYong Kim	17d5e295b5	Fixed that protocol was hardcoded as 'http' and couldn't be configured regarding sso.	2018-10-08 13:18:34 +02:00
ByoungYong Kim	12cc6d6039	Added provider into user model as it seems to be required for SSO.	2018-10-08 13:16:28 +02:00
Jim LAURIE	dfee8052de	Merge branch 'master' into bug/minorChanges	2018-10-08 11:20:03 +02:00
Jim LAURIE	5684700a72	Merge branch 'master' into master	2018-10-07 17:00:42 +02:00
IdaszakDaniel	207676e123	PL missing translation keys	2018-10-05 21:40:27 +02:00
Benjamin Devaublanc	507ab8b922	Fix error on fetch permissions ... Can't fetch permissions if we have an api that contain a service with no controllers	2018-10-05 13:07:56 +02:00
Alberto Maturano	ac7aa86658	Fix conditional returning the same	2018-10-04 15:18:56 -05:00
segush11	2c72115088	Add missing translation keys in RU language	2018-10-05 00:48:05 +05:00
Jim LAURIE	9de6851aa3	Merge branch 'master' into fix-error-code	2018-10-04 17:27:21 +02:00
Jim LAURIE	807b511751	Merge branch 'master' into update/translation_fr	2018-10-04 14:59:05 +02:00
aDeve	c461629b3b	Fix #1622 ... Update Translation FR	2018-10-04 14:52:05 +02:00
Jim LAURIE	76aff17780	Merge branch 'master' into fix/1765	2018-10-03 20:29:41 +02:00
Jim LAURIE	468c5acd82	Merge branch 'master' into fix/2035	2018-10-03 19:44:25 +02:00
Jim LAURIE	b741507aec	Merge branch 'master' into master	2018-10-03 19:42:05 +02:00
Jim LAURIE	d0f3b90524	Merge branch 'master' into feature/spanishTranslation	2018-10-03 19:37:30 +02:00
sennahLessert	4daa7c643f	fix_Issue1620 - add some missing translation keys in DE language	2018-10-03 14:22:09 +02:00
Alberto Maturano	bb66b76087	Improve spanish translation ... fix #1621	2018-10-02 22:44:14 -05:00
Pedro Caseiro	403c5d0567	issue #1626: pt translations	2018-10-02 22:53:00 +01:00