306 Commits

Author	SHA1	Message	Date
Jim Laurie	832617159d	Fix auto set config if doent exist	2017-12-12 15:13:27 +01:00
Jim Laurie	6d39c26568	3.0.0-alpha.7	2017-12-11 15:11:29 +01:00
Jim Laurie	f404a96c5c	Fix conflicts	2017-12-11 13:51:16 +01:00
Aurelsicoko	88fb2ee89c	Fix default middleware configurations & allowed headers	2017-12-11 12:26:16 +01:00
Jim Laurie	519239c35c	Fix find one generated api mongoose	2017-12-11 12:18:14 +01:00
Jim Laurie	b4cae064d5	Fix conflict	2017-12-08 12:30:10 +01:00
Jim Laurie	f0393d37b6	Add documentation	2017-12-08 12:27:48 +01:00
cyril lopez	96506e5643	Fix middleware usp .policies of undefined	2017-12-08 11:21:51 +01:00
Jim Laurie	b7712cf512	Fix conflicts	2017-12-07 17:04:24 +01:00
cyril lopez	ce94f85a50	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-07 14:17:23 +01:00
cyril lopez	592a7cb58c	Fix request helper	2017-12-07 14:16:21 +01:00
Aurelsicoko	d20c349276	Optimize i18n functions	2017-12-07 14:05:10 +01:00
cyril lopez	9a2e051361	Fix input email error css	2017-12-06 16:21:12 +01:00
cyril lopez	ac102e88e5	Fix conflict	2017-12-06 15:15:43 +01:00
cyril lopez	59872ac890	Handle backend errors in ctm	2017-12-06 15:11:55 +01:00
Aurelsicoko	4444d806d6	Replace PNG logo to SVG & handle email/password type in Content Manager list	2017-12-06 13:44:58 +01:00
Jim Laurie	ce00536663	Fix conflict	2017-12-06 11:44:48 +01:00
Jim Laurie	d5d08e16f9	Identify admin by headers and send custom error response	2017-12-06 11:38:00 +01:00
Aurélien GEORGET	006d9f6f03	Merge pull request #360 from strapi/fix/refresh ... Fix/refresh	2017-12-05 16:56:41 +01:00
Aurelsicoko	b2204e533c	Resolve conflicts	2017-12-05 16:35:28 +01:00
cyril lopez	98c54e27f4	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-05 16:31:23 +01:00
cyril lopez	25b0c532cd	Remove useless comments and fix uninstall plugin	2017-12-05 16:29:46 +01:00
Aurelsicoko	c216771adb	Resolve conflicts	2017-12-05 15:30:16 +01:00
Aurelsicoko	110c209431	Be able to create an user from the Content Manager	2017-12-05 15:28:31 +01:00
cyril lopez	8920fda350	fix login bug	2017-12-05 15:16:33 +01:00
cyril lopez	87bbe8c210	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-05 14:52:59 +01:00
cyril lopez	563923bb36	Fix css	2017-12-05 14:44:32 +01:00
Aurelsicoko	87350ef2f1	Fix babel-polyfill dependencies and improve email appearance	2017-12-05 12:10:08 +01:00
cyril lopez	65264cf938	Fix design	2017-12-04 17:32:45 +01:00
Aurelsicoko	ef99f5095c	Build plugin email	2017-12-04 15:23:35 +01:00
Aurelsicoko	2b86bde1b4	Fix build due to layout	2017-12-04 14:29:16 +01:00
Aurelsicoko	b195ae0ef8	Merge branch 'alpha.7' of github.com:strapi/strapi into user-permissions	2017-12-04 11:43:53 +01:00
cyril lopez	8bec0273da	Fix InputSearch lib css	2017-12-02 13:54:36 +01:00
cyril lopez	046574fb45	Created InstallPluginPage container	2017-12-02 13:37:58 +01:00
cyril lopez	eed26aeef7	Prevent plugins to execute the bootstrap file (frontend) if the plugin users-permissions is in the project or if the user is not logged in	2017-12-01 15:45:11 +01:00
cyril lopez	a7b56b484f	Fix conflict	2017-11-29 19:00:51 +01:00
Aurelsicoko	1b4670b719	Make design sharp	2017-11-29 17:08:27 +01:00
cyril lopez	b4a6336f14	Fix typo in request helper	2017-11-29 15:55:32 +01:00
cyril lopez	47dccaa26b	Fix request helper	2017-11-29 12:48:58 +01:00
cyril lopez	f6d243a4df	Fix add header to request helper	2017-11-29 11:43:38 +01:00
cyril lopez	9df31150d2	Fix design	2017-11-29 10:29:12 +01:00
Aurelsicoko	3cf999c8a6	Add layout user and apply design change	2017-11-28 16:20:39 +01:00
Aurelsicoko	5d6f035384	Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-11-28 16:10:03 +01:00
Aurelsicoko	b63cd80a13	Add type email & password, and fix layout system	2017-11-28 16:01:50 +01:00
cyril lopez	2a27b915f8	Fix design	2017-11-28 15:04:02 +01:00
Aurelsicoko	362f7badb0	Add type password	2017-11-28 13:51:50 +01:00
Aurelsicoko	eceede450b	Handle plugin model in Content Manager	2017-11-27 17:27:16 +01:00
Aurelsicoko	70667e0cba	Fix setup	2017-11-27 11:04:30 +01:00
Aurelsicoko	ac2c2b55e9	Fix setup and apply design changes	2017-11-25 14:08:06 +01:00
Jim Laurie	f719d7f1fb	Fix conflict	2017-11-23 15:05:05 +01:00