2617 Commits

Author	SHA1	Message	Date
Jim Laurie	6cd0ec730e	3.0.0-alpha.11.1	2018-03-11 15:54:56 +01:00
Jim LAURIE	1d91544b4f	Merge branch 'master' into fix-upload	2018-03-09 13:08:33 +01:00
cyril lopez	5542d32941	Fixes #759	2018-03-09 11:22:37 +01:00
cyril lopez	c7f2eaac9f	Fixes #758	2018-03-09 11:19:34 +01:00
Jim Laurie	932bf6da23	3.0.0-alpha.11	2018-03-08 17:31:25 +01:00
Jim Laurie	ce3deaf862	Fix dependencies upload provider	2018-03-08 12:14:51 +01:00
cyril lopez	27eacc674b	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-08 10:43:55 +01:00
cyril lopez	589d3f5a3f	Fix app environments bug	2018-03-08 10:32:01 +01:00
Jim Laurie	117d9534c9	Remove logs	2018-03-08 10:11:06 +01:00
Aurelsicoko	d406c456eb	Fix bookshelf manage relation	2018-03-07 18:47:46 +01:00
Aurelsicoko	31d9fd0df9	Update bookshelf manage relations business logic	2018-03-07 18:15:45 +01:00
cyril lopez	e848b3a091	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-07 18:01:21 +01:00
cyril lopez	bb65ff70da	Fix upload update ... Co-authored-by: Aurelsicoko <aurelsicoko@gmail.com>	2018-03-07 17:48:40 +01:00
Jim Laurie	94381bd24b	Remove log	2018-03-07 16:36:45 +01:00
Jim Laurie	8b6a52dbff	Replace index action name	2018-03-07 16:25:56 +01:00
Aurelsicoko	74ee186be2	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-07 15:45:54 +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
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
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
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	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
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
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
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	71e4009317	Fix css and add redirection when modofiying the upload provider	2018-03-05 12:28:29 +01:00