942 Commits

Author	SHA1	Message	Date
Jim Laurie	3b7de09362	Fix upload count page	2018-04-13 15:42:45 +02:00
Jim LAURIE	a508dcf7d7	Merge branch 'master' into add-version-to-admin	2018-04-13 14:43:25 +02:00
soupette	eae1ae1d7f	Fix PR feedback	2018-04-13 13:50:05 +02:00
soupette	87b5832a51	Fixes #810	2018-04-12 23:45:17 +02:00
cyril lopez	936bdf7949	Merge branch 'master' into fix-setup	2018-04-12 17:30:50 +02:00
soupette	3176f02a25	Fixes #858	2018-04-12 17:28:13 +02:00
Jim LAURIE	6e843dad3e	Merge branch 'master' into wysiwyg-preview-fullscreen	2018-04-12 15:02:13 +02:00
Jan Brachhold	d986055fb8	Update german translations	2018-04-11 21:19:31 +02:00
Aurelsicoko	534a1099ac	Update CSS WYSIWYG	2018-04-11 15:08:20 +02:00
soupette	d31d82ab1f	Fix conflicts	2018-04-11 12:45:21 +02:00
Jim LAURIE	3f2a76d771	Merge pull request #906 from strapi/update-mkt ... Update installpluginpage design	2018-04-11 11:22:37 +02:00
soupette	81109f558e	Fix conflict	2018-04-10 11:18:04 +02:00
soupette	58908c9ad3	Fix height	2018-04-10 11:17:37 +02:00
soupette	0c1a1f92b4	Fix conflicts	2018-04-06 17:52:24 +02:00
soupette	b84e68ff87	Fix typos	2018-04-06 17:50:53 +02:00
Aurelsicoko	e50aa003df	Update CSS dashboard and support banners	2018-04-06 12:11:27 +02:00
soupette	525935d619	Remove card t shirt	2018-04-05 15:10:25 +02:00
soupette	6cd3ecb5f6	Update installpluginpage design	2018-04-05 14:17:50 +02:00
Jim Laurie	ee12536e84	3.0.0-alpha.11.3	2018-04-05 14:13:50 +02:00
soupette	d638ed7197	Allow left menu customization	2018-04-05 11:13:49 +02:00
soupette	ff4253aeea	Fix conflict and fix focus bug in WYSIWYG	2018-04-04 17:51:41 +02:00
soupette	cff59764a4	Add newletter register	2018-04-04 17:14:08 +02:00
soupette	d7d18545ce	Finish design	2018-04-04 16:18:12 +02:00
soupette	14e94cea67	Created community section	2018-04-04 15:24:09 +02:00
soupette	f0c7c00547	Add HP shirt block	2018-04-04 13:55:27 +02:00
soupette	130791717d	Created BlockLink component	2018-04-04 12:36:02 +02:00
soupette	ee8c86a57f	Design first block dashboard	2018-04-04 10:21:06 +02:00
soupette	762356e26b	Add i18n	2018-04-04 08:54:15 +02:00
soupette	fdae7a6338	Add Loadable and init new dashboard	2018-04-03 17:56:19 +02:00
Jan Brachhold	7dfd46b8d2	Improve german translation	2018-04-03 15:02:41 +02:00
Evan Owens	63d8512cb7	Center logo ... `center center` logo background position so that we don't have to use logos with a specific height and width.	2018-04-02 15:34:08 -04:00
soupette	86bc73e9d1	Fix conflict	2018-04-02 09:50:58 +02:00
Inder Redni	1e914be7b7	polish language | update	2018-03-30 19:00:06 +02:00
soupette	0c8769138c	Fix conflict	2018-03-30 13:00:03 +02:00
soupette	6379e26fe8	Update translations	2018-03-30 10:31:09 +02:00
soupette	586a8882c3	Add file upload in wysiwyg bottom controls	2018-03-29 11:43:00 +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
thomas-j-moffett	17440b2dd1	Fixes #826	2018-03-27 01:39:02 -07:00
Aurelsicoko	0803b021c2	Improve preview style	2018-03-26 16:28:21 +02:00
cyril lopez	8da11a829c	Fix css and fix fullscreen preview bug when empty	2018-03-23 16:40:01 +01:00
cyril lopez	19648b1a13	Allow to disable GA	2018-03-23 12:44:17 +01:00
cyril lopez	186aaac277	Init preview with custom md converter	2018-03-21 14:55:09 +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	0d71844e29	Handle selection for link media	2018-03-20 13:27:42 +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
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
Jim LAURIE	46bcadaae5	Fix PR feedback	2018-03-19 18:00:04 +01:00