1295 Commits

Author	SHA1	Message	Date
soupette	b214765287	Merge branch 'develop' of github.com:strapi/strapi into styled-component/ctb	2019-10-08 09:39:10 +02:00
soupette	75abb17f0f	Fix conflicts	2019-10-08 09:17:47 +02:00
Virginie Ky	42257b3af4	Merge branch 'styled-component/ctb' of github.com:strapi/strapi into styled-component/ctb	2019-10-07 13:54:31 +02:00
Virginie Ky	d4bc0c1683	Users permissions edit view policies fix	2019-10-07 13:42:39 +02:00
Ivo Bathke	5877ff93d0	fixed typo in de.json and removed unneccesary whitespace in model generator	2019-10-04 17:48:45 +02:00
Alexandre BODIN	cf58f742ef	Merge branch 'master' into patch-1	2019-10-04 14:41:08 +02:00
Alexandre Bodin	2d04d25097	v3.0.0-beta.16.8	2019-10-04 11:57:46 +02:00
soupette	2e7e7def33	Fix context in Edipage and children	2019-10-03 12:58:20 +02:00
soupette	743545606b	Remove useless lifecycle in App and update its suffixURL	2019-10-03 11:54:23 +02:00
soupette	590ef49ec1	Fix HomePage contexts and update context api	2019-10-03 11:48:24 +02:00
soupette	5c42e43d4f	Merge branch 'develop' of github.com:strapi/strapi into styled-component/ctb	2019-10-03 11:09:48 +02:00
Alexandre Bodin	dbd621e6d8	v3.0.0-beta.16.7	2019-10-01 12:15:48 +02:00
soupette	6f8b23d254	Fix conflicts	2019-09-27 16:26:09 +02:00
Alexandre Bodin	6305bee43b	v3.0.0-beta.16.6	2019-09-26 14:35:06 +02:00
Jim LAURIE	8ebd7cc548	Fix conflict	2019-09-24 18:01:59 +02:00
Alexandre BODIN	b3648ba4d9	Merge branch 'master' into chore/routing-x-forwarded	2019-09-24 10:04:19 +02:00
Jim LAURIE	088653a9b9	Review the auth email template doc	2019-09-23 16:59:20 +02:00
Alexandre BODIN	d5700feefb	Merge branch 'master' into patch-1	2019-09-20 09:37:36 +02:00
Virginie Ky	2c67635b38	InputSearch as a func component	2019-09-19 16:37:26 +02:00
Virginie Ky	0f26597a92	InputSearch func component	2019-09-19 14:49:18 +02:00
Virginie Ky	1a1809006b	Search refacto ip	2019-09-19 10:13:03 +02:00
Virginie Ky	c06b0d9031	components refacto ip	2019-09-18 17:39:54 +02:00
Alexandre Bodin	bf7870de3b	Merge branch 'master' of github.com:strapi/strapi into chore/routing-x-forwarded	2019-09-18 17:29:09 +02:00
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	7a94d9dad9	Merge branch 'master' into chore/routing-x-forwarded	2019-09-18 13:27:39 +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
Virginie Ky	b5a18e27bc	EditForm refacto	2019-09-17 18:48:28 +02:00
Virginie Ky	28426555b6	users permissions plugin refacto ip	2019-09-17 17:36:03 +02:00
Virginie Ky	88a11cef3c	node-sass removed	2019-09-17 16:20:45 +02:00
Virginie Ky	a6b57689fb	styled components migration	2019-09-17 15:24:22 +02:00
Alexandre Bodin	df236d0642	v3.0.0-beta.16.4	2019-09-17 12:14:39 +02:00
Virginie Ky	4f45134dd1	Users permissions styled compo ip	2019-09-16 19:18:35 +02:00
Alexandre BODIN	c66eb5d2cf	Merge branch 'master' into chore/routing-x-forwarded	2019-09-13 17:40:50 +02:00
Virginie Ky	39230ed2ac	Remove node-sass ip	2019-09-13 15:17:24 +02:00
Alexandre Bodin	36e4e73ad3	v3.0.0-beta.16.3	2019-09-13 15:08:44 +02:00
Alexandre Bodin	6ec284180a	sanitize user model data	2019-09-12 10:50:52 +02:00
Alexandre Bodin	e20d781383	Merge branch 'master' into chore/routing-x-forwarded	2019-09-12 09:59:11 +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
Alexandre Bodin	2530606e47	Merge branch 'master' into chore/routing-x-forwarded	2019-09-09 14:29:07 +02:00
soupette	1cd7084a94	Move auth views to the admin	2019-09-09 13:58:07 +02:00