154 Commits

Author	SHA1	Message	Date
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	8b8115bac1	Merge branch 'alpha.7' of https://github.com/strapi/strapi into alpha.7	2017-11-03 12:13:20 +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
Jim Laurie	084cb3c49e	Fix PR feedback	2017-11-01 15:16:28 +01:00
Jim Laurie	ceff284fb6	Fix update one to one mongoose relation	2017-10-30 17:59:53 +01:00
Jim Laurie	e038a238e7	Handle template on create API content type builder	2017-10-30 14:40:46 +01:00
Jim Laurie	0a7b65be04	Remove relation on delete data bookshelf	2017-10-30 14:02:54 +01:00
Jim Laurie	9105477500	Handle oneToOne mongoose relation	2017-10-25 17:38:48 +02:00
Jim Laurie	33736f6ea1	Handle object relations mongoose	2017-10-25 16:39:28 +02:00
Jim Laurie	3d9a509789	Handle relation by id mongoose	2017-10-25 16:24:35 +02:00
Aurelsicoko	90e2993e0d	Fix Content-Manager relations management	2017-10-23 17:07:57 +02:00
Aurelsicoko	b0d2a3c838	3.0.0-alpha.6.4	2017-10-23 12:24:44 +02:00
Jim Laurie	2c06c48400	Lyfe cycle fix #287	2017-10-23 11:01:58 +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	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
Aurélien GEORGET	a4ce1232d3	Merge pull request #271 from strapi/improvements/filters ... API filters	2017-10-12 10:40:28 +02:00
Aurelsicoko	6a9fb28e51	Create multiple Mongoose instance for each connection	2017-10-10 15:23:49 +02:00
Jim Laurie	7bd5f1021e	Fix conflicts	2017-09-28 13:18:36 +02:00
Aurelsicoko	62f96e5c07	Use one webpack server to serve admin in development mode	2017-09-26 16:36:28 +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
Aurelsicoko	019690d6d6	Improve notification behaviour and solve issue with no relationships	2017-09-19 13:40:26 +02:00
Aurelsicoko	d8b14f6b67	Fix spread issue	2017-09-18 18:20:33 +02:00
Aurelsicoko	1cd0be2f52	Split code by adapters with regression on Bookshelf (WIP)	2017-09-15 18:29:50 +02:00
cyril lopez	5ec6818a4c	Fix	2017-09-14 19:31:07 +02:00
Aurelsicoko	eef2d3d96e	Handle relationships edition for Bookshelf	2017-09-14 18:47:10 +02:00
cyril lopez	7c6a3f4687	Fix conflict	2017-09-14 15:10:08 +02:00
Aurelsicoko	ad856bea8d	Fix links menu	2017-09-14 12:19:24 +02:00
Jim Laurie	4a18fe6b13	Add bookshelf filters	2017-09-13 12:18:54 +02:00
Jim Laurie	be66effbc0	Add filter for mongoose	2017-09-12 17:58:31 +02:00
Aurelsicoko	122c536cbf	Handle many to many relationships with Mongoose	2017-09-12 14:31:39 +02:00
Pierre Burgy	83e6a6bcc4	Merge	2017-09-08 13:46:50 +02:00
Aurelsicoko	437d1e8b22	Handle relation display and update in most of cases	2017-09-07 17:16:31 +02:00
Aurelsicoko	7ee1d90cb7	Migrate plugin to new react-router	2017-08-29 17:32:48 +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	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
Aurelsicoko	e027bf9f7e	Display understable error on Mongo connection failed	2017-08-17 18:25:52 +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