238 Commits

Author	SHA1	Message	Date
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
Jim LAURIE	a09e88f567	Merge branch 'master' into graphql/mutations-aggregations-decimals	2018-09-24 19:42:57 +02:00
Jim LAURIE	6c897555a0	Merge branch 'master' into improvement/pluralize-routes	2018-09-18 13:47:13 +02:00
Jason Lei	3378403954	GraphQL Mutations, Aggregations, Decimals ... Merging Mutations and Aggregations. Fixed Mongoose Hook to use Decimals (2 decimal places) and Floats (20 decimal places).	2018-09-10 16:05:00 +08:00
DMehaffy	56de235297	Modify template for english	2018-08-27 08:11:23 -07:00
Jim LAURIE	7fdccc62ee	PR feedback	2018-08-23 18:28:13 +02:00
Aurélien GEORGET	e8b7bd478a	Update bootstrap.js	2018-08-23 12:00:46 +02:00
Jim LAURIE	f27b2ae2f6	Merge branch 'master' into email-validation	2018-08-21 11:54:22 +02:00
Jim LAURIE	9c17701163	Merge branch 'master' into block-user	2018-08-10 10:02:52 +02:00
Jim LAURIE	86828d731a	Merge branch 'master' into auth-microsoft	2018-08-09 16:59:00 +02:00
Jim LAURIE	eec423a2cd	Add confirmation email	2018-08-08 17:57:02 +02:00
Pierre Burgy	6a7ff7ff6d	Pluralize routes	2018-08-08 14:59:10 +02:00
Jim LAURIE	012cb0332b	Merge branch 'master' into rate-limit	2018-08-08 14:36:42 +02:00
Jim LAURIE	0afe2eceac	Add rate limit configs	2018-08-08 14:29:10 +02:00
Jim LAURIE	3f2576cb68	Can block a user	2018-08-06 17:46:58 +02:00
Jim LAURIE	70e9523ba8	Fix policy error	2018-08-06 16:59:14 +02:00
David Thomas	27c88e3a1a	Merge branch 'master' into auth-microsoft	2018-08-05 12:20:05 -04:00
Jim LAURIE	738cbf656a	Add rate limit on auth routes	2018-08-01 14:56:31 +02:00
Jim LAURIE	44b3ae5f05	Update discord icon	2018-07-31 16:17:41 +02:00
DMehaffy	b8adba1e23	Finish adding Discord to Providers.js ... Thanks to synth3tk for your help! Note that with Discord the username is not unique so I combined the username and discriminator in order to store a unique "username"	2018-07-29 17:43:45 -07:00
DMehaffy	4c64168cda	Add base structure for discord	2018-07-23 05:07:17 -07:00
David Thomas	06b741f322	Add Microsoft auth provider ... Closes #1385	2018-07-22 22:03:29 -04:00
soupette	e7357e025c	Handle delete many with models from users-permissions	2018-06-06 16:20:52 +02:00
soupette	c95be9312d	Merge branch 'fix/graphql' of github.com:strapi/strapi into content-manager-filters	2018-05-25 13:33:52 +02:00
soupette	3847fd8c67	Fix filter for decimal	2018-05-25 13:21:57 +02:00
Aurelsicoko	c111aaba13	Fixes #1247	2018-05-24 17:20:32 +02:00
soupette	87d70a8d34	Fix count query bookshelf in ctm & users-permissions	2018-05-23 10:29:04 +02:00
soupette	cc1669faf5	Fix sort query bookshelf users-permissions	2018-05-22 18:27:07 +02:00
Jim Laurie	4fe7b6176e	Fix conflicts & lint	2018-05-16 12:07:02 +02:00
Jim LAURIE	f4905a9b2e	Merge branch 'master' into enhance/relations	2018-05-14 17:33:37 +02:00
cyril lopez	1f019c60c3	Merge branch 'master' into eslint	2018-05-14 11:50:32 +02:00
Konstantin Tsabolov	9e897bcfda	Return HTTP 403 if user is not allowed to perform an operation	2018-05-10 19:36:15 +02:00
Aurelsicoko	c7f871745a	Fix findOne user, many-to-many relationship loss and remove relation business logic from CM	2018-05-09 16:57:16 +02:00
Aurelsicoko	02a2e087cc	Remove warning where clause	2018-05-09 15:11:55 +02:00
Jim LAURIE	c09f5138a2	Merge branch 'master' into eslint	2018-05-07 16:03:35 +02:00
Aurelsicoko	451ad266fb	Keep first set permissions & remove duplicate	2018-05-03 16:26:57 +02:00
soupette	68504fbe16	Add eslint to users-permissions backend	2018-04-30 18:26:56 +02:00
soupette	611dfb32eb	Merge branch 'master' of github.com:strapi/strapi into sql-xp	2018-04-26 10:26:09 +02:00
Jim LAURIE	d94be998a4	Fix prevGrantConfig equal undefined when config not exist in db	2018-04-25 14:12:24 +02:00
Jim Laurie	29dab8fbb5	Fix #1013	2018-04-25 12:17:45 +02:00
Jim Laurie	8d2a46cd0c	Fix conflict timestamp	2018-04-25 11:06:12 +02:00
Zhuang	d23ebfeaf0	merge the previous provider config	2018-04-24 22:18:21 +08:00
Jim Laurie	79ddc27cb1	U&P setup in bookshelf and handle oneToMany relation	2018-04-24 14:29:28 +02:00
Zhuang	e69dcc433b	reload grant value to db when add/delete provider	2018-04-21 12:29:00 +08:00
Jim LAURIE	c0ea8fa807	Merge branch 'master' into graphql	2018-04-16 16:39:50 +02:00
Jim LAURIE	ab238dca61	Remove space	2018-04-16 09:48:43 +02:00
cece95	32aefbe5be	fixed issue #923	2018-04-16 08:49:41 +02:00
Aurelsicoko	78e69cebd5	Add description to explain specificities of the roles query	2018-04-12 15:57:25 +02:00