1421 Commits

Author	SHA1	Message	Date
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
Jim LAURIE	2b9e03f3de	Fix Google auth	2019-07-12 19:46:09 +02:00
Alexandre BODIN	2d13dcf0f1	Merge branch 'master' into fix-documentation-typo	2019-07-10 18:16:48 +02:00
Derrick Mehaffy	004c5f3bd3	Testing updating Koa2-Ratelimit to latest	2019-07-10 08:12:48 -07:00
Louis Augry	08e2f47800	Merge branch 'master' into fix-documentation-typo	2019-07-10 15:11:52 +02:00
Alexandre Bodin	3a94c7ea90	v3.0.0-beta.11	2019-07-10 15:09:03 +02:00
Alexandre Bodin	3759582ccc	Test node v12 engine	2019-07-10 10:21:12 +02:00
Alexandre Bodin	abef483bc4	v3.0.0-beta.10	2019-07-09 09:05:35 +02:00
Louis Augry	a3fe9d5a38	Fix documention typo	2019-07-08 15:10:17 +02:00
soupette	61fc2ca7dc	fix lint	2019-07-08 10:20:44 +02:00
soupette	61fb728986	Fix conflicts	2019-07-04 18:43:30 +02:00
soupette	2d8f520ba7	Init SettingsView	2019-07-04 11:32:51 +02:00
Alexandre Bodin	0f565022b3	Merge branch 'master' into chore/strapi-new-improvments	2019-07-02 17:29:00 +02:00
Alexandre Bodin	9c1a834e27	v3.0.0-beta.9	2019-07-02 15:14:44 +02:00
Alexandre Bodin	6cad390d97	Merge branch 'master' into chore/strapi-new-improvments	2019-07-02 15:09:59 +02:00
soupette	6d7c1b90ac	Fix lint	2019-07-02 14:44:13 +02:00
Alexandre BODIN	5230efe52f	Merge branch 'master' into fix/koa-grant-new-release-breaking	2019-06-29 15:04:51 +02:00
Alexandre Bodin	0112a9726a	v3.0.0-beta.8	2019-06-27 19:40:33 +02:00