29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	ee968ad2d0	Merge branch 'master' into fix/mask	2018-03-16 16:10:33 +01:00
Johann Pinson	9d6d2c0b9f	Update model.template for mongoose	2018-03-16 16:01:27 +01:00
Johann Pinson	49536526f8	Update model.template for bookshelf	2018-03-16 16:00:14 +01:00
Johann Pinson	4ed7ad2064	Update models.md	2018-03-16 15:54:53 +01:00
cyril lopez	644ccd13a0	Init preview	2018-03-16 14:52:17 +01:00
cyril lopez	0b5fcc39a2	Init preview html	2018-03-16 13:48:32 +01:00
Aurelsicoko	7148eafd2a	Improve request	2018-03-16 12:20:58 +01:00
Jim Laurie	c9b736543a	Add migration guide alpha 10 to 11	2018-03-16 12:18:11 +01:00
cyril lopez	deed38e50e	Design buttons wysiwyg	2018-03-16 12:05:16 +01:00
cyril lopez	98f0b6f3fc	Created ToggleToMArkdown button	2018-03-16 11:45:21 +01:00
Aurelsicoko	7760ae54cc	Improve errors handling	2018-03-16 11:42:17 +01:00
cyril lopez	63575565b1	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-15 22:20:54 +01:00
cyril lopez	1b82aa0940	Fix offsets	2018-03-15 20:21:21 +01:00
cyril lopez	1047a5bdda	Order funcs	2018-03-15 19:10:02 +01:00
cyril lopez	a353c4bc41	Add character numbers and hanle add simple link without selection	2018-03-15 18:58:40 +01:00
cyril lopez	feee771cc5	Fix quotes and code block	2018-03-15 18:27:18 +01:00
cyril lopez	eb3b07c592	Handle Tab key command with event listener ... I have to force the tab key event since it is not working with the Editor handleKeyCommand handler	2018-03-15 18:10:19 +01:00
cyril lopez	a54db55d0c	Clean add media	2018-03-15 17:28:12 +01:00
cyril lopez	24a1d3cb92	Refacto addUl and addOl	2018-03-15 17:18:05 +01:00
cyril lopez	798536f0d6	Handle auto add ol	2018-03-15 16:54:28 +01:00
Jim LAURIE	90e1c6dafe	Merge pull request #781 from strapi/fix/mask ... Fix dominant true when updating relationship	2018-03-15 16:39:37 +01:00
Jim LAURIE	a97e96c240	Merge branch 'master' into fix/mask	2018-03-15 16:21:05 +01:00
cyril lopez	eed3bb059c	Handle auto add li for ul	2018-03-15 15:14:17 +01:00
Aurelsicoko	684a70c665	Fix dominant true when updating relationship	2018-03-15 12:56:21 +01:00
Jim LAURIE	358b24f111	Merge pull request #776 from strapi/fix-users ... Fix edit user	2018-03-15 12:36:48 +01:00
Jim LAURIE	e0501b5adf	Merge branch 'master' into fix-users	2018-03-15 12:02:25 +01:00
cyril lopez	724ec3fb7a	Handle ul block	2018-03-15 12:01:58 +01:00
Jim Laurie	54af44901b	Remove useless clone object	2018-03-15 12:01:10 +01:00
Jim Laurie	2f4635bf4c	Fix PR feedback	2018-03-15 11:51:40 +01:00
cyril lopez	8207c2f45d	Merge branch 'wysiwyg' of github.com:strapi/strapi into wysiwyg	2018-03-15 11:32:22 +01:00
cyril lopez	8f6d732228	Handle add new IMG	2018-03-15 11:31:07 +01:00
Jim Laurie	d77fb19592	Fix set attr name get model	2018-03-15 10:42:23 +01:00
cyril lopez	54e4531997	Fix ctb edit attribute	2018-03-15 00:41:34 +01:00
cyril lopez	81a1a382ad	Fix baseline	2018-03-14 23:10:36 +01:00
cyril lopez	3733d37a48	Handle file upload on wysiwyg	2018-03-14 22:47:56 +01:00
cyril lopez	01278f017b	Merge branch 'wysiwyg' of github.com:strapi/strapi into wysiwyg	2018-03-14 22:21:55 +01:00
cyril lopez	8e3e385f26	Init drag and drop files	2018-03-14 22:20:39 +01:00
Jim Laurie	0a5b178ccc	Send appearance in model definition	2018-03-14 17:44:11 +01:00
Jim LAURIE	bbf2c5f0cd	Merge pull request #773 from strapi/role-registered ... Role registered	2018-03-14 17:38:59 +01:00
Jim LAURIE	19fdb4d279	Merge branch 'master' into role-registered	2018-03-14 17:13:57 +01:00
cyril lopez	3841ae20dd	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-14 16:59:00 +01:00
Jim Laurie	489aefba06	Rename role registered to authenticated	2018-03-14 16:56:12 +01:00
Jim LAURIE	75cee0b3b7	Merge pull request #777 from strapi/enhance/register ... Enhance/register	2018-03-14 16:27:37 +01:00
Jim Laurie	e1b727ee09	Write appearance in layout.json file	2018-03-14 16:24:11 +01:00
Jim LAURIE	31ee1583b4	Merge branch 'master' into enhance/register	2018-03-14 16:12:23 +01:00
Aurelsicoko	94dc9305b1	Update URL	2018-03-14 16:08:33 +01:00
Aurelsicoko	d59025de06	Replace usage URLs	2018-03-14 15:58:12 +01:00
cyril lopez	24d3eaa16b	Fix wysiwyg underline	2018-03-14 15:12:06 +01:00
Jim Laurie	169c9742bb	Merge branch 'wysiwyg' of github.com:strapi/strapi into wysiwyg	2018-03-14 15:10:35 +01:00
cyril lopez	b010175ab1	Fix ctb appearance	2018-03-14 15:00:04 +01:00