From bf9b896d27925624d23a96d3f7dcdca5c224ff75 Mon Sep 17 00:00:00 2001 From: MK Date: Tue, 23 Aug 2016 12:09:05 -0400 Subject: [PATCH 1/4] Add MailHog and Dada Mail --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3fe72067..de033c47 100644 --- a/README.md +++ b/README.md @@ -223,6 +223,7 @@ _MTAs / SMTP servers_ * [Haraka](http://haraka.github.io/) - A high-performance, pluginable SMTP server written in Javascript. ([Source Code](https://github.com/haraka/Haraka)) `MIT` `Javascript` * [MailCatcher](http://mailcatcher.me/) - Ruby gem that deploys a simply SMTP MTA gateway that accepts all mail and displays in web interface. Useful for debugging or development. ([Source Code](https://github.com/sj26/mailcatcher)) `MIT` `Ruby` * [Maildrop](https://github.com/m242/maildrop) - Disposable email SMTP server, also useful for development. `MIT` `Scala` +* [MailHog](https://github.com/mailhog/MailHog) - Small Golang executable which runs an SMTP MTA gateway that accepts all mail and displays in web interface. Useful for debugging or development. `MIT` `Go` * [OpenSMTPD](https://opensmtpd.org/) - Secure SMTP server implementation from the OpenBSD project. ([Source Code](http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.sbin/smtpd/)) `ISC` `C` * [Postfix](http://www.postfix.org/) - Fast, easy to administer, and secure Sendmail replacement. `IPL` `C` * [Qmail](http://www.qmail.org/top.html) - Secure Sendmail replacement. ([Source Code](https://sources.debian.net/src/netqmail/1.06-5/)) `CC0` `C` @@ -241,6 +242,7 @@ _MDAs - IMAP/POP3 software_ _Mailing lists servers._ + * [Dada Mail](http://dadamailproject.com/) - A web-based list management system that can be used for announcement lists and/or discussion lists. (Also has a "Pro" version which allows for more/larger mailing lists and branding removal.) ([Source Code](https://github.com/justingit/dada-mail)) `GPLv2` `Perl` * [Mailman](https://www.gnu.org/software/mailman/) - The Gnu mailing list server. `GPL` `Python` * [Sympa](https://www.sympa.org/) - A mailing list manager. `GPLv2` `Perl` From d594317a1ffa454c25edc2da4093c402ac562792 Mon Sep 17 00:00:00 2001 From: MK Date: Wed, 24 Aug 2016 12:24:10 -0400 Subject: [PATCH 2/4] merge mailing lists and newsletters --- README.md | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index de033c47..4fab78f5 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,7 @@ See [Contributing](#contributing). - [Complete solutions](#complete-solutions) - [Mail Transfer Agents](#mail-transfer-agents) - [Mail Delivery Agents](#mail-delivery-agents) - - [Mailing lists](#mailing-lists) - - [Newsletter management](#newsletter-management) + - [Mailing lists and newsletter management](#mailing-lists) - [Webmail clients](#webmail-clients) - [IRC](#irc) - [SIP](#sip) @@ -238,21 +237,16 @@ _MDAs - IMAP/POP3 software_ * [Dovecot](http://www.dovecot.org/) - IMAP and POP3 server written primarily with security in mind. ([Source Code](https://github.com/dovecot/core)) `MIT/LGPLv2` `C` * [Piler](http://www.mailpiler.org/wiki/start) - feature rich open source email archiving solution. ([Source Code](https://bitbucket.org/jsuto/piler)) `GPLv3` `C` -#### Mailing lists +#### Mailing lists and Newsletters -_Mailing lists servers._ +_Mailing lists servers and mass mailing software - one message to many recipients._ * [Dada Mail](http://dadamailproject.com/) - A web-based list management system that can be used for announcement lists and/or discussion lists. (Also has a "Pro" version which allows for more/larger mailing lists and branding removal.) ([Source Code](https://github.com/justingit/dada-mail)) `GPLv2` `Perl` * [Mailman](https://www.gnu.org/software/mailman/) - The Gnu mailing list server. `GPL` `Python` - * [Sympa](https://www.sympa.org/) - A mailing list manager. `GPLv2` `Perl` - -#### Newsletter management - -_Mass mailing software - one message to many recipients_ - * [Mailtrain](https://mailtrain.org/) - self hosted newsletter application built on Node.js (v5+) and MySQL (v5.5+ or MariaDB). ([Source Code](https://github.com/andris9/mailtrain)) `GPLv3` `Node.js` * [Mautic](https://www.mautic.org/) - Mautic is marketing automation software (email, social & more). ([Source Code](https://github.com/mautic/mautic)) `GPLv3` `PHP` * [phpList](https://phplist.org) - Newsletter and email marketing with advanced management of subscribers, bounces, and plugins. ([Source Code](https://github.com/phpList/)) `AGPLv3` `PHP` + * [Sympa](https://www.sympa.org/) - A mailing list manager. `GPLv2` `Perl` #### Webmail clients From af74448ad851f129a87a3151ecea36cf273ea0f9 Mon Sep 17 00:00:00 2001 From: MK Date: Wed, 24 Aug 2016 15:56:10 -0400 Subject: [PATCH 3/4] Remove parenthtical --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4fab78f5..df3e866f 100644 --- a/README.md +++ b/README.md @@ -241,7 +241,7 @@ _MDAs - IMAP/POP3 software_ _Mailing lists servers and mass mailing software - one message to many recipients._ - * [Dada Mail](http://dadamailproject.com/) - A web-based list management system that can be used for announcement lists and/or discussion lists. (Also has a "Pro" version which allows for more/larger mailing lists and branding removal.) ([Source Code](https://github.com/justingit/dada-mail)) `GPLv2` `Perl` + * [Dada Mail](http://dadamailproject.com/) - A web-based list management system that can be used for announcement lists and/or discussion lists. ([Source Code](https://github.com/justingit/dada-mail)) `GPLv2` `Perl` * [Mailman](https://www.gnu.org/software/mailman/) - The Gnu mailing list server. `GPL` `Python` * [Mailtrain](https://mailtrain.org/) - self hosted newsletter application built on Node.js (v5+) and MySQL (v5.5+ or MariaDB). ([Source Code](https://github.com/andris9/mailtrain)) `GPLv3` `Node.js` * [Mautic](https://www.mautic.org/) - Mautic is marketing automation software (email, social & more). ([Source Code](https://github.com/mautic/mautic)) `GPLv3` `PHP` From 9026f95b442ad00d651ec5c529e3615ec7ca995c Mon Sep 17 00:00:00 2001 From: MK Date: Wed, 24 Aug 2016 21:17:34 -0400 Subject: [PATCH 4/4] Fix TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index df3e866f..20513d5d 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ See [Contributing](#contributing). - [Complete solutions](#complete-solutions) - [Mail Transfer Agents](#mail-transfer-agents) - [Mail Delivery Agents](#mail-delivery-agents) - - [Mailing lists and newsletter management](#mailing-lists) + - [Mailing lists and newsletters](#mailing-lists-and-newsletters) - [Webmail clients](#webmail-clients) - [IRC](#irc) - [SIP](#sip)