73 Commits

Author	SHA1	Message	Date
Jim Laurie	6d39c26568	3.0.0-alpha.7	2017-12-11 15:11:29 +01:00
Jim Laurie	790cee753e	3.0.0-alpha.6.7	2017-11-08 15:46:28 +01:00
Jim Laurie	ef601d6e9a	3.0.0-alpha.6.6	2017-11-07 17:20:06 +01:00
Jim Laurie	30e39254a6	Change strapi version to alpha.6.5	2017-11-06 15:52:36 +01:00
Jim Laurie	c2925d98e8	Change gitignore for generated admin	2017-11-03 17:15:53 +01:00
Jim Laurie	77013bc4b2	Fix conflicts	2017-11-03 12:00:08 +01:00
Jim Laurie	6c376456fb	Fix conflicts	2017-11-03 11:51:55 +01:00
Aurelsicoko	b0d2a3c838	3.0.0-alpha.6.4	2017-10-23 12:24:44 +02:00
Aurelsicoko	3bb952d58f	Update dependencies	2017-10-18 18:39:32 +02:00
Aurelsicoko	9586a8cabc	3.0.0-alpha.6.3	2017-10-16 15:13:28 +02:00
Aurelsicoko	81763a3281	Fix issues for release	2017-10-16 15:09:43 +02:00
Aurelsicoko	b5955739da	3.0.0-alpha.6.2	2017-10-16 12:29:47 +02:00
Aurelsicoko	5d06875a20	3.0.0-alpha.6.1	2017-10-16 11:44:29 +02:00
Aurelsicoko	287b5e17f9	3.0.0-alpha.6	2017-10-16 11:07:41 +02:00
Aurelsicoko	1d6d91435e	Create development project based on symlinks and update default configs	2017-09-27 17:55:51 +02:00
cyril lopez	7b7725d4f4	Fix settings-manager plugin left menu active class	2017-09-26 10:01:55 +02:00
Aurelsicoko	51d936b559	Resolve conflicts	2017-09-25 18:28:45 +02:00
cyril lopez	a5bb67f723	Make checkbox label clickable	2017-09-21 14:21:18 +02:00
cyril lopez	d66a1f6dd6	Fix design, add dominant when relation many to many	2017-09-21 14:07:34 +02:00
cyril lopez	5ec6818a4c	Fix	2017-09-14 19:31:07 +02:00
cyril lopez	7c6a3f4687	Fix conflict	2017-09-14 15:10:08 +02:00
Pierre Burgy	34561edd93	Fix strapi-generate-admin	2017-09-08 17:14:11 +02:00
Pierre Burgy	cb9730283a	Merge alpha.5	2017-09-08 14:48:06 +02:00
Pierre Burgy	bb30674257	Run clean command	2017-09-08 14:18:46 +02:00
Pierre Burgy	83e6a6bcc4	Merge	2017-09-08 13:46:50 +02:00
Aurelsicoko	0affa346ce	3.0.0-alpha.5.5	2017-08-25 14:52:03 +02:00
Aurelsicoko	b64015f23a	3.0.0-alpha.5.4	2017-08-25 14:00:40 +02:00
Aurelsicoko	463345998c	3.0.0-alpha.5.3	2017-08-24 18:50:09 +02:00
Aurelsicoko	fb0296c912	3.0.0-alpha.5.1	2017-08-24 16:40:15 +02:00
Aurelsicoko	3c245ae81a	Run npm install in /admin after generation	2017-08-24 13:48:19 +02:00
Aurelsicoko	3aec65e332	Update generate admin path	2017-08-24 10:21:24 +02:00
Aurelsicoko	e91a6a9012	3.0.0-alpha.5	2017-08-23 19:04:11 +02:00
Pierre Burgy	9caf5b8203	Move admin files in strapi-admin folder	2017-08-22 18:29:02 +02:00
Pierre Burgy	780579df7b	Fix settings manager for new translation system	2017-08-17 11:07:52 +02:00
Pierre Burgy	40bb048072	Fix conflicts	2017-08-17 10:11:41 +02:00
cyril lopez	7532670f93	Created empty view for homepage	2017-08-16 18:47:02 +02:00
cyril lopez	23ab54b365	Created new app	2017-08-11 09:58:14 +02:00
Pierre Burgy	9defae7162	Add package-lock.json in gitignore files	2017-08-11 09:58:00 +02:00
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