1304 Commits

Author	SHA1	Message	Date
Jim Laurie	f613c2eb48	Fix send env to get datebase model default connection	2017-08-03 14:55:42 +02:00
Jim Laurie	61706278a0	Fix languages after pull alpha5	2017-08-03 14:06:59 +02:00
Pierre Burgy	cd8ed4db30	Merge branch 'alpha.5' of https://github.com/strapi/strapi into plugin/content-manager	2017-08-02 14:02:51 +02:00
Jim Laurie	16a3984e63	Update config models	2017-08-02 13:17:40 +02:00
Jim Laurie	996decce0a	Fix load settings manager	2017-08-02 11:26:47 +02:00
Jim Laurie	c3f561fded	Fix conflict alpha5	2017-08-02 11:25:18 +02:00
Jim Laurie	d73947ba69	Fix API PR	2017-08-01 18:23:19 +02:00
cyril lopez	14933b38b9	Remove styles const from EditFormSection	2017-08-01 17:00:37 +02:00
cyril lopez	e8a0b1e686	Use this for inputs const in WithformSection	2017-08-01 15:45:09 +02:00
Pierre Burgy	08d68eacc9	Base store name on container name	2017-08-01 00:16:00 +02:00
Pierre Burgy	6e755d41ba	Use plugin name in constants generator	2017-07-31 23:53:20 +02:00
Pierre Burgy	25119b0c12	Merge branch 'alpha.5' of https://github.com/strapi/strapi into improvement/update-bootstrap	2017-07-31 17:44:34 +02:00
Pierre Burgy	f9e686c994	Use Bootstrap alpha.6	2017-07-31 14:33:21 +02:00
aurelsicoko	4576b85dde	Resolve conflicts in bookshelf connector	2017-07-29 13:53:28 +02:00
aurelsicoko	202cf6f5a8	Resolve conflicts	2017-07-28 18:56:28 +02:00
Jim Laurie	c9f8a64c35	Review auto-reload with cluster and fs watch	2017-07-28 16:14:50 +02:00
Pierre Burgy	8c5431d5ed	Add settings manager in tests	2017-07-24 22:45:12 +02:00
Pierre Burgy	dee5cfe80a	Rename settings manager folder	2017-07-24 22:40:47 +02:00
Pierre Burgy	2fa44662ff	Update settings-manager scripts	2017-07-24 22:35:30 +02:00
Pierre Burgy	3acbc88747	Merge branch 'plugin/content-manager' of https://github.com/strapi/strapi into plugin/settings-manager	2017-07-24 21:17:56 +02:00
Pierre Burgy	d48d2ddccf	Add postinstall script	2017-07-24 21:14:07 +02:00
aurelsicoko	4f7efef381	Update core architecture	2017-07-24 19:58:03 +02:00
Jim Laurie	219e96a4d9	Fix conflicts 4.8	2017-07-24 16:24:38 +02:00
Jim Laurie	c7a22fd83f	Fix conflicts 4.8	2017-07-24 16:22:44 +02:00
Jim Laurie	46ea35630f	Fix conflict	2017-07-24 16:04:53 +02:00
Jim Laurie	51fb73c7a2	Fix conflict	2017-07-24 16:02:14 +02:00
Pierre Burgy	097920d941	Admin improvements	2017-07-21 18:15:43 +02:00
Pierre Burgy	81ada393b8	Merge branch 'master' of https://github.com/strapi/strapi into plugin/content-manager	2017-07-21 17:25:08 +02:00
Pierre Burgy	e860a1d172	Fix plugins setup	2017-07-21 17:18:47 +02:00
aurelsicoko	5b8230c93d	alpha.4.8	2017-07-21 15:57:42 +02:00
cyril lopez	a79af33b42	added reactstrap	2017-07-21 12:03:41 +02:00
aurelsicoko	c81c865b79	3.0.0-alpha.4.3	2017-07-20 15:56:54 +02:00
aurelsicoko	bec935a8be	Prepare for release	2017-07-19 17:37:38 +02:00
aurelsicoko	125a7a7d1b	Don't install useless packages for setup	2017-07-19 17:03:03 +02:00
Pierre Burgy	419afce707	Lock dependencies	2017-07-18 18:25:59 +02:00
aurelsicoko	e924ca1328	Resolve Travis CI	2017-07-18 17:50:09 +02:00
aurelsicoko	8c521da029	Fix Travis CI	2017-07-17 17:25:35 +02:00
aurelsicoko	2fec55affd	Update package.json	2017-07-17 17:21:07 +02:00
aurelsicoko	a8732565c9	Remove file dependencies before commit	2017-07-17 17:19:35 +02:00
aurelsicoko	0f9c16940a	Resolve alpha.4 setup workflow	2017-07-17 16:48:09 +02:00
aurelsicoko	bbafdf143c	Node 8 compatible and resolve setup	2017-07-17 11:19:28 +02:00
Pierre Burgy	adc2726a09	Style admin left menu	2017-07-07 18:19:12 +02:00
Pierre Burgy	eba510050b	Change left menu header style	2017-07-07 15:31:40 +02:00
Pierre Burgy	5ce6292256	Translate content manager in french	2017-06-20 23:06:41 +02:00
Pierre Burgy	24484cf364	Remove overflow hidden in admin panel body	2017-06-20 19:03:28 +02:00
Pierre Burgy	378d8e433c	Fix conflicts	2017-06-17 10:27:20 +02:00
Aurélien Georget	3e57474f03	Lock dependencies and fix start up	2017-06-15 15:35:04 +02:00
Aurélien Georget	ea242b12e9	Lock dependencies and fix start up	2017-06-15 13:33:14 +02:00
Pierre Burgy	11dd58de09	Improve plugin generator	2017-06-08 17:16:20 +01:00
Pierre Burgy	3cbb83d40d	Use admin instead of public folder for plugins	2017-05-17 16:06:06 +02:00