190 Commits

Author	SHA1	Message	Date
soupette	86bc73e9d1	Fix conflict	2018-04-02 09:50:58 +02:00
Inder Redni	1e914be7b7	polish language | update	2018-03-30 19:00:06 +02:00
soupette	0c8769138c	Fix conflict	2018-03-30 13:00:03 +02:00
soupette	4ddd4302cf	Fixes #832	2018-03-29 16:25:47 +02:00
Jim Laurie	8390106f59	3.0.0-alpha.11.2	2018-03-27 17:59:16 +02:00
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
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	589d3f5a3f	Fix app environments bug	2018-03-08 10:32:01 +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	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	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
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	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
Aurelsicoko	48694067be	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-05 14:56:23 +01:00
cyril lopez	71e4009317	Fix css and add redirection when modofiying the upload provider	2018-03-05 12:28:29 +01:00
Aurelsicoko	cf08bf43e5	Update plugin menu name	2018-03-05 11:07:37 +01:00
Aurelsicoko	5f0618f94c	Add icon plugin upload	2018-03-02 15:08:42 +01:00
Aurelsicoko	d7aa3eef7e	Resolve conflicts	2018-03-02 14:21:51 +01:00
cyril lopez	2f90e52e6a	Fix translation typo	2018-03-02 09:28:53 +01: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
Jim LAURIE	952024373e	Merge branch 'master' into update-generators	2018-03-01 15:53:39 +01:00
Jim LAURIE	520373d047	Merge branch 'master' into upload-config-front	2018-03-01 15:06:10 +01:00
Jim LAURIE	a1ab33660b	Merge branch 'master' into add-media-ctb	2018-03-01 14:45:14 +01:00
cyril lopez	3d824bf6c5	Add locales to plugin generators	2018-03-01 13:51:10 +01:00
cyril lopez	dd3e83596c	Fix PR review	2018-03-01 11:34:55 +01:00
Joseph Wang	f35b2519ba	language hot fix	2018-03-01 16:30:44 +08:00