1388 Commits

Author	SHA1	Message	Date
Sajjad Shirazy	cc178e1cb2	Ability to pass OAuth callback dynamically	2019-08-26 10:41:50 +04:30
Alexandre BODIN	ad1cee6469	Merge branch 'master' into develop	2019-08-22 16:06:05 +02:00
soupette	14157f73b9	Update trads and add links to terms and privacy policy	2019-08-21 10:06:09 +02:00
Vladislav Umrikhin	ea42bf1e63	fix capital letter in word email	2019-08-20 16:51:08 +10:00
Vladislav Umrikhin	ff5c091c2b	Fixed context of paper letters	2019-08-19 04:38:18 +10:00
Vladislav Umrikhin	f4d5317264	Update RU translation in strapi-plugin-users-permissions	2019-08-19 04:35:18 +10:00
Alexandre Bodin	2a780ea10a	Clear _id now that queries return an id everytime	2019-08-13 17:40:31 +02:00
soupette	857ec1ca70	Rename lifecycle hooks	2019-08-13 11:31:10 +02:00
soupette	d52d4f603f	Upgrade react deps	2019-08-13 11:22:36 +02:00
Alexandre Bodin	3b47457f4f	make boostrap functions async only	2019-08-12 15:35:40 +02:00
cyril lopez	28b43ac00a	Merge branch 'develop' into enhancement/login-logo	2019-08-12 09:52:20 +02:00
Alexandre Bodin	ebf3922905	Merge branch 'master' into develop	2019-08-12 09:39:59 +02:00
Alexandre Bodin	fe2c2dccb3	v3.0.0-beta.15	2019-08-12 09:35:27 +02:00
soupette	25d7fad468	Add option to change the logo of the login page	2019-08-09 17:21:39 +02:00
Alexandre Bodin	8c1f25a058	Update user model metadatas configurations	2019-08-06 13:49:25 +02:00
Alexandre Bodin	b58d7a138a	Support content types layouts and metadatas defaults with Model.config.js(on) files	2019-08-06 13:49:24 +02:00
Alexandre Bodin	7520961d27	Merge branch 'master' into develop	2019-08-06 13:49:10 +02:00
Alexandre BODIN	ce1f66970b	Merge branch 'master' into master	2019-08-06 08:31:42 +02:00
Rémi M	ad01efc7ff	Fix /auth/login, reformat code and fix comment	2019-08-06 00:51:27 +02:00
Rémi M	0d1450bd19	Fix /auth/login, user object was ignoring files and relations ... Remove useless variables	2019-08-06 00:44:08 +02:00
Alexandre Bodin	e4c7a699fb	Add image upload in routing policy of the content manager	2019-08-05 10:31:18 +02:00
Rémi M	04f0995b43	Fix /auth/login, user object ignore files and relations ... Find user by email or identifier to get files and relations.	2019-08-03 15:58:01 +02:00
Alexandre Bodin	f757d4d952	Support relations inside of group creation	2019-07-29 08:15:18 +02:00
Alexandre Bodin	04d4b60056	Merge branch 'master' into develop	2019-07-25 15:05:07 +02:00
Alexandre Bodin	6a34fe519c	v3.0.0-beta.14	2019-07-25 12:00:42 +02:00
Alexandre Bodin	48e45c5e01	Cleanup layout.js files	2019-07-23 13:45:08 +02:00
Derrick Mehaffy	2f44b7353b	PR Feedback for testing	2019-07-23 02:20:36 -07:00
Derrick Mehaffy	8bcc6d5d37	Fix graphql me route when using bookshelf databases	2019-07-19 02:14:46 -07:00
Alexandre Bodin	a62f73fe5f	Merge branch 'develop' into feature/groups	2019-07-18 19:37:09 +02:00
Alexandre Bodin	da5d02fb7c	Merge branch 'master' into develop	2019-07-18 19:28:52 +02:00
Alexandre Bodin	7e11acac32	Fix bugs mongo	2019-07-18 15:49:24 +02:00
Alexandre Bodin	5a21e2f87f	Fix updateRole	2019-07-17 14:28:36 +02:00
Alexandre Bodin	ef9ce7d4fa	simplify permission duplicate removal	2019-07-17 13:50:07 +02:00
Alexandre Bodin	87d9d85c08	Handle empty permissions in role update	2019-07-17 10:15:22 +02:00
Alexandre Bodin	c020f0a6cd	mongoose working version	2019-07-17 00:03:38 +02:00
Alexandre Bodin	2befa1cf48	Use primaryKey on delete queries	2019-07-16 23:27:34 +02:00
Alexandre Bodin	09dcea27f1	refactor mongoose queries to match api	2019-07-16 21:24:09 +02:00
Alexandre Bodin	928c7f4776	fix create/update role	2019-07-16 20:52:31 +02:00
Alexandre Bodin	56c59c5ae1	Implement deleteMany in query.delete	2019-07-16 20:11:34 +02:00
Alexandre BODIN	f187945ee8	Merge branch 'master' into fix/google-auth	2019-07-16 17:40:33 +02:00
Alexandre Bodin	ed6d35d51d	Implement delete user	2019-07-16 17:23:40 +02:00
Alexandre Bodin	3e53d7c8c2	Fix user update and boolean values in DB	2019-07-16 17:23:39 +02:00
Alexandre Bodin	c4b7ae55e6	Fix username unique in users-permissions plugin and implement sql db unique option	2019-07-16 17:23:39 +02:00
Alexandre Bodin	1658b48aa0	Refactor users-permissions to use the new strapi.query	2019-07-16 17:23:38 +02:00
Alexandre BODIN	cd634fc038	Merge branch 'master' into patch-1	2019-07-15 18:47:51 +02:00
Alexandre Bodin	1720445986	v3.0.0-beta.13	2019-07-15 17:07:07 +02:00
Jim LAURIE	de2604cf80	Fix var instead of const	2019-07-15 13:32:41 +02:00
Abdón Rodríguez Davila	857cd6111a	Update engines configuration from all files	2019-07-15 11:16:38 +02:00
Alexandre Bodin	b087cbab34	v3.0.0-beta.12	2019-07-15 10:24:28 +02:00
Alexandre Bodin	63a6452830	Merge branch 'develop' into feature/groups	2019-07-15 10:21:22 +02:00