1275 Commits

Author	SHA1	Message	Date
NerdyLuffy	31ad1bca1b	Added Validation on the email address	2019-11-03 10:41:21 +11:00
Alexandre Bodin	7a61db7285	v3.0.0-beta.17.4	2019-10-23 15:11:30 +02:00
Alexandre Bodin	9280cf9cd7	Merge branch 'master' into develop	2019-10-22 11:15:09 +02:00
Alexandre Bodin	3ddd383c30	v3.0.0-beta.17.3	2019-10-22 11:05:52 +02:00
soupette	6a852ad6cb	Fix conflicts	2019-10-18 15:51:44 +02:00
Alexandre Bodin	b6feabf689	v3.0.0-beta.17.2	2019-10-18 13:42:22 +02:00
Jonathan Tey	b35409cf5e	Fix spelling Eamil -> Email	2019-10-17 18:01:09 +08:00
Alexandre Bodin	f0ad2ab52c	Merge branch 'master' into develop	2019-10-16 14:16:52 +02:00
Alexandre Bodin	9f0713649b	v3.0.0-beta.17.1	2019-10-16 11:42:54 +02:00
Alexandre Bodin	7c8eda443e	v3.0.0-beta.17	2019-10-16 10:40:18 +02:00
Alexandre Bodin	866a612d41	Merge branch 'master' into develop	2019-10-15 17:48:45 +02:00
KalanyuZ	edbff44c82	Add GraphQL register/login (#3879) ... * Add GraphQL login * Add GraphQL register * Add graphql login/register/delete End2End test * Update from requests * Remove logging * Update to beta.16 * Update * Add error handling * Util function * Update	2019-10-15 17:17:54 +02:00
soupette	774702af59	Fix conflicts	2019-10-15 14:09:11 +02:00
Alexandre BODIN	c69e3fd042	Merge branch 'master' into fix/forgot-password-url	2019-10-15 12:17:00 +02:00
Jim LAURIE	bd323c7cae	Fix typo	2019-10-15 12:03:03 +02:00
Jim LAURIE	5ddb32222b	Apply PR feedback	2019-10-15 11:56:13 +02:00
cyril lopez	d1e1c404e3	Merge branch 'develop' into update/plugin-generators	2019-10-15 07:42:04 +02:00
soupette	6ea77b69e5	Merge branch 'master' of github.com:strapi/strapi into develop	2019-10-15 07:40:55 +02:00
Alexandre BODIN	656343d059	Disable reload on jwt.json creation (#4246)	2019-10-14 10:49:19 +02:00
Virginie Ky	c53f3672b1	merge	2019-10-11 15:16:51 +02:00
Virginie Ky	5b32e32758	Some UI fixes	2019-10-11 14:59:41 +02:00
soupette	f09422d524	Merge branch 'master' of github.com:strapi/strapi into develop	2019-10-11 13:03:14 +02:00
cyril lopez	d1a6da5710	Merge branch 'master' into de-fix-and-removed-spaces	2019-10-10 08:33:46 +02:00
soupette	beef6e5510	Fix conflicts	2019-10-10 06:34:31 +02:00
Jim LAURIE	9b49bee4b4	Fix #549 forgot password url	2019-10-09 17:37:16 +02:00
soupette	a288198306	Merge branch 'styled-component/ctb' of github.com:strapi/strapi into styled-component/ctb	2019-10-08 12:34:48 +02:00
soupette	e4f9f808e4	Update modals	2019-10-08 11:23:35 +02:00
Virginie Ky	22b8ab0bff	Users permissions search list overflow	2019-10-08 10:38:08 +02:00
Virginie Ky	ee65a6a05a	users permissions plugins responsive UI	2019-10-08 10:21:27 +02:00
Virginie Ky	6cae06b63c	Users permissions edit page responsive ip	2019-10-08 09:50:15 +02:00
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