68 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	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	b670050e59	Don't set schema on MySQL connection	2017-10-23 10:51:32 +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
Aurelsicoko	b3dca34d8e	Update ROADMAP	2017-10-12 14:29:43 +02:00
Pierre Burgy	8a724637a3	Fix conflicts	2017-10-10 12:49:34 +02:00
Jim Laurie	b58d11d18a	Fix retours PR	2017-09-29 17:06:01 +02:00
Jim Laurie	5b575ffac5	Remove knex client dependencies	2017-09-29 15:43:56 +02:00
Jim Laurie	7bd5f1021e	Fix conflicts	2017-09-28 13:18:36 +02:00
Jim Laurie	c2d35be9b5	Fix conflicts	2017-09-27 13:56:10 +02:00
Jim Laurie	82d62f04f3	Disable security middlewares for admin/plugins	2017-09-27 13:42:34 +02:00
Aurelsicoko	51d936b559	Resolve conflicts	2017-09-25 18:28:45 +02:00
Jim Laurie	81c3169425	Fix bookshelf dependencies	2017-09-25 17:12:04 +02:00
Aurelsicoko	eef2d3d96e	Handle relationships edition for Bookshelf	2017-09-14 18:47:10 +02:00
Aurelsicoko	4e089f7909	Solve issues to be able to use bookshelf correctly	2017-09-14 16:33:56 +02:00
Jim Laurie	4a18fe6b13	Add bookshelf filters	2017-09-13 12:18:54 +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	e91a6a9012	3.0.0-alpha.5	2017-08-23 19:04:11 +02:00
cyril lopez	7532670f93	Created empty view for homepage	2017-08-16 18:47:02 +02:00
Pierre Burgy	9defae7162	Add package-lock.json in gitignore files	2017-08-11 09:58:00 +02:00
aurelsicoko	8e55bd14a2	Move dictionary and update dependencies	2017-07-31 12:08:02 +02:00
aurelsicoko	202cf6f5a8	Resolve conflicts	2017-07-28 18:56:28 +02:00
aurelsicoko	bca6ead5cf	Harmonize configurations between adapters	2017-07-27 16:40:39 +02:00
aurelsicoko	401d618a07	Take care of new configurations files	2017-07-26 18:53:48 +02:00
aurelsicoko	225eee077a	Resolve startup issue	2017-07-25 17:12:18 +02:00
aurelsicoko	4f7efef381	Update core architecture	2017-07-24 19:58:03 +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	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	ef7ad188f2	Add port setting for knex	2017-03-15 16:45:53 +01:00
Aurélien Georget	488343374b	Fix crash where connections exist but there is no models	2017-02-01 14:48:30 +01:00
Aurélien Georget	90ded9977f	Allow custom columnName on one-to-many associations	2017-01-24 12:09:01 +01:00