609 Commits

Author	SHA1	Message	Date
Jim LAURIE	c09f5138a2	Merge branch 'master' into eslint	2018-05-07 16:03:35 +02:00
soupette	e9f68a3bc9	Lint in strapi-bookshelf	2018-05-04 17:29:44 +02:00
soupette	f9f78745ca	Change test logic	2018-05-04 15:38:42 +02:00
soupette	74de4da177	Change test	2018-05-04 11:55:34 +02:00
soupette	2a30a20e7e	Important! fix monorepo setup build command	2018-05-03 17:39:24 +02:00
Jim Laurie	c491c61a97	3.0.0-alpha.12.2	2018-05-03 14:15:21 +02:00
soupette	30528f40ec	Add eslint to strapi-admin backend	2018-05-02 11:01:27 +02:00
Zhuang	7634ff5602	add simplify chineses translation for plugins	2018-04-30 22:09:53 +08:00
Zhuang	97531cc3d2	Merge branch 'master' of https://github.com/strapi/strapi into add_simply_chinese_translation	2018-04-30 16:56:19 +08:00
Jim LAURIE	1850d5539b	Merge branch 'master' into improve-webpack-config	2018-04-26 14:20:10 +02:00
soupette	d2b6667666	Fix menu footer css	2018-04-26 11:27:37 +02:00
soupette	42c64091e2	Fixes 770	2018-04-26 11:24:47 +02:00
soupette	b7fffb0ce7	Fixes #958	2018-04-25 16:34:20 +02:00
Herbert Lin	a717faa817	Merge branch 'master' of https://github.com/XcrossD/strapi	2018-04-24 18:00:52 +08:00
Herbert Lin	0db8f05e8b	Temp fix for LeftMenuFooter style.	2018-04-24 17:59:30 +08:00
Jim LAURIE	f2cb6d7af8	Merge branch 'master' into master	2018-04-24 11:29:39 +02:00
Jim LAURIE	36393b9594	Merge branch 'master' into reduce-setup-monorepo	2018-04-23 12:32:01 +02:00
XcrossD	43357bf49b	Update LeftMenuFooter style	2018-04-23 11:20:14 +08:00
Zhuang	77c6506ff1	add Simple Chinese translation	2018-04-22 22:00:10 +08:00
cyril lopez	77bc3975c4	Merge branch 'master' into reduce-setup-monorepo	2018-04-18 11:54:36 +02:00
soupette	f419f9383c	Fix setup time info	2018-04-18 11:51:16 +02:00
Aurelsicoko	5320c417a5	Remove price	2018-04-18 11:43:55 +02:00
Aurelsicoko	53bedf277b	Fix version number in left menu	2018-04-17 16:05:10 +02:00
Aurelsicoko	79e3b56a1e	Remove unnecessary admin and add GraphQL logo	2018-04-17 15:24:17 +02:00
cyril lopez	f0eca93f93	Merge branch 'master' into reduce-setup-monorepo	2018-04-17 12:04:55 +02:00
soupette	fcc374c3fd	Fix conflicts	2018-04-17 11:50:52 +02:00
soupette	58dd77acb9	Allow async build	2018-04-17 11:43:47 +02:00
Aurelsicoko	aa6fdb2c93	Resolve conflicts	2018-04-17 11:12:41 +02:00
Aurelsicoko	d96192025b	Add link on blog articles	2018-04-17 11:10:23 +02:00
soupette	d620053799	Add username to welcome block	2018-04-16 18:57:08 +02:00
soupette	f13ace8599	Add latest articles to HomePage	2018-04-16 18:13:36 +02:00
Jim Laurie	3da6115fac	Add upload provider documentation	2018-04-16 14:17:21 +02:00
Administrator	d030dc06ba	Russian language pack update. Admin translations fixes + Content manager translations added.	2018-04-15 13:30:31 +03:00
Administrator	8941d8683d	russian language	2018-04-14 23:54:21 +03:00
Aurélien GEORGET	8da3c8c66f	Change link	2018-04-13 16:08:37 +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	58908c9ad3	Fix height	2018-04-10 11:17:37 +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