417 Commits

Author	SHA1	Message	Date
Aurelsicoko	c111aaba13	Fixes #1247	2018-05-24 17:20:32 +02:00
Jim LAURIE	74d3987a11	Merge branch 'master' into add-styled-component	2018-05-18 11:07:32 +02:00
Jim Laurie	31c0d7457a	3.0.0-alpha.12.2	2018-05-17 16:54:27 +02:00
Jim Laurie	4069a3bdaf	Fix fail build on publish npm release	2018-05-16 15:22:20 +02:00
soupette	51f5adc56a	Add styled-components	2018-05-15 14:07:18 +02:00
Jim LAURIE	0bb4f9cfae	Merge branch 'master' into npmignore	2018-05-08 11:36:35 +02:00
Jim Laurie	8f5443db17	3.0.0-alpha.12.1.3	2018-05-07 10:46:43 +02:00
Abdón Rodríguez Davila	0fbf3cae79	Ignore .editorconfig & .gitattributes in npm plugins & admin	2018-05-04 16:47:07 +02:00
Jim LAURIE	e328338181	Merge branch 'master' into master	2018-05-03 16:18:11 +02:00
Jim Laurie	c491c61a97	3.0.0-alpha.12.2	2018-05-03 14:15:21 +02:00
stephledev	d924db42fc	Merge branch 'master' of github.com:strapi/strapi	2018-05-01 13:04:10 +02:00
stephledev	760a6d9a9a	add translations for EN and DE for authenticationDatabase and SSl in admin panel	2018-05-01 12:59:28 +02:00
stephledev	5e5815e309	add authenticationDatabase and SSL to admin panel	2018-05-01 12:56:51 +02:00
Jim LAURIE	a3d9454ee0	Merge branch 'master' into fix-ctb	2018-05-01 11:29:31 +02:00
soupette	ba6011beda	Fix popuprelation bug	2018-04-30 15:30:49 +02: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	9cc62373f0	Merge branch 'master' into sql-xp	2018-04-27 16:29:49 +02:00
Jim LAURIE	0410f12cb1	Merge branch 'master' into fix-838	2018-04-26 16:12:55 +02:00
soupette	22de691a13	Fixes #838	2018-04-26 14:21:17 +02:00
soupette	b7fffb0ce7	Fixes #958	2018-04-25 16:34:20 +02:00
Jim Laurie	8d2a46cd0c	Fix conflict timestamp	2018-04-25 11:06:12 +02:00
Jim LAURIE	36393b9594	Merge branch 'master' into reduce-setup-monorepo	2018-04-23 12:32:01 +02:00
Zhuang	473ceaaae0	add simply translation of strapi-plugin-settings-manager	2018-04-22 22:16:37 +08:00
Jim Laurie	96b32fbea4	Remove sqlite and redis on strapi start and remove sqlite support	2018-04-20 17:59:47 +02:00
soupette	21e45890db	Fixes #964	2018-04-18 14:25:56 +02:00
Jim Laurie	ebd144fddb	3.0.0-alpha.12	2018-04-18 12:03:16 +02:00
soupette	fcc374c3fd	Fix conflicts	2018-04-17 11:50:52 +02:00
soupette	7b87af5e1b	Remove prebuild test and update documentation	2018-04-17 11:49:09 +02:00
Administrator	5a60baa454	Russian language for Mail and Settings Manager plugins	2018-04-15 18:58:56 +03:00
Jan Brach	0efdd3a0b4	Merge branch 'master' into master	2018-04-06 17:25:00 +02:00
Jan Brachhold	51b7a93832	Improve german translation	2018-04-06 15:54:02 +02:00
Jim Laurie	ee12536e84	3.0.0-alpha.11.3	2018-04-05 14:13:50 +02:00
Inder Redni	1e914be7b7	polish language | update	2018-03-30 19:00:06 +02:00
Marcin Paździora	0a775666d8	Corrected and added "request.error.*.unknow" translations	2018-03-29 11:40:22 +02:00
Jim Laurie	8390106f59	3.0.0-alpha.11.2	2018-03-27 17:59:16 +02:00
Jim Laurie	6cd0ec730e	3.0.0-alpha.11.1	2018-03-11 15:54:56 +01:00
Jim Laurie	932bf6da23	3.0.0-alpha.11	2018-03-08 17:31:25 +01:00
Joseph Wang	a9ba025b24	add some chinese translation fix	2018-03-02 18:43:03 +08:00
Jim LAURIE	9852794ee4	Merge branch 'master' into Chinese-Translation	2018-03-01 13:03:18 +01:00
Joseph Wang	f35b2519ba	language hot fix	2018-03-01 16:30:44 +08:00
Joseph Wang	a6bf74c622	finish adding traditional chinese translations	2018-03-01 11:50:33 +08:00
Jim LAURIE	f0706d474c	Merge branch 'master' into alpha.10.3	2018-02-26 18:15:49 +01:00
Jim Laurie	99559e20ea	3.0.0-alpha.10.3	2018-02-26 17:57:23 +01:00
Jim LAURIE	ae9880a374	Merge branch 'master' into file-upload-s3	2018-02-23 15:16:04 +01:00
Jim Laurie	543f21cdb1	Fix PR feedback	2018-02-23 14:57:58 +01:00
Özgür ERSOY	8821818028	turkish language | strapi-plugins	2018-02-22 02:34:00 +03:00
Jim LAURIE	3fb12f16ba	Merge branch 'master' into 3.0.0-alpha.10.2	2018-02-19 12:28:51 +01:00
Jim Laurie	0a5e80be93	3.0.0-alpha.10.2	2018-02-19 11:38:20 +01:00
cyril lopez	99ca8e7117	Merge branch 'master' into master	2018-02-16 13:39:38 +01:00
Freakspot	33826d8e91	Fixed even more spelling mistakes and made some strings prettier	2018-02-16 01:13:20 +01:00