1099 Commits

Author	SHA1	Message	Date
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	e1b727ee09	Write appearance in layout.json file	2018-03-14 16:24:11 +01:00
Jim Laurie	169c9742bb	Merge branch 'wysiwyg' of github.com:strapi/strapi into wysiwyg	2018-03-14 15:10:35 +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	1d0ef6062e	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-13 10:16:36 +01:00
cyril lopez	03195550aa	Fix edit user	2018-03-13 09:28:17 +01:00
cyril lopez	1187605c2a	Remove comments	2018-03-12 13:30:41 +01:00
cyril lopez	a474d8d389	Fix ctm layout bug	2018-03-12 12:45:00 +01:00
Jim Laurie	6cd0ec730e	3.0.0-alpha.11.1	2018-03-11 15:54:56 +01:00
cyril lopez	82b779aa6f	Fix conflict and start fixineg eslint on helper plugin	2018-03-09 16:41:24 +01:00
Jim Laurie	932bf6da23	3.0.0-alpha.11	2018-03-08 17:31:25 +01:00
Jim Laurie	117d9534c9	Remove logs	2018-03-08 10:11:06 +01:00
Aurelsicoko	df4f02c303	Lower ref parameter to retrieve globalId	2018-03-07 14:59:41 +01:00
Aurelsicoko	800945eb32	Resolve conflicts	2018-03-06 15:50:41 +01:00
cyril lopez	e4e65658e6	Add animation when uploading files	2018-03-06 14:02:56 +01:00
cyril lopez	627e241c94	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-06 09:33:12 +01:00
cyril lopez	3e32741114	Add loading button to ctm and to upload && modify design	2018-03-06 09:31:44 +01:00
Aurelsicoko	670f1d8434	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-05 18:40:57 +01:00
Jim Laurie	be7e95b48c	Add createdAt updatedAt for mongoose	2018-03-05 17:26:55 +01:00
Aurelsicoko	2f69111506	Merge branch 'master' of github.com:strapi/strapi into feature/upload	2018-03-05 16:23:17 +01:00
Aurelsicoko	7dfc184a2e	Don't loose oneToManyMorph relationship on update	2018-03-05 15:04:10 +01:00
Jim LAURIE	03a540631c	Merge branch 'master' into fix-upload-front	2018-03-05 14:52:18 +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	d7aa3eef7e	Resolve conflicts	2018-03-02 14:21:51 +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	b896d96061	Fix one file upload input	2018-03-02 11:49:23 +01:00
Joseph Wang	a9ba025b24	add some chinese translation fix	2018-03-02 18:43:03 +08:00
cyril lopez	247d308e26	Fix ctm formvalidations ... This logic needs to be redone Fix overflow on upload list	2018-03-01 22:51:48 +01:00
cyril lopez	c22a1cc39c	Check if the relation is manyToManyMorph in order to send the correct object when deleting a file	2018-03-01 22:03:23 +01:00
cyril lopez	51058d6e9b	Send empty array when removing file	2018-03-01 18:34:29 +01:00
Aurelsicoko	e435b01953	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-01 17:40:24 +01:00
Aurelsicoko	234d913c1b	Add/remove images file Content Manager for SQL databases	2018-03-01 17:39:31 +01:00
Jim LAURIE	9852794ee4	Merge branch 'master' into Chinese-Translation	2018-03-01 13:03:18 +01:00
Joseph Wang	f35b2519ba	language hot fix	2018-03-01 16:30:44 +08:00
Joseph Wang	a6bf74c622	finish adding traditional chinese translations	2018-03-01 11:50:33 +08:00
cyril lopez	338385bea3	Handle upload with object	2018-02-28 18:49:19 +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	03668670dc	Handle upload from the Content Manager side	2018-02-27 17:38:59 +01:00
Aurelsicoko	2838b09aad	Reuse already declared variable	2018-02-27 16:54:54 +01:00
Aurelsicoko	0434ff5be0	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-02-27 16:53:47 +01:00
Aurelsicoko	dac8931676	Handle association on upload route	2018-02-27 16:53:06 +01:00