29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim Laurie	932bf6da23	3.0.0-alpha.11	2018-03-08 17:31:25 +01:00
Abdón Rodríguez Davila	3d1613df2d	Add authenticationDatabase setting	2018-03-08 15:51:03 +01:00
cyril lopez	0f6c3192fc	Remove useless const	2018-03-08 15:50:28 +01:00
Abdón Rodríguez Davila	ca864ae711	Add environment variable for SSL	2018-03-08 15:34:24 +01:00
Abdón Rodríguez Davila	b02db9ea1b	Merge branch 'master' into mongodb	2018-03-08 15:32:14 +01:00
Jim LAURIE	96996999a1	Merge pull request #743 from strapi/feature/upload ... Feature/upload	2018-03-08 15:25:55 +01:00
Jim LAURIE	87216d10d8	Merge branch 'master' into feature/upload	2018-03-08 15:11:12 +01:00
cyril lopez	ffbc3298c8	Add header controls	2018-03-08 14:24:26 +01:00
cyril lopez	edc9f82b34	Add controls to wysiwyg start to fix eslint for helper components	2018-03-08 12:56:44 +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	17c1e8397d	Update example section importance	2018-03-07 16:18:55 +01:00
Aurelsicoko	c68b111ea2	Enhance upload documentation	2018-03-07 16:16:22 +01:00
Aurelsicoko	40de531e7c	Update upload documentation	2018-03-07 15:50:59 +01:00
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