87 Commits

Author	SHA1	Message	Date
Pierre Burgy	7f6e5ba5a8	3.0.0-alpha.9.3	2018-02-07 14:22:27 +01:00
Jim Laurie	1f3efc6416	3.0.0-alpha.9.2	2018-02-05 16:36:33 +01:00
Jim Laurie	f9a818e49c	3.0.0-alpha.9.1	2018-02-01 11:08:15 +01:00
Jim Laurie	8825f2fe2c	3.0.0-alpha.9	2018-01-29 17:24:10 +01:00
Aurelsicoko	5b93cc5242	3.0.0-alpha.8.3	2018-01-19 16:49:57 +01:00
Jim Laurie	7b0a106cb2	3.0.0-alpha.8.2	2018-01-19 08:52:34 +01:00
Jim Laurie	03643bfb13	3.0.0-alpha.8	2018-01-17 16:59:28 +01:00
Jim Laurie	ff46faf306	Execute controller action out of authorization try	2018-01-09 13:53:52 +01:00
Aurélien GEORGET	8a1b95f2b5	Merge branch 'master' into enhancement/one-way	2018-01-08 12:12:01 +01:00
Aurelsicoko	10db375825	Fix #379 - Support one-way relationship	2018-01-08 12:10:48 +01:00
alex	ee5a72af89	SSL option for strapi-knex connections was appended. This is necessary for ssl-only remote DB services e.g. heroku-postgres	2018-01-07 05:25:00 +06:00
Jim Laurie	cc4973b65b	3.0.0-alpha.7.3	2018-01-05 12:10:41 +01:00
Aurelsicoko	6d8b81ecbd	Resolve conflicts	2017-12-16 17:08:58 +01:00
Aurelsicoko	0230184619	Apply same algorithm to clearRelation method	2017-12-15 18:04:56 +01:00
Aurelsicoko	492c688344	Remove unnecessary directory read when building relations	2017-12-15 16:36:21 +01:00
Jim Laurie	5b6127876d	3.0.0-alpha.7.2	2017-12-15 15:04:31 +01:00
Jim Laurie	1ab6ae71d8	3.0.0-alpha.7.1	2017-12-14 10:27:08 +01:00
Aurelsicoko	61d75648b0	Fix content-manager offset for SQL databases	2017-12-12 16:24:19 +01:00
Aurelsicoko	628ad4add4	Fix strapi-bookshelf to work w/ associations w/ plugins & JWT condition	2017-12-12 16:14:38 +01:00
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