166 Commits

Author	SHA1	Message	Date
Luca Perret	3eb09a54d5	use tmp path for temporal connectivity check	2018-02-12 19:14:36 +01:00
Pierre BURGY	b67c5e34a8	Merge branch 'master' into enhancement/database-uri	2018-02-07 15:00:37 +01:00
Pierre Burgy	7f6e5ba5a8	3.0.0-alpha.9.3	2018-02-07 14:22:27 +01:00
Aurelsicoko	e8e6b91e4f	Remove user key from generated databases.json file	2018-02-06 16:00:04 +01:00
Jim LAURIE	dcb2839260	Merge branch 'master' into fix-update-user	2018-02-05 17:09:26 +01:00
Jim Laurie	1f3efc6416	3.0.0-alpha.9.2	2018-02-05 16:36:33 +01:00
Jim LAURIE	4e2f844cc9	Merge branch 'master' into alpha.9.1	2018-02-01 12:22:26 +01:00
Jim Laurie	f9a818e49c	3.0.0-alpha.9.1	2018-02-01 11:08:15 +01:00
Amit Yadav	7aa83dd897	Merge branch 'master' into hot_fix_-467	2018-01-31 19:25:08 +05:30
Amit Yadav	aabecd2fec	Removed async/await as it had to impact	2018-01-31 19:22:52 +05:30
Jim Laurie	8825f2fe2c	3.0.0-alpha.9	2018-01-29 17:24:10 +01:00
Amit Yadav	1edb583176	Merge branch 'master' into hot_fix_-467	2018-01-24 20:16:41 +05:30
Amit Yadav	bae0159208	Fixes strapi#467	2018-01-24 20:15:11 +05:30
Aurelsicoko	ed696f70a0	Refetch roles after delete	2018-01-24 13:51:22 +01:00
Aurelsicoko	cf1cb7050b	Resolve conflicts and disallow to edit and remove default roles	2018-01-24 11:52:09 +01:00
Aurelsicoko	8f85d85349	Improve roles in database to work with Bookshelf	2018-01-23 18:54:17 +01:00
Aurelsicoko	187f6cb748	Display logs for every missing tables or attributes & update delete/add role feature	2018-01-23 15:38:43 +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
Amit Yadav	5d9a49256a	Fixes https://github.com/strapi/strapi/issues/467	2018-01-18 23:34:20 +05:30
Jim Laurie	03643bfb13	3.0.0-alpha.8	2018-01-17 16:59:28 +01:00
Jim Laurie	7a4cb0e507	Fix data path in connectivity functions	2018-01-17 09:14:34 +01:00
FixError	c5bb2da0a4	fix bug ... (const variable is assigned it cannot be assigned again and an attempt to do so will throw an error)	2018-01-12 00:58:34 +02:00
Jim Laurie	99346d41fc	Use Path resolver for connectivity script	2018-01-11 13:22:49 +01:00
Jim Laurie	df5b9f3dab	Change wording	2018-01-10 18:08:43 +01:00
Jim Laurie	e1fb02ab53	Test connection in connector node module	2018-01-10 15:31:54 +01:00
Jim Laurie	cc4973b65b	3.0.0-alpha.7.3	2018-01-05 12:10:41 +01:00
Aurelsicoko	dafec67234	Merge branch 'master' of github.com:strapi/strapi into relation/users	2018-01-04 11:25:27 +01:00
Aurelsicoko	ca7f12e985	Improve documentation for sorting filters	2017-12-20 16:06:02 +01:00
cyril lopez	bc25ca3870	Fix typo	2017-12-18 15:18:03 +01:00
Aurelsicoko	b208b0aa92	Change table naming for plugins	2017-12-18 14:07:35 +01:00
Aurelsicoko	92c891e341	Improve error when association fail and handle configurable key in models	2017-12-16 18:26:04 +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	c7ef225238	Replace id to _id for fetch user mongoose	2017-12-14 15:14:53 +01:00
Jim Laurie	1ab6ae71d8	3.0.0-alpha.7.1	2017-12-14 10:27:08 +01:00
Aurelsicoko	859e2985c8	Fix many-to-many association with Bookshelf	2017-12-13 16:28:50 +01:00
Aurelsicoko	cbd1da155b	Fix many-to-one association with Bookshelf	2017-12-13 15:30:03 +01:00
Aurelsicoko	74e1f0529d	Fix specific case in one-to-one relation	2017-12-13 14:36:07 +01:00
Aurelsicoko	b08a4d811c	Use local global to expose model for Bookshelf & move globalId definition in the core	2017-12-13 11:38:38 +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	95607dc7ed	Load bookshelf plugin model if not apis	2017-11-30 13:57:47 +01:00
cyril lopez	b4a6336f14	Fix typo in request helper	2017-11-29 15:55:32 +01:00
cyril lopez	7afb425688	Fix query bookshelf and modify init role file	2017-11-29 15:42:11 +01:00
Jim Laurie	baa2f92040	Mount plugin models for bookshelf	2017-11-28 15:00:49 +01:00
Jim Laurie	aecbbcf3ba	Handle default connection for mongoose	2017-11-28 14:28:30 +01:00