1209 Commits

Author	SHA1	Message	Date
Natalia Tsvetkova	a4a26be4b3	Merge branch 'master' into feature/instagram_provider	2019-09-18 14:36:18 +02:00
Alexandre Bodin	84adbf3bcf	v3.0.0-beta.16.5	2019-09-18 14:00:21 +02:00
Alexandre Bodin	c9a3bfc763	Clean code styling	2019-09-18 13:26:56 +02:00
Alexandre Bodin	9eaabb1d58	Add tests on graphql upload and user perm graphql	2019-09-18 12:07:59 +02:00
Alexandre Bodin	6c2d413ba0	Fix user-permissions graphql permissions and update user	2019-09-18 12:07:45 +02:00
Alexandre Bodin	df236d0642	v3.0.0-beta.16.4	2019-09-17 12:14:39 +02:00
Alexandre Bodin	36e4e73ad3	v3.0.0-beta.16.3	2019-09-13 15:08:44 +02:00
Alexandre Bodin	7207184648	v3.0.0-beta.16.2	2019-09-11 19:22:05 +02:00
soupette	a8dae57806	Merge branch 'master' of github.com:strapi/strapi into front/auth-views	2019-09-10 17:52:20 +02:00
Alexandre Bodin	7d51b8625d	v3.0.0-beta.16.1	2019-09-10 16:33:22 +02:00
Alexandre Bodin	5a4b24a636	Fix permission deletion deleting only on role permission on controller delete	2019-09-10 14:47:18 +02:00
soupette	b3bc4a0941	Remove willSecure and didGetSecured data hooks	2019-09-09 18:44:41 +02:00
soupette	76560a1c9c	Merge branch 'master' of github.com:strapi/strapi into front/auth-views	2019-09-09 17:29:47 +02:00
Natalia Tsvetkova	92f00de254	Merge branch 'master' into feature/instagram_provider	2019-09-09 14:59:21 +02:00
Abdón Rodríguez Davila	1015540af9	Update koa dependencies	2019-09-09 14:39:57 +02:00
soupette	1cd7084a94	Move auth views to the admin	2019-09-09 13:58:07 +02:00
Alexandre Bodin	05597970fa	v3.0.0-beta.16	2019-09-09 13:35:57 +02:00
Natalia Tsvetkova	822e4c6598	Revert "Adjusted version" ... This reverts commit 64b70659cfee2e8fa2faf5099006531d030155c7.	2019-09-06 09:43:09 +02:00
Natalia Tsvetkova	64b70659cf	Adjusted version	2019-09-06 09:34:50 +02:00
Natalia Tsvetkova	6a3409891c	Added instagram social auth provider	2019-09-06 09:19:23 +02:00
soupette	fb3e266d16	Move auth trads to the admin	2019-09-05 16:41:23 +02:00
Virginie Ky	56b93581d8	Some UI fixes	2019-08-26 13:44:04 +02:00
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