574 Commits

Author	SHA1	Message	Date
Jim LAURIE	fcebf4fc6e	Merge branch 'master' into language/es	2018-07-23 17:32:58 +02:00
Jim LAURIE	e7a8659f44	Merge branch 'master' into gitignore	2018-07-23 16:06:22 +02:00
Leon Kyneur	92b045f647	Include yarn.lock in packages .gitignore	2018-07-22 09:26:48 +08:00
Jim LAURIE	aba7de44ce	Fix delete uploaded file SQL fix #1459	2018-07-20 15:09:14 +02:00
yummyelin	36175b0237	Merge branch 'master' into master	2018-07-19 17:29:16 -07:00
Jim LAURIE	33c138cece	Merge branch 'master' into patch-7	2018-07-16 16:08:29 +02:00
Yilin Gan	1cf971950a	add file path for aws upload	2018-07-13 11:30:38 -07:00
soupette	3890bc1211	Fix conflict	2018-07-13 12:33:52 +02:00
Alexis Vassilopoulos	7e94324189	Spanish Translations	2018-07-12 19:32:34 +02:00
Jim LAURIE	fa94d12e4f	3.0.0-alpha.12.7.1	2018-07-10 18:10:42 +02:00
Jim LAURIE	a6d48caad9	3.0.0-alpha.12.7	2018-07-10 15:37:47 +02:00
Taihoon Kim	5cfb9e9439	Korean Language Support	2018-07-06 15:34:20 +09:00
cyril lopez	3e42d86460	Merge branch 'master' of github.com:strapi/strapi into settings-ctm	2018-07-03 18:31:41 +02:00
Johann Pinson	8a5e4c48ad	fix(upload): improve query find for bookshelf	2018-07-03 12:09:49 +02:00
Carlos Guimaraes	46765b442c	Brazilian Portuguese Language Support	2018-07-01 17:24:47 -03:00
cyril lopez	c0c99d443a	Fix conflicts and add pt.json translation files in usr-perm plugin	2018-06-28 12:54:39 +02:00
cyril lopez	799c6c3f0f	Remove webpack warnings and react-intl errors	2018-06-28 10:01:59 +02:00
Jim LAURIE	c5f1b8507e	Merge branch 'master' into language-pt	2018-06-27 14:51:17 +02:00
Jim LAURIE	534b17f77f	3.0.0-alpha.12.6	2018-06-26 18:23:36 +02:00
Faustino Kialungila	c8a74b9e69	Portuguese Language Support	2018-06-23 12:11:20 +02:00
Alessio Koci	c8f9b2f07c	fix directories structure	2018-06-20 09:31:25 +02:00
Alessio Koci	5c3445c566	Translation IT - Plugin upload	2018-06-19 14:37:38 +02:00
Jim LAURIE	92bdb4e758	3.0.0-alpha.12.5	2018-06-18 16:49:28 +02:00
Salem	a0cb449212	Rename sa.json to ar.json	2018-06-17 16:06:28 +03:00
Salem	e777c20428	Rename ar.json to sa.json	2018-06-17 16:03:42 +03:00
Jim LAURIE	e8d435989c	Merge branch 'master' into master	2018-06-17 14:16:33 +02:00
Dominik Opyd	bb0d4cbda8	polish language | strapi-plugin-upload	2018-06-14 18:32:23 +02:00
Dominik Opyd	7186cd6e49	polish language | upgrade	2018-06-14 15:59:24 +02:00
Jim Laurie	69157dbba2	3.0.0-alpha.12.4	2018-06-13 17:39:37 +02:00
Jim Laurie	2a449532ec	3.0.0-alpha.12.3	2018-06-06 17:34:07 +02:00
Salem	3146cadf30	Create ar.json	2018-05-31 01:12:42 +03:00
Aurelsicoko	4ca24a37de	Add usage tracking link in the menu #1280	2018-05-28 14:39:02 +02:00
soupette	d1dfb7fc40	Merge branch 'master' of github.com:strapi/strapi into content-manager-filters	2018-05-22 18:17:56 +02:00
Yakup AD	58e4b27ddb	update Turkish language translates	2018-05-20 14:08:47 +03:00
soupette	f3bdbff968	Fix conflicts	2018-05-18 14:56:40 +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	8addd7f000	Fix order plugin upload	2018-05-17 16:05:18 +02:00
soupette	220e6baaef	Harmonize content manager filters options to match the generated APIs ... Change the GlobalPagination & PageFooter params type Apply these modifications into the plugins that were using those compos	2018-05-16 17:10:43 +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
cyril lopez	1f019c60c3	Merge branch 'master' into eslint	2018-05-14 11:50:32 +02:00
Jim LAURIE	0bb4f9cfae	Merge branch 'master' into npmignore	2018-05-08 11:36:35 +02:00
Jim LAURIE	c09f5138a2	Merge branch 'master' into eslint	2018-05-07 16:03:35 +02:00
Jim Laurie	8f5443db17	3.0.0-alpha.12.1.3	2018-05-07 10:46:43 +02:00
soupette	2df4cb3311	Remove npm run lint test in all packages	2018-05-07 09:29:35 +02:00
Abdón Rodríguez Davila	0fbf3cae79	Ignore .editorconfig & .gitattributes in npm plugins & admin	2018-05-04 16:47:07 +02:00
soupette	74de4da177	Change test	2018-05-04 11:55:34 +02:00
soupette	601143b4d5	Remove eslint dependencie in all packages	2018-05-04 11:08:41 +02:00
Jim Laurie	c491c61a97	3.0.0-alpha.12.2	2018-05-03 14:15:21 +02:00