3943 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Aurelsicoko	74ee186be2	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-07 15:45:54 +01:00
Aurelsicoko	0b9507d506	Add upload documentation	2018-03-07 15:44:50 +01:00
cyril lopez	7fe96d3875	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-07 15:16:11 +01:00
cyril lopez	ea2a9237be	Created EditPage container	2018-03-07 15:13:54 +01:00
Aurelsicoko	df4f02c303	Lower ref parameter to retrieve globalId	2018-03-07 14:59:41 +01:00
Aurelsicoko	8b9ed724e8	Update tab title	2018-03-07 14:48:44 +01:00
Aurelsicoko	fdb37a101b	Update copied link style and update menu link Users & Permissions	2018-03-07 14:45:09 +01:00
Jim Laurie	ed63df0ae6	Fix delete file on aws s3	2018-03-07 14:18:15 +01:00
Aurélien GEORGET	58c8806816	Merge pull request #751 from strapi/roadmap-patch-1 ... Update ROADMAP.md	2018-03-07 14:02:18 +01:00
Aurélien GEORGET	019bd1c52a	Update ROADMAP.md	2018-03-07 14:00:58 +01:00
Jim Laurie	1c581acb0e	Fix upload settings by env ... Co-authored-by: soupette <cyril.lpz@gmail.com>	2018-03-07 13:44:58 +01:00
Jim Laurie	712f6d398e	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-07 13:14:09 +01:00
Jim Laurie	79341fb8e5	Fix logger colors	2018-03-07 13:12:25 +01:00
Aurelsicoko	1ee852c485	Fix upload providers loading	2018-03-07 11:26:53 +01:00
Aurelsicoko	fc53de4631	Only execute SQL query for SQL database	2018-03-07 10:01:58 +01:00
cyril lopez	37c31ed3f0	Handle Wysiwyg reset value	2018-03-06 21:32:48 +01:00
Aurelsicoko	c6ebabccd3	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-06 18:33:50 +01:00
Aurelsicoko	8904f2ef60	Improve animation upload timing	2018-03-06 18:32:39 +01:00
cyril lopez	19c5e46f69	Add controls	2018-03-06 18:20:05 +01:00
Jim LAURIE	8c641270d3	Merge pull request #740 from msgeissler/patch-1 ... Changed syntax for strapi new database arguments	2018-03-06 17:11:07 +01:00
Jim Laurie	5cbfa32d48	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-06 16:52:29 +01:00
Aurelsicoko	b89a8a5abc	Display better logs	2018-03-06 16:51:00 +01:00
Jim LAURIE	f5cbb62e10	Merge branch 'master' into patch-1	2018-03-06 16:29:15 +01:00
Jim LAURIE	fbf0a2ddbf	Merge pull request #746 from lucaperret/patch-1 ... doc(tutorials): add getting started category	2018-03-06 16:28:22 +01:00
Jim Laurie	2da0a339a9	Search case in-sensitive	2018-03-06 16:24:16 +01:00
Aurelsicoko	800945eb32	Resolve conflicts	2018-03-06 15:50:41 +01:00
Aurelsicoko	cc1ec5c1ea	Make CSS improvements on upload plugin	2018-03-06 15:49:11 +01:00
cyril lopez	e4e65658e6	Add animation when uploading files	2018-03-06 14:02:56 +01:00
cyril lopez	01d98ae0aa	Change notif color	2018-03-06 09:47:37 +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
Luca	28cf166241	doc(tutorials): add getting started category	2018-03-06 07:35:04 +01:00
Marcus Geißler	3f6ba9256f	Merge branch 'master' into patch-1	2018-03-05 20:28:48 +01:00
cyril lopez	abc4598aa7	Init Wysiwyg focus and value	2018-03-05 19:23:06 +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	36cf601a84	Format updatedAt date in file list	2018-03-05 17:37:48 +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	be40cd7392	Update icon upload plugin	2018-03-05 15:51:26 +01:00
Jim LAURIE	4bca88c070	Merge pull request #717 from strapi/fix-ctb ... Fix ctb	2018-03-05 15:36:06 +01:00
Aurelsicoko	06181c3f09	Update icon color	2018-03-05 15:25:13 +01:00
Jim LAURIE	ac7545b53e	Merge branch 'master' into fix-ctb	2018-03-05 15:17:10 +01:00
Jim LAURIE	6b4e948571	Merge pull request #723 from strapi/fix-upload-front ... Fix upload front	2018-03-05 15:15:04 +01:00
Aurelsicoko	7dfc184a2e	Don't loose oneToManyMorph relationship on update	2018-03-05 15:04:10 +01:00
Aurelsicoko	48694067be	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-05 14:56:23 +01:00
cyril lopez	d04c1500b6	Merge branch 'master' of github.com:strapi/strapi into fix-ctb	2018-03-05 14:52:31 +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
cyril lopez	71e4009317	Fix css and add redirection when modofiying the upload provider	2018-03-05 12:28:29 +01:00
Marcus Geißler	fb0b5e6a07	Changed syntax for strapi new database arguments ... https://github.com/strapi/strapi/issues/732	2018-03-05 11:49:10 +01:00