10860 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Virginie Ky	94bf867c93	merge update plugin generators	2019-10-11 15:18:15 +02:00
Virginie Ky	c53f3672b1	merge	2019-10-11 15:16:51 +02:00
soupette	e8ebc71755	Change deps	2019-10-11 15:16:06 +02:00
soupette	ab89cc20d9	Merge branch 'update/plugin-generators' of github.com:strapi/strapi into update/plugin-generators	2019-10-11 15:14:09 +02:00
soupette	130a85f436	Merge branch 'front/improve-webpack-config' of github.com:strapi/strapi into update/plugin-generators	2019-10-11 15:13:40 +02:00
soupette	48bbda38bf	Fix deps	2019-10-11 15:11:55 +02:00
Virginie Ky	5b32e32758	Some UI fixes	2019-10-11 14:59:41 +02:00
cyril lopez	97b4764b16	Merge branch 'develop' into update/plugin-generators	2019-10-11 13:04:37 +02:00
cyril lopez	16e709dc42	Merge branch 'develop' into front/fix-ctb-issues	2019-10-11 13:04:14 +02:00
cyril lopez	096df7e549	Merge branch 'develop' into front/improve-webpack-config	2019-10-11 13:03:50 +02:00
soupette	f09422d524	Merge branch 'master' of github.com:strapi/strapi into develop	2019-10-11 13:03:14 +02:00
soupette	f0b230f0af	Merge branch 'develop' of github.com:strapi/strapi into front/fix-ctb-issues	2019-10-10 21:25:24 +02:00
soupette	4c48979dff	Merge branch 'front/improve-webpack-config' of github.com:strapi/strapi into update/plugin-generators	2019-10-10 21:22:12 +02:00
soupette	86932b2911	Merge branch 'develop' of github.com:strapi/strapi into front/improve-webpack-config	2019-10-10 21:20:02 +02:00
cyril lopez	650aa1e2da	Merge pull request #4223 from strapi/front/remove-sass ... Remove scss in strapi-helper-plugin	2019-10-10 19:40:33 +02:00
Jim LAURIE	b02a3dbd38	Merge pull request #4190 from ivoba/de-fix-and-removed-spaces ... Update DE translations	2019-10-10 18:53:56 +02:00
soupette	afda62d1ba	Update snapshots	2019-10-10 16:40:53 +02:00
Virginie Ky	ef1a3f56a5	clean	2019-10-10 16:27:18 +02:00
Virginie Ky	8040e89d7f	clean css and buttons ui	2019-10-10 16:21:32 +02:00
soupette	d1356fa3ea	Update plugin generators to add front-end files	2019-10-10 11:45:26 +02:00
soupette	3e7ee49154	Fixes #2149 #3016 #3471	2019-10-10 08:49:33 +02:00
cyril lopez	d1a6da5710	Merge branch 'master' into de-fix-and-removed-spaces	2019-10-10 08:33:46 +02:00
soupette	17607648f3	Add compression plugin	2019-10-10 07:13:15 +02:00
soupette	55b8a20a80	Add serviceworker and add option to skip the assets minization for faster build	2019-10-10 07:08:04 +02:00
soupette	0c6e146653	Fix conflicts	2019-10-10 06:36:31 +02:00
soupette	a27c8b2887	Merge branch 'develop' of github.com:strapi/strapi into front/remove-sass	2019-10-10 06:34:54 +02:00
soupette	beef6e5510	Fix conflicts	2019-10-10 06:34:31 +02:00
soupette	1e069d759e	Remove node-sass	2019-10-10 06:24:19 +02:00
soupette	e84beef88f	fix tests	2019-10-09 18:12:42 +02:00
soupette	8bd092eff7	Remove all scss files in helper plugin	2019-10-09 18:06:51 +02:00
Jim LAURIE	9b49bee4b4	Fix #549 forgot password url	2019-10-09 17:37:16 +02:00
soupette	77c94645e8	Remove scss files	2019-10-09 15:44:56 +02:00
Jim LAURIE	82aeed2a40	Review all the concept structure and content structure	2019-10-09 12:32:58 +02:00
soupette	62acc713c1	Init styled-compo migration in helper plugin	2019-10-09 12:31:36 +02:00
soupette	05a1e69888	Remove sass ctb	2019-10-09 12:00:52 +02:00
soupette	7e56dbb9c0	Remove scss in ctm	2019-10-09 10:55:48 +02:00
cyril lopez	6defb64be1	Merge pull request #4089 from strapi/front/remove-sass-admin ... Remove sass admin	2019-10-08 17:06:12 +02:00
soupette	3c031a4fd5	Remove useless dep	2019-10-08 16:48:51 +02:00
soupette	da2d136de5	Update webpack config	2019-10-08 16:32:07 +02:00
Jim LAURIE	c2dc6ec0a8	Fix links	2019-10-08 15:23:46 +02:00
cyril lopez	b6a4b3019e	Merge branch 'develop' into front/remove-sass-admin	2019-10-08 15:12:03 +02:00
cyril lopez	abdfd245a6	Merge pull request #4171 from strapi/styled-component/ctb ... Remove node-sass from users permissions plugin	2019-10-08 15:11:40 +02:00
Alon Bukai	40d3d78b0d	Fix spelling acces -> access (#4211)	2019-10-08 14:12:20 +02:00
soupette	a288198306	Merge branch 'styled-component/ctb' of github.com:strapi/strapi into styled-component/ctb	2019-10-08 12:34:48 +02:00
virginieky	5eaa8d9208	Merge branch 'develop' into front/remove-sass-admin	2019-10-08 12:33:27 +02:00
Virginie Ky	5f6278f1ba	update buffet and some style ui fixes	2019-10-08 12:32:48 +02:00
Virginie Ky	edc61d3522	Fix conflicts	2019-10-08 12:27:04 +02:00
Virginie Ky	0c23fe8bae	Content manager UI	2019-10-08 11:51:10 +02:00
Virginie Ky	82e45e382e	Content manager Filters UI	2019-10-08 11:33:52 +02:00
soupette	e4f9f808e4	Update modals	2019-10-08 11:23:35 +02:00