3746 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
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
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
cyril lopez	8be6df24b3	Fix PR feedback	2018-03-23 17:11:10 +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
cyril lopez	118a77eda0	Clean code wysiwyg	2018-03-22 20:33:34 +01:00
cyril lopez	23fe21fcdf	Fix fullscreen css	2018-03-22 18:37:01 +01:00
cyril lopez	5d5d5d1097	Add fullscreen live preview	2018-03-22 18:19:49 +01:00
cyril lopez	6d540d4d6d	Fix wysiwyg style	2018-03-22 14:27:33 +01:00
cyril lopez	fc995bb4a0	Fix ctb layout service	2018-03-22 13:36:36 +01:00
cyril lopez	cf2ee11074	Add disabled style to InputSelect ... Disable wysiwyg controls when in preview mode	2018-03-22 13:23:26 +01:00
cyril lopez	ef70242adf	Fix tab focus	2018-03-22 12:01:11 +01:00
cyril lopez	f25a36ec59	Created strategie to retrieve img and links ... (Preview is starting to work as expected	2018-03-21 19:01:46 +01:00
cyril lopez	186aaac277	Init preview with custom md converter	2018-03-21 14:55:09 +01:00
cyril lopez	d908af4943	Handle wysiwyg errors and style	2018-03-20 16:53:11 +01:00
cyril lopez	f0298b1566	Remove old layout	2018-03-20 16:20:50 +01:00
cyril lopez	9354b7eeb1	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-20 16:13:27 +01:00
cyril lopez	32ce6d0a0e	Clean code	2018-03-20 16:12:05 +01:00
cyril lopez	9b08f159ee	Created addContent handler	2018-03-20 15:34:27 +01:00
cyril lopez	280d37c595	Handle selections when adding a new block	2018-03-20 15:17:33 +01:00
cyril lopez	9fa19f3cb1	Refacto add list block	2018-03-20 14:49:49 +01:00
cyril lopez	0d71844e29	Handle selection for link media	2018-03-20 13:27:42 +01:00
Jim LAURIE	b15c848cd8	Merge pull request #817 from Duske/patch-1 ... (doc) fix collection name in many-to-many example	2018-03-20 12:39:37 +01:00
Dustin	9c9225a8cd	(doc) fix collection name in many-to-many example ... Not sure if I understand the example correctly, but with the given config it does not work for me. Shouldn't be the collection names the other way round?	2018-03-20 12:17:07 +01:00
cyril lopez	cbee0345ea	Add striked out control and fix css	2018-03-20 12:12:02 +01:00
Jim LAURIE	e7dfc222fa	Merge pull request #812 from strapi/design/logout ... Update styles.scss	2018-03-20 12:07:39 +01:00
Jim LAURIE	a1372e84df	Merge branch 'master' into design/logout	2018-03-20 11:49:02 +01:00
Jim LAURIE	717e86ba29	Delete comment	2018-03-20 11:48:50 +01:00
Jim LAURIE	a1fa931d1c	Merge pull request #813 from strapi/design/logout-next ... Update index.js	2018-03-20 11:47:48 +01:00
Aurélien GEORGET	17ef1682b1	Update index.js	2018-03-19 19:12:54 +01:00
Aurélien GEORGET	ca6077f9c9	Update styles.scss	2018-03-19 19:12:07 +01:00
cyril lopez	5e7e4b5f59	Fix selection on link	2018-03-19 19:01:05 +01:00
Jim LAURIE	58ff40a432	Merge pull request #809 from strapi/fix/update-email ... Update User.js	2018-03-19 18:35:41 +01:00