87 Commits

Author	SHA1	Message	Date
Jim LAURIE	950122dbdb	Merge branch 'master' into poly-cm	2018-04-12 17:58:51 +02:00
Jim LAURIE	6e843dad3e	Merge branch 'master' into wysiwyg-preview-fullscreen	2018-04-12 15:02:13 +02:00
Jim LAURIE	80922afd79	Merge branch 'master' into ISSUE-825	2018-04-11 18:52:27 +02:00
Adrien Lepoutre	2496611fca	Code cleaning	2018-04-11 10:09:53 -04:00
Jim Laurie	bdd1583543	Handle polymorphic in admin ... Only for collection: * poly side	2018-04-10 14:46:36 +02:00
soupette	ff4253aeea	Fix conflict and fix focus bug in WYSIWYG	2018-04-04 17:51:41 +02:00
Jim Laurie	43d6a9af9c	Hotfix params bookshelf filters again :/	2018-04-03 18:12:20 +02:00
Jim Laurie	cd8fd85f12	Hotfix params bookshelf filters	2018-04-03 17:04:10 +02:00
Jim Laurie	5948e9fa5c	Update content manager filter	2018-04-03 13:03:41 +02:00
Adrien Lepoutre	0b0ea75402	ISSUE 825 - Losing OneToOne relation in the content manager - Fixes #825	2018-04-02 17:50:03 -04:00
cyril lopez	f0298b1566	Remove old layout	2018-03-20 16:20:50 +01:00
cyril lopez	63575565b1	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-15 22:20:54 +01:00
Jim LAURIE	a97e96c240	Merge branch 'master' into fix/mask	2018-03-15 16:21:05 +01:00
Aurelsicoko	684a70c665	Fix dominant true when updating relationship	2018-03-15 12:56:21 +01:00
Jim Laurie	54af44901b	Remove useless clone object	2018-03-15 12:01:10 +01:00
Jim Laurie	2f4635bf4c	Fix PR feedback	2018-03-15 11:51:40 +01:00
Jim Laurie	b4be337249	Route to get layout to apply	2018-03-14 10:22:15 +01:00
Jim Laurie	3c1ec20155	Fix form data update user	2018-03-13 15:57:41 +01:00
cyril lopez	82b779aa6f	Fix conflict and start fixineg eslint on helper plugin	2018-03-09 16:41:24 +01:00
Aurelsicoko	df4f02c303	Lower ref parameter to retrieve globalId	2018-03-07 14:59:41 +01:00
Aurelsicoko	7dfc184a2e	Don't loose oneToManyMorph relationship on update	2018-03-05 15:04:10 +01:00
cyril lopez	3e468a1b9c	Wysiwyg is coming	2018-03-05 14:30:28 +01:00
Aurelsicoko	933254f1d1	Replace null by empty array on single file field	2018-03-02 17:00:00 +01:00
Aurelsicoko	2bdf226490	Add/remove one file in Content Manager for Bookshelf	2018-03-02 16:31:32 +01:00
Aurelsicoko	1490e06003	Remove useless association login in create method for Mongoose	2018-03-02 12:32:35 +01:00
Aurelsicoko	2d5f607052	Add/remove single file from Content Manager	2018-03-02 12:01:18 +01:00
Aurelsicoko	234d913c1b	Add/remove images file Content Manager for SQL databases	2018-03-01 17:39:31 +01:00
Aurelsicoko	cde39a8609	Add/remove file from Content-Manager & move logic into the Upload plugin	2018-02-28 15:49:28 +01:00
Aurelsicoko	19b1574f00	Start to handle polymorphic association update in Content Manager (mongoose only)	2018-02-28 12:33:32 +01:00
Aurelsicoko	cfef18ea6b	Remove relationship where a file is removed	2018-02-27 18:57:28 +01:00
Aurelsicoko	dac8931676	Handle association on upload route	2018-02-27 16:53:06 +01:00
Aurelsicoko	ab108a6f93	Create & handle association between File upload and others models	2018-02-27 11:52:18 +01:00
Aurelsicoko	8a66873405	Display better error message & lock fields	2018-01-25 18:12:29 +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	10db375825	Fix #379 - Support one-way relationship	2018-01-08 12:10:48 +01:00
Aurelsicoko	cbd1da155b	Fix many-to-one association with Bookshelf	2017-12-13 15:30:03 +01:00
Aurelsicoko	1127ab1c85	Fix one-to-one during first creation with Bookshelf	2017-12-13 12:14:15 +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	8db92c22fd	Split Content-Manager logic into service & allow CRUD and associations w/ plugin's models w/ Mongoose	2017-12-11 18:23:15 +01:00
Jim Laurie	8ed108c012	Add filter fetch content type builder queries	2017-12-07 15:44:20 +01:00
Jim Laurie	3f15a5b618	Fix bookshelf fetch for auth	2017-12-07 14:56:25 +01:00
cyril lopez	a2ebbfab9e	Handle any api errors in ctm	2017-12-06 15:58:20 +01:00
Aurelsicoko	d620a0745d	Remove routing policy from /models route	2017-11-29 16:13:27 +01:00
Aurelsicoko	191092fca9	Redirect CM action to plugin's controller for User plugin	2017-11-29 16:10:13 +01:00
Aurelsicoko	c971f9c054	Allow redirect action in CM & harmonize pre/post event with Promises	2017-11-29 15:00:50 +01:00
Aurelsicoko	3cf999c8a6	Add layout user and apply design change	2017-11-28 16:20:39 +01:00
Aurelsicoko	b63cd80a13	Add type email & password, and fix layout system	2017-11-28 16:01:50 +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