1419 Commits

Author	SHA1	Message	Date
soupette	b59351d375	Fix conflicts	2019-10-11 15:54:38 +02:00
soupette	9bb12c2e97	Fix webpack-dev-server dependency	2019-10-11 15:49:20 +02:00
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	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
soupette	86932b2911	Merge branch 'develop' of github.com:strapi/strapi into front/improve-webpack-config	2019-10-10 21:20:02 +02:00
Virginie Ky	8040e89d7f	clean css and buttons ui	2019-10-10 16:21:32 +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	77c94645e8	Remove scss files	2019-10-09 15:44:56 +02:00
soupette	05a1e69888	Remove sass ctb	2019-10-09 12:00:52 +02:00
soupette	da2d136de5	Update webpack config	2019-10-08 16:32:07 +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
Karthikeyan Palaniswamy	2ffd152b01	Change english to German values	2019-10-08 10:15:46 +02:00
Karthikeyan Palaniswamy	c05c758809	Add all the missing keys and its value to de.json.	2019-10-08 10:15:46 +02:00
Karthikeyan Palaniswamy	df51eafbbe	Delete Auth & Permission key from de.json because it is not listed in en.json.	2019-10-08 10:15:46 +02:00
Karthikeyan Palaniswamy	d7f4ff7c47	Use 2 spaces for a tab	2019-10-08 10:15:46 +02:00
Karthikeyan Palaniswamy	e1a05e4436	Remove space before :(colon)	2019-10-08 10:15:46 +02:00
Karthikeyan Palaniswamy	3f57e8a7d3	Add missing translations for German language	2019-10-08 10:15:46 +02:00
Karthikeyan Palaniswamy	3466b7cbe7	Change english to German values	2019-10-08 00:11:21 +02:00
Karthikeyan Palaniswamy	ca8170bdd8	Add all the missing keys and its value to de.json.	2019-10-05 15:22:09 +02:00
Karthikeyan Palaniswamy	5493c65a9c	Delete Auth & Permission key from de.json because it is not listed in en.json.	2019-10-05 15:21:08 +02:00
Alexandre BODIN	714b6c9045	Merge pull request #4152 from strapi/chore/admin-development ... Allow admin customization	2019-10-04 15:07:40 +02:00
Alexandre Bodin	2d04d25097	v3.0.0-beta.16.8	2019-10-04 11:57:46 +02:00
cyril lopez	39988b3efb	Merge branch 'master' into develop	2019-10-03 10:47:25 +02:00
cyril lopez	52e700d1ca	Merge branch 'develop' into front/context-api	2019-10-02 18:09:13 +02:00
soupette	66104d9e11	Fix conflicts	2019-10-01 17:56:52 +02:00
Alexandre Bodin	84746b8118	Add server admin panel option to strapi server to disable file serving when running development server	2019-10-01 15:43:44 +02:00
Jim LAURIE	5997793451	Merge branch 'master' into master	2019-10-01 15:22:43 +02:00
Stephen Latham	8b4a016d2e	Issue #4133 fixed - Changed the to parameter from policy to privacy	2019-10-01 11:53:09 +01:00
Alexandre Bodin	dbd621e6d8	v3.0.0-beta.16.7	2019-10-01 12:15:48 +02:00
cyril lopez	922f6109f6	Merge branch 'develop' into fix/scrollbar	2019-09-27 16:17:15 +02:00
cyril lopez	3a4bb7fda5	Merge branch 'develop' into front/context-api	2019-09-27 15:44:15 +02:00
Alexandre BODIN	84146362a7	Merge pull request #4081 from chiacode/master ... Change Traditional Chinese flag in LocaleToggle	2019-09-27 15:33:24 +02:00
Karthikeyan Palaniswamy	765498a606	Use 2 spaces for a tab	2019-09-26 22:32:22 +02:00
Karthikeyan Palaniswamy	ce70c911e4	Remove space before :(colon)	2019-09-26 22:32:06 +02:00
Erik Töyrä Silfverswärd	e3e185102d	#4104 - Updates the url of the setting button for Content Manager PluginCard.	2019-09-26 17:29:33 +02:00
Alexandre Bodin	6305bee43b	v3.0.0-beta.16.6	2019-09-26 14:35:06 +02:00
soupette	0b39322bba	Apply PR feedback	2019-09-26 11:52:02 +02:00
Karthikeyan Palaniswamy	29bd8f208c	Add missing translations for German language	2019-09-25 22:59:51 +02:00
Casper S	706a27ad51	Update sv.json	2019-09-25 14:32:58 +02:00
Casper S	bc3ea2422b	Update sv.json	2019-09-25 14:31:18 +02:00