2809 Commits

Author	SHA1	Message	Date
soupette	86bc73e9d1	Fix conflict	2018-04-02 09:50:58 +02:00
Jim LAURIE	6a8045c4a3	Merge branch 'master' into fix/726	2018-03-31 18:32:35 +02:00
Jim LAURIE	6e93e95d73	Merge branch 'master' into master	2018-03-31 15:11:59 +02:00
soupette	31b8e7cb34	Fixes #880	2018-03-30 20:27:37 +02:00
Inder Redni	1e914be7b7	polish language | update	2018-03-30 19:00:06 +02:00
soupette	a6e9526171	Fix BottomInlineControls	2018-03-30 18:01:46 +02:00
soupette	0c8769138c	Fix conflict	2018-03-30 13:00:03 +02:00
soupette	93497ec8c9	Fix strategies	2018-03-30 12:54:53 +02:00
Jim LAURIE	d1bcd5a637	Merge branch 'master' into fix/726	2018-03-30 12:28:43 +02:00
soupette	96a5607b40	Handle video preview	2018-03-30 12:06:37 +02:00
soupette	6379e26fe8	Update translations	2018-03-30 10:31:09 +02:00
soupette	4ddd4302cf	Fixes #832	2018-03-29 16:25:47 +02:00
soupette	92a0532580	Handle pasted files	2018-03-29 14:55:04 +02:00
soupette	8bbe4b10fd	Add loading state when uploading file	2018-03-29 14:17:08 +02:00
soupette	92c5598257	Merge branch 'fix-wys-spaces-tab' of github.com:strapi/strapi into improve-wys-upload	2018-03-29 13:51:27 +02:00
soupette	8c3e30b57d	Remove package	2018-03-29 13:35:28 +02:00
soupette	586a8882c3	Add file upload in wysiwyg bottom controls	2018-03-29 11:43:00 +02:00
Marcin Paździora	0a775666d8	Corrected and added "request.error.*.unknow" translations	2018-03-29 11:40:22 +02:00
cyril lopez	e4f6082efa	Add onTab event and fix space bug	2018-03-28 19:05:40 +02:00
cyril lopez	626efeafa8	Fix spaces bug	2018-03-28 18:16:27 +02:00
Jim Laurie	5e41edc3b1	Replace server host by localhost ... fix #726	2018-03-28 18:11:57 +02:00
cyril lopez	9a16bccf1d	Clean code	2018-03-28 17:29:55 +02:00
cyril lopez	771dc9f9f3	Clean update store	2018-03-28 16:17:27 +02:00
cyril lopez	873cfd5d92	Remove wysiwyg components folder	2018-03-28 16:00:08 +02:00
cyril lopez	8652700d50	Handle multiline selection ol	2018-03-27 18:59:24 +02:00
cyril lopez	f2fe224f01	Handle multiline selection for list, update all blocks when inserting new ul	2018-03-27 18:02:47 +02:00
Jim Laurie	8390106f59	3.0.0-alpha.11.2	2018-03-27 17:59:16 +02:00
Jim Laurie	bc39200cce	Limit ssl options to mongoDB connection	2018-03-27 17:02:23 +02:00
Jim Laurie	5d03c350e4	Clean user model	2018-03-27 16:44:25 +02:00
Jim LAURIE	ae71c340fe	Merge branch 'master' into fix-left-menu-link-container-scroll	2018-03-27 13:29:07 +02:00
cyril lopez	e3dd28b209	Fix pasted text	2018-03-27 11:51:57 +02:00
cyril lopez	bee3ee7850	Fix backspace bug	2018-03-27 11:34:38 +02:00
thomas-j-moffett	17440b2dd1	Fixes #826	2018-03-27 01:39:02 -07:00
cyril lopez	37eedd5747	Fix pagination	2018-03-27 10:27:50 +02:00
cyril lopez	b1e39929de	Fixes #850	2018-03-27 10:13:13 +02:00
cyril lopez	2f99752452	Merge branch 'wysiwyg-preview-fullscreen' of github.com:strapi/strapi into wysiwyg-preview-fullscreen	2018-03-26 16:45:27 +02:00
Aurelsicoko	0803b021c2	Improve preview style	2018-03-26 16:28:21 +02:00
cyril lopez	f059ccddd5	Modify key commands	2018-03-26 16:20:58 +02:00
cyril lopez	aed37546ff	Created components folder	2018-03-26 11:14:07 +02:00
Evan Owens	7e75679094	Merge branch 'master' into master	2018-03-23 13:45:52 -04:00
nurikabe	f701b3e53a	Japanese "welcome" locale file	2018-03-23 13:43:18 -04:00
Jim LAURIE	c59616cbd2	Merge branch 'master' into staging	2018-03-23 17:22:29 +01:00
cyril lopez	8be6df24b3	Fix PR feedback	2018-03-23 17:11:10 +01:00
Jim LAURIE	7f1f07742d	Merge branch 'master' into master	2018-03-23 17:06:18 +01:00
cyril lopez	340f06e053	Remove autoclose fs	2018-03-23 16:48:45 +01:00
cyril lopez	8da11a829c	Fix css and fix fullscreen preview bug when empty	2018-03-23 16:40:01 +01:00
cyril lopez	a4b517a193	Add info on wysiwyg in ctb	2018-03-23 15:47:00 +01:00
Jim LAURIE	49784fb72c	Merge branch 'master' into disable-ga-option	2018-03-23 15:11:31 +01:00
cyril lopez	19648b1a13	Allow to disable GA	2018-03-23 12:44:17 +01:00
cyril lopez	118a77eda0	Clean code wysiwyg	2018-03-22 20:33:34 +01:00