135 Commits

Author	SHA1	Message	Date
Jim Laurie	e9120866fe	Fix conflicts	2017-08-10 15:38:08 +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
Pierre Burgy	8c5431d5ed	Add settings manager in tests	2017-07-24 22:45:12 +02:00
Pierre Burgy	2fa44662ff	Update settings-manager scripts	2017-07-24 22:35:30 +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
aurelsicoko	5b8230c93d	alpha.4.8	2017-07-21 15:57:42 +02:00
aurelsicoko	c81c865b79	3.0.0-alpha.4.3	2017-07-20 15:56:54 +02:00
aurelsicoko	125a7a7d1b	Don't install useless packages for setup	2017-07-19 17:03:03 +02:00
aurelsicoko	e924ca1328	Resolve Travis CI	2017-07-18 17:50:09 +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
Aurélien Georget	8b1e6474b0	Add strapi-admin as a dependency	2017-06-15 17:18:25 +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	666553ea30	Separate strapi-generate-admin and strapi-admin packages	2017-05-11 17:30:00 +02:00
Pierre Burgy	1228cee998	Fix missing files admin issue	2017-03-15 11:48:56 +01:00
Aurélien Georget	c8acd6fcef	Disabled karma tests for dashboard	2017-03-09 16:22:09 +01:00
Aurélien Georget	77051bde19	Update dependencies and fix setup	2017-03-09 15:25:15 +01:00
Aurélien Georget	7085ba3c22	3.0.0-alpha.3	2017-01-23 10:49:29 +01:00
Aurélien Georget	d48a6811ce	Fix tests	2017-01-17 11:51:10 +01:00
Aurélien Georget	0e7422b1df	v3.0.0-alpha.2	2017-01-09 15:22:28 +01:00
Aurélien Georget	020375e93b	Update copyright	2017-01-09 13:45:44 +01:00
Aurélien Georget	5c24f33c28	Use ESLint instead of xo	2017-01-04 18:28:47 +01:00
Pierre Burgy	a9bae7cbaa	Remove admin home page text	2016-12-09 17:37:26 +01:00
Aurélien Georget	43830c9f69	Adding lerna	2016-12-07 18:24:48 +01:00
Aurélien Georget	6ce1bbe69c	v3.0.0-alpha.1	2016-12-05 19:55:06 +01:00
Aurélien Georget	7a5c4f0084	Use Chromium-browser for rendering front-end tests	2016-12-05 17:49:07 +01:00
Pierre Burgy	497b2278bc	Add welcome message in admin panel	2016-12-02 13:17:55 +01:00
Pierre Burgy	c8c031652b	Add a short development tutorial for the admin panel	2016-12-02 11:28:30 +01:00
Pierre Burgy	1d319dc612	Improve admin install scripts	2016-12-02 00:22:47 +01:00
Pierre Burgy	72e1d72420	Enable strapi-generate-admin generator	2016-12-01 16:44:03 +01:00