ISPConfig 3:709aed2c6bc03b2f722556bb641fe820b764a840 commitshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commits/709aed2c6bc03b2f722556bb641fe820b764a8402016-02-08T17:43:42-07:00https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/709aed2c6bc03b2f722556bb641fe820b764a840add smtpd_helo_restrictions2016-02-08T17:43:42-07:00Jesse Norelljesse@kci.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bc3a7750c366d22ac69561d645312b794b312b84Merge branch 'html_welcome_mail' into 'stable-3.1'2016-02-06T09:43:40+01:00Marius Burkardm.burkard@pixcept.de
Allow HTML based welcome messages
I needed a HTML based welcome message, so I added this to mail_plugin.inc.php
I hope this is the correct approach.
In addition to /conf-custom/mail/welcome_email_DOMAINNAME.txt and /conf-custom/mail/welcome_email_LANGUAGE.txt one may place a /conf-custom/mail/welcome_email_DOMAINNAME.html or /conf-custom/mail/welcome_email_LANGUAGE.html file to allow HTML based welcome messages.
See merge request !276https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f571ae02d848f2b242ed555b3293f06956733577Typo2016-02-06T09:43:02+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/7b4df68ebbfa7edd70bc5c560c4d8aa0780e8a5bISPConfig coding guidelines2016-02-06T09:42:22+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/be2cd7358fc41a4260b6f707ac1d0efec1a85b18Allow HTML based welcome messages2016-02-05T22:42:55+01:00Daniel Steglichsteglich@datasystems24.de
In addition to /conf-custom/mail/welcome_email_DOMAINNAME.txt and /conf-custom/mail/welcome_email_LANGUAGE.txt one may place a /conf-custom/mail/welcome_email_DOMAINNAME.html or /conf-custom/mail/welcome_email_LANGUAGE.html file to allow HTML based welcome messages.https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/eca13b968042fe7c21a5a01daaf1e1dffd3a83c6Merge branch 'stable-3.1'2016-02-04T18:09:39+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a6e530436a45b2b06e71ad5840b99319c64636fa- switch password field to hidden on input (Fixes #3401)2016-02-04T18:08:11+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/cffa2fa247dd28a4fd92ede3c6b785637d875fd1- redirect md5sum STDERR to /dev/null (Fixes #3383)2016-02-04T17:37:41+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c7654c48ad095aab6456505f24a91d30d563be7bFixes #33962016-02-04T17:35:21+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b31c14924839e573911c8dcf4423831c1c484c2b- removed subject header from notifications (Fixes #3319)2016-02-04T17:20:32+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/0c6ca563001ffeaf12081a26f226bf0cab543b65Merge branch 'stable-3.1'2016-02-04T16:58:27+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/2436971b3ebe3386fe9a3db44423a5705f9f6e38- made state, locality, organization and organization unit optional on ssl cr...2016-02-04T16:55:54+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/22efd48fd42104a2526eef58cad543d4abbb83b5Merge branch 'stable-3.1'2016-02-04T16:17:40+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/cd50a4c3ec3b3354bae2a804677f6a03c969cccb- don't change admin count in security check on failed query2016-02-04T16:10:49+01:00Marius Burkardm.burkard@pixcept.deFixes <a href="/ispconfig/ispconfig3/-/issues/3645" data-reference-type="issue" data-original="ispconfig/ispconfig3#3645" data-link="false" data-link-reference="false" data-project="1" data-issue="21730" data-project-path="ispconfig/ispconfig3" data-iid="3645" data-issue-type="issue" data-container="body" data-placement="top" title='MySQL unavailability causes "The number of ISPConfig administrator users has changed. Old: 0 New: 1"' class="gfm gfm-issue">#3645</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c795dfd688dd414386ffdeba9fd081a4ba9bdb90added missing tables to client_delete function - Closes #37122016-02-04T16:01:47+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b973ff1298fed20030a13d86e1233151a7e3189bMerge branch 'stable-3.1'2016-02-04T15:45:50+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/e36880dfcb05b9fd3eebf9762d7ec7973a820842Added Readme file.2016-02-03T14:49:12+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/7d6317d6cd547add6d83ff532c8ec6438620d14fAdd license2016-02-03T14:42:52+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/99768b5efd67a53bf9b84d98244bcb45d21d4141Fixed issue in updater for git-stable mode.2016-01-31T20:46:41+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/4070036454731508a7caa56d19e0d5bc9e64614cUpdated and merged language files.2016-01-31T18:57:21+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a8177a49c5de5a8bf3dad975cfa85aa798e203faImproved Log view in Monitor.2016-01-31T18:37:30+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/942a6075c5099661987d8431e73557235a40ba0dFixeed UI issues in Monitor module.2016-01-31T17:46:15+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/7e0103f9a8848ce4847fc90c51a6d19a5d24e052Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stab...2016-01-31T17:45:39+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d82de9c3b06b3b4e845330be57f7f69ce06bef0a- fixed upload form problem (CSRF and message)2016-01-31T16:51:25+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ddb086444da4d110437d30134b3fff7243cff801Updated version number to 3.1a1.2016-01-31T16:32:36+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/3117f2e70389b0a3e03a683ec8b03e4e0a7eea87Merge branch 'stable-3.1'2016-01-31T16:00:34+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/06a34758d293106e918f01adf1c6975a24d331bbFixed typo in HTML code of client and reseller form.2016-01-31T14:54:23+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/874c680208c4a4ea2c650c938318e7a661b679b9Improved server config form.2016-01-31T14:54:01+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6acf3242a57733e43b2fae9f067409befec2d5fdAdded: FS#3807 - Add NE Flag to seo redirects in apache2016-01-31T13:28:54+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ef561f7c87e739fad370e30732dbba71139079b4Added: FS#2686 - set mod_fcgi max request len automatically during install2016-01-31T13:24:28+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/467f40ce2aaba5a1f317ba91d246d599bfd9a3d2Added "X-Content-Type-Options: nosniff" header.2016-01-31T13:20:31+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/dee5898d4e234c1b15b0763f1c5a7e654a2d6f5bAdded: FS#2589 - User Mail Filter tracing patch2016-01-31T13:10:26+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bf4b951dce6ee3adcb149a370147b5f531de441eImplemented: FS#435 - Stats icon for domains under Sites2016-01-31T13:02:59+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ff4da3edea10612d5a3e4f569b164fd5f2c1a7aeImproved client message form.2016-01-31T12:52:36+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/dfa9f54015aabcf0e2261105cf55d3f2baf411bfAdded improved generate password buttons in reseller and client forms.2016-01-31T12:49:16+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a538a12118bb484b658c40ecb73882bb8a2002a1Fixed: FS#3933 - Invalid sendmail "from" in php_fpm_pool.conf.master2016-01-31T12:39:50+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/299f8ebfb16a2b40f4142d1b1ba175ed3160d834Added support for git-stable branch (currently stable-3.1 branch) in ISPConfi...2016-01-31T12:34:25+01:00Till Brehmtbrehm@ispconfig.orgAdded support for git-stable branch (currently stable-3.1 branch) in ISPConfig update script for easier development and testing.
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6368225a5e3f498e02e97b742437cbdb2498bc69Fixed: FS#4077 - php update.php --autoinstall=autoinstall.conf.php does not r...2016-01-31T12:27:10+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/0a0647df645c2b75e136c81ff3aa99dd7c2ca05aAdd code to recognize Ubuntu 15.10 in installer and monitor.2016-01-31T12:24:23+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f686264ad6d82cfaf4e401da2e259880f57bfadeMerge branch 'master' into 'stable-3.1'2016-01-30T13:44:29+01:00Marius Burkardm.burkard@pixcept.de
Master
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/274" data-reference-type="merge_request" data-original="!274" data-link="false" data-link-reference="false" data-project="1" data-merge-request="319" data-project-path="ispconfig/ispconfig3" data-iid="274" data-container="body" data-placement="top" title="Master" class="gfm gfm-merge_request">!274</a>