3943 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcus Geißler	c6aade3951	Update node and npm engines settings ... Synced minimum versions of node and npm with other documentations.	2018-03-23 17:02:26 +01:00
Marcus Geißler	da93565a84	Merge branch 'master' into patch-1	2018-03-23 17:02:05 +01:00
Jim LAURIE	1a0694a045	Merge branch 'master' into fix-lodash-version	2018-03-23 16:51:26 +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	a56649b70b	Merge pull request #834 from strapi/disable-ga-option ... Allow to disable GA	2018-03-23 15:25:45 +01:00
Jim LAURIE	49784fb72c	Merge branch 'master' into disable-ga-option	2018-03-23 15:11:31 +01:00
Steven Kaspar	e3f9772525	Correct description to match example ... The description doesn't match the example. The example is correct	2018-03-23 08:39:38 -05:00
cyril lopez	19648b1a13	Allow to disable GA	2018-03-23 12:44:17 +01:00
John Williamson	1d603d1854	introduction of userObj ... Mention of cbx.state.user is missing, added a bit of documentation mentioning it.	2018-03-23 21:29:23 +10:00
Jim LAURIE	88008ea900	Merge pull request #829 from strapi/fix-ctb-edit-relation ... Fixes #828	2018-03-23 12:27:20 +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	7553172cf0	Fixes #828	2018-03-22 12:57:21 +01:00
cyril lopez	ef70242adf	Fix tab focus	2018-03-22 12:01:11 +01:00
Marcus Geißler	2fb4373701	Updated version of node for alpha ... Both the getting started page and the installation doc mention that the current alpha requires node version >= 9.	2018-03-21 22:23:18 +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
Abdón Rodríguez Davila	92503f8ad4	Update staging environment config similar as production	2018-03-20 21:46:02 +01:00
Abdón Rodríguez Davila	5c365f46a0	Rename test environment config to staging	2018-03-20 21:45:11 +01:00
Abdón Rodríguez Davila	f50b1670ec	Update production environment config	2018-03-20 21:43:59 +01:00
Evan Owens	ab84809495	Fix version command	2018-03-20 11:53:45 -04: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
cyril lopez	60d6306b59	Fix offsets algo	2018-03-19 18:22:09 +01:00
Jim LAURIE	2f182732dc	Merge branch 'master' into fix/update-email	2018-03-19 18:21:19 +01:00
Jim LAURIE	4d5e02cd8b	Merge pull request #811 from strapi/ga-admin ... Add ga in admin to improve Strapi	2018-03-19 18:20:57 +01:00
cyril lopez	d87fce5365	Fix auto block	2018-03-19 18:06:48 +01:00