3689 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	a1fa931d1c	Merge pull request #813 from strapi/design/logout-next ... Update index.js	2018-03-20 11:47:48 +01:00
Aurélien GEORGET	17ef1682b1	Update index.js	2018-03-19 19:12:54 +01:00
Aurélien GEORGET	ca6077f9c9	Update styles.scss	2018-03-19 19:12:07 +01:00
Jim LAURIE	58ff40a432	Merge pull request #809 from strapi/fix/update-email ... Update User.js	2018-03-19 18:35:41 +01:00
Jim LAURIE	2f182732dc	Merge branch 'master' into fix/update-email	2018-03-19 18:21:19 +01:00
Jim LAURIE	4d5e02cd8b	Merge pull request #811 from strapi/ga-admin ... Add ga in admin to improve Strapi	2018-03-19 18:20:57 +01:00
Jim LAURIE	46bcadaae5	Fix PR feedback	2018-03-19 18:00:04 +01:00
Jim LAURIE	792b909b85	Merge branch 'master' into ga-admin	2018-03-19 17:48:31 +01:00
Jim Laurie	9017c0d1d0	Add ga in admin to improve Strapi	2018-03-19 17:45:33 +01:00
Aurélien GEORGET	11c68bebf2	Update User.js	2018-03-19 17:31:04 +01:00
Adrien Lepoutre	d8281d7036	Add lodash to package.json to avoid version problem	2018-03-19 12:27:01 -04:00
Jim LAURIE	5d82812355	Merge pull request #789 from strapi/migration-10-to-11 ... Add migration guide alpha 10 to 11	2018-03-19 14:44:19 +01:00
Jim LAURIE	615e8e5e09	Merge branch 'master' into migration-10-to-11	2018-03-19 14:25:57 +01:00
Jim LAURIE	75fb9d1f60	Merge pull request #807 from strapi/design/auth-form ... Update styles.scss	2018-03-19 14:25:47 +01:00
Aurélien GEORGET	c7fdd84340	Update styles.scss	2018-03-19 14:07:02 +01:00
Jim LAURIE	54d5104f30	Merge pull request #805 from strapi/prevent-ctb-from-breaking-unknown-attr ... Prevent the ctb from breaking	2018-03-19 13:06:29 +01:00
cyril lopez	c6b24f046b	Prevent the ctb from breaking if a user tries to edit an attribute that it cannot currently handle	2018-03-19 12:49:25 +01:00
Jim LAURIE	d78c0a0200	Merge pull request #792 from johannpinson/patch-1 ... Update model.template for generate api	2018-03-19 12:22:34 +01:00
Jim LAURIE	164a29a6b6	Fix PR feedback	2018-03-19 12:14:25 +01:00
Jim LAURIE	2ba257ce1c	Merge branch 'master' into patch-1	2018-03-19 12:08:05 +01:00
Jim LAURIE	25b85830b5	Merge pull request #796 from abdonrd/array ... Allow Array type in the backend	2018-03-19 10:33:50 +01:00
Jim LAURIE	3d2f611af2	Merge branch 'master' into array	2018-03-19 10:15:14 +01:00
Jim LAURIE	38f2986c3c	Merge pull request #801 from abdonrd/paths ... Fix spaces path issues on npm run build --plugins	2018-03-19 10:14:23 +01:00
Abdón Rodríguez Davila	1e7682eddd	Fix spaces path issues on databases	2018-03-18 13:29:49 +01:00
Abdón Rodríguez Davila	1dd36a5eb6	Fix spaces path issues on npm run build --plugins	2018-03-18 13:11:11 +01:00
Abdón Rodríguez Davila	3cd5cff861	Add Array type	2018-03-17 16:43:25 +00:00
Abdón Rodríguez Davila	a186ac3d3b	Sort types alphabetically	2018-03-17 16:42:28 +00:00
Jim LAURIE	4fb877d9c2	Merge pull request #790 from strapi/fix/mask ... Fix/mask	2018-03-16 17:21:48 +01:00
Jim LAURIE	ee968ad2d0	Merge branch 'master' into fix/mask	2018-03-16 16:10:33 +01:00
Johann Pinson	9d6d2c0b9f	Update model.template for mongoose	2018-03-16 16:01:27 +01:00
Johann Pinson	49536526f8	Update model.template for bookshelf	2018-03-16 16:00:14 +01:00
Johann Pinson	4ed7ad2064	Update models.md	2018-03-16 15:54:53 +01:00
Aurelsicoko	7148eafd2a	Improve request	2018-03-16 12:20:58 +01:00
Jim Laurie	c9b736543a	Add migration guide alpha 10 to 11	2018-03-16 12:18:11 +01:00
Aurelsicoko	7760ae54cc	Improve errors handling	2018-03-16 11:42:17 +01:00
Jim LAURIE	90e1c6dafe	Merge pull request #781 from strapi/fix/mask ... Fix dominant true when updating relationship	2018-03-15 16:39:37 +01:00
Jim LAURIE	a97e96c240	Merge branch 'master' into fix/mask	2018-03-15 16:21:05 +01:00
Aurelsicoko	684a70c665	Fix dominant true when updating relationship	2018-03-15 12:56:21 +01:00
Jim LAURIE	358b24f111	Merge pull request #776 from strapi/fix-users ... Fix edit user	2018-03-15 12:36:48 +01:00
Jim LAURIE	e0501b5adf	Merge branch 'master' into fix-users	2018-03-15 12:02:25 +01:00
Jim Laurie	54af44901b	Remove useless clone object	2018-03-15 12:01:10 +01:00
Jim Laurie	2f4635bf4c	Fix PR feedback	2018-03-15 11:51:40 +01:00
Jim LAURIE	bbf2c5f0cd	Merge pull request #773 from strapi/role-registered ... Role registered	2018-03-14 17:38:59 +01:00
Jim LAURIE	19fdb4d279	Merge branch 'master' into role-registered	2018-03-14 17:13:57 +01:00
Jim Laurie	489aefba06	Rename role registered to authenticated	2018-03-14 16:56:12 +01:00
Jim LAURIE	75cee0b3b7	Merge pull request #777 from strapi/enhance/register ... Enhance/register	2018-03-14 16:27:37 +01:00
Jim LAURIE	31ee1583b4	Merge branch 'master' into enhance/register	2018-03-14 16:12:23 +01:00
Aurelsicoko	94dc9305b1	Update URL	2018-03-14 16:08:33 +01:00
Aurelsicoko	d59025de06	Replace usage URLs	2018-03-14 15:58:12 +01:00
Aurelsicoko	d89888bb47	Add keep me updated checkbox on register	2018-03-14 13:18:05 +01:00