177 Commits

Author	SHA1	Message	Date
Jim LAURIE	7fdccc62ee	PR feedback	2018-08-23 18:28:13 +02:00
Jim LAURIE	b4d97fb9db	3.0.0-alpha.13.1	2018-08-09 13:39:34 +02:00
Jim LAURIE	90041a5fba	Merge branch 'master' into master	2018-08-06 09:43:14 +02:00
Chris	78e8cb96ea	Added the Dutch (NL) language	2018-08-01 09:17:53 +02:00
Basile Bong	260a9bf69b	Add > FR translation keys	2018-07-31 19:26:51 +02:00
Jim LAURIE	a66c3d8eb0	Merge branch 'master' into translation/de	2018-07-31 13:42:51 +02:00
Jim LAURIE	a912976282	Merge branch 'master' into translation-keys-ru	2018-07-31 13:41:23 +02:00
Jim LAURIE	3e956670a9	Merge branch 'master' into fix/1609	2018-07-29 14:25:49 +02:00
Basile Bong	f0b8b411e6	Add > DE translation keys > strapi-plugin-email	2018-07-26 16:38:33 +02:00
Jim LAURIE	a0c49e3340	Fix package conflicts	2018-07-26 16:19:28 +02:00
Jim LAURIE	09a2a4b73d	3.0.0-alpha.13.0.1	2018-07-26 16:12:17 +02:00
Jim LAURIE	927a900f5b	3.0.0-alpha.13	2018-07-25 17:31:16 +02:00
bardaq	033219560a	Add missing translation keys in RU language 🇷🇺	2018-07-25 10:14:55 +03:00
Aurelsicoko	37b9c2ee4c	Remove front-end dependency from marketplace.strapi.io	2018-07-24 19:37:27 +02:00
Jim LAURIE	fcebf4fc6e	Merge branch 'master' into language/es	2018-07-23 17:32:58 +02: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
Carlos Guimaraes	fe87d4f710	Brazilian Portuguese Language Support	2018-07-01 17:23:02 -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
Jim LAURIE	2761f3949f	Merge branch 'master' into master	2018-06-20 09:33:30 +02:00
Jim LAURIE	0deebb55a6	Merge branch 'master' into master	2018-06-19 17:40:15 +02:00
Alessio Koci	9f801d3cb4	Translation IT - Plugin email	2018-06-19 12:11:20 +02:00
Jim LAURIE	92bdb4e758	3.0.0-alpha.12.5	2018-06-18 16:49:28 +02:00
Özgür ERSOY	d6b6beb3c4	fix missing translations	2018-06-18 13:46:05 +03:00
Özgür ERSOY	eab84232eb	fix spaces	2018-06-18 13:45:26 +03:00
Salem	f6338c8b85	Rename sa.json to ar.json	2018-06-17 16:09:52 +03:00
Salem	83500176b6	Rename ar.json to sa.json	2018-06-17 16:02:20 +03:00
Jim LAURIE	e8d435989c	Merge branch 'master' into master	2018-06-17 14:16:33 +02:00
Jim Laurie	1363a11c19	Fix setup build	2018-06-14 12:29:43 +02:00
Jim Laurie	9339b0cb8e	Update email provider versions	2018-06-13 21:41:36 +02:00
Jim LAURIE	e0537e1eb6	Merge branch 'master' into master	2018-06-13 21:36:54 +02:00
Jim Laurie	e7588e4d1a	Fix PR feedback	2018-06-13 21:32:40 +02:00
Jim Laurie	69157dbba2	3.0.0-alpha.12.4	2018-06-13 17:39:37 +02:00
Jim Laurie	6b7f4c23a9	Remove useless code from upload plugin	2018-06-11 16:55:04 +02:00
Jim LAURIE	ee772c013e	Merge branch 'master' into master	2018-06-09 13:50:22 +02:00
Jim Laurie	2a449532ec	3.0.0-alpha.12.3	2018-06-06 17:34:07 +02:00
Austin Bratcher	ddc01eb27b	Update to add dynamic settings to email plugin ... Email plugin now functions more like the upload plugin. Users can go to the plugins page, click on the settings cog for the email, and switch between providers or change settings. The default provider is strapi-email-sendmail. Extra providers can be added by installing strapi-email-mailgun or strapi-email-sendgrid.	2018-05-31 14:29:00 -05:00
Salem	967f6e3d4b	Create ar.json	2018-05-31 01:04:17 +03:00
Austin Bratcher	077b7ad69e	Added support in email plugin for Mailgun and Sendgrid ... Added basic support for using Mailgun and Sendgrid (as opposed to the Sendmail) package in the email plugin. Configuration is done in plugins/email/config/settings.json	2018-05-23 00:18:39 -05:00
Jim Laurie	31c0d7457a	3.0.0-alpha.12.2	2018-05-17 16:54:27 +02:00
Jim Laurie	4fe7b6176e	Fix conflicts & lint	2018-05-16 12:07:02 +02:00
cyril lopez	1f019c60c3	Merge branch 'master' into eslint	2018-05-14 11:50:32 +02:00