From 9946f70992d14cc378b8717f28bf972b45f91d86 Mon Sep 17 00:00:00 2001 From: Andris Reinman Date: Tue, 13 Dec 2016 11:41:40 +0200 Subject: [PATCH] Added SendPulse links --- public/images/sendpulse.jpg | Bin 0 -> 8907 bytes setup/sql/mailtrain.sql | 6 +++--- setup/sql/upgrade-00001.sql | 5 +++++ views/index.hbs | 42 +++++++++++++++++++++++++++--------- views/settings.hbs | 9 ++++++-- 5 files changed, 47 insertions(+), 15 deletions(-) create mode 100644 public/images/sendpulse.jpg diff --git a/public/images/sendpulse.jpg b/public/images/sendpulse.jpg new file mode 100644 index 0000000000000000000000000000000000000000..45bdb1d2c6441b035710f2708827df54b9dd8958 GIT binary patch literal 8907 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 GJpV5#WOxSv literal 0 HcmV?d00001 diff --git a/setup/sql/mailtrain.sql b/setup/sql/mailtrain.sql index 8abe36ca..70364321 100644 --- a/setup/sql/mailtrain.sql +++ b/setup/sql/mailtrain.sql @@ -211,11 +211,11 @@ CREATE TABLE `settings` ( PRIMARY KEY (`id`), UNIQUE KEY `key` (`key`) ) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8mb4; -INSERT INTO `settings` (`id`, `key`, `value`) VALUES (1,'smtp_hostname','localhost'); +INSERT INTO `settings` (`id`, `key`, `value`) VALUES (1,'smtp_hostname','smtp-pulse.com'); INSERT INTO `settings` (`id`, `key`, `value`) VALUES (2,'smtp_port','465'); INSERT INTO `settings` (`id`, `key`, `value`) VALUES (3,'smtp_encryption','TLS'); -INSERT INTO `settings` (`id`, `key`, `value`) VALUES (4,'smtp_user','username'); -INSERT INTO `settings` (`id`, `key`, `value`) VALUES (5,'smtp_pass','password'); +INSERT INTO `settings` (`id`, `key`, `value`) VALUES (4,'smtp_user',''); +INSERT INTO `settings` (`id`, `key`, `value`) VALUES (5,'smtp_pass',''); INSERT INTO `settings` (`id`, `key`, `value`) VALUES (6,'service_url','http://localhost:3000/'); INSERT INTO `settings` (`id`, `key`, `value`) VALUES (7,'admin_email','admin@example.com'); INSERT INTO `settings` (`id`, `key`, `value`) VALUES (8,'smtp_max_connections','5'); diff --git a/setup/sql/upgrade-00001.sql b/setup/sql/upgrade-00001.sql index 972ea95d..d7020e6e 100644 --- a/setup/sql/upgrade-00001.sql +++ b/setup/sql/upgrade-00001.sql @@ -14,6 +14,11 @@ CREATE TABLE `import_failed` ( CONSTRAINT `import_failed_ibfk_1` FOREIGN KEY (`import`) REFERENCES `importer` (`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +# Temporary additions +UPDATE `settings` SET `value`='smtp-pulse.com' WHERE `key`='smtp_hostname' LIMIT 1; +UPDATE `settings` SET `value`='' WHERE `key`='smtp_user' LIMIT 1; +UPDATE `settings` SET `value`='' WHERE `key`='smtp_pass' LIMIT 1; + # Footer section LOCK TABLES `settings` WRITE; INSERT INTO `settings` (`key`, `value`) VALUES('db_schema_version', @schema_version) ON DUPLICATE KEY UPDATE `value`=@schema_version; diff --git a/views/index.hbs b/views/index.hbs index 630651cd..97dcb74b 100644 --- a/views/index.hbs +++ b/views/index.hbs @@ -4,7 +4,7 @@
- ... + iRedMail
@@ -12,14 +12,19 @@
-
-

Donate to author

-

If you really like Mailtrain then you can donate to the Mailtrain project to support the further development of it. You can donate directly with Paypal or if you prefer Bitcoin, then my wallet address is 15Z8ADxhssKUiwP3jbbqJwA21744KMCfTM.

- -

- Donate using PayPal -

+
+

 

+
+
+ + SendPulse + +
+
+

SendPulse

A reliable SMTP server, easy integration, and 12,000 messages a month free +
+
@@ -40,10 +45,27 @@ +
+
+ +
+

Donate to author

+

If you really like Mailtrain or your business benefits from it financially then I would really appreciate a small donation to keep the Mailtrain development engines running. You can either use Bitcoin or PayPal for donations. My Bitcoin wallet is 15Z8ADxhssKUiwP3jbbqJwA21744KMCfTM

+ +

+ or donate using PayPal +

+ +
+
+ +
+

RSS Campaigns

-

Setup Mailtrain to track RSS feeds and if a new entry is detected in a feed then Mailtrain auto-generates a new campaign using entry data as message contents and sends it to selected subscribers.

+

Setup Mailtrain to track RSS feeds and if a new entry is detected in a feed then Mailtrain auto-generates a new campaign using entry data as message contents and sends it to + selected subscribers.

GPG Encryption

@@ -62,7 +84,7 @@

Send via any provider

-

Amazon SES, SparkPost, SendGrid, Mailgun – you name it. You can use any provider that supports SMTP protocol to send out your newsletters. Bounce and complaints handling via webhooks is supported for SES, SparkPost, SendGrid and Mailgun.

+

Mailtrain recommends SendPulse even though you can use any provider that supports SMTP protocol to send out your newsletters. Bounce and complaints handling via webhooks is supported for SES, SparkPost, SendGrid and Mailgun, also for Postfix and ZoneMTA.

Trigger based automation

diff --git a/views/settings.hbs b/views/settings.hbs index 678a6806..3b1baf37 100644 --- a/views/settings.hbs +++ b/views/settings.hbs @@ -184,8 +184,13 @@
-
- +
+
+ +
+
+

Don't have an SMTP account yet? Create a free SendPulse account here

+