gitlabFork/ISPConfig3.git - Solinfo Gitblit

Merge branch 'greylist_filter' into 'master'

Marius Cramer

2015-02-03 c7397a27fa9fde20a82ad98efd721308a0c968d1

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Tuesday, February 3, 2015 02:22 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Tuesday, February 3, 2015 02:22 -0500
commit	c7397a27fa9fde20a82ad98efd721308a0c968d1
tree	cf1dd0a795b87b02076142a91425455044a3da4f tree \| zip \| gz
parent	accfcafdae46cfc1cc5567ee111c63dc223b6c8e view \| diff 5b70bc43c463309d60bac0dbd8ec4990c306385e view \| diff

Merge branch 'greylist_filter' into 'master'

Greylist filter for mailadresses

Postgrey must be installed in advance (can be added to install instructions?!?)
When Updating ispconfig main.cf has to be changed to!!

See merge request !162

83 files modified

1 files added

	install/dist/lib/fedora.lib.php	15 ●●●●● diff \| view \| raw \| blame \| history
	install/dist/lib/opensuse.lib.php	13 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/installer_base.lib.php	16 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/incremental/upd_dev_collection.sql	3 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/debian_postfix.conf.master	4 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/fedora_postfix.conf.master	4 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/gentoo_postfix.conf.master	4 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/mysql-virtual_policy_greylist.cf.master	5 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/opensuse_postfix.conf.master	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/form/mail_alias.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/form/mail_forward.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/form/mail_user.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ar_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ar_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ar_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/bg_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/bg_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/bg_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/br_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/br_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/br_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/de_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/de_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/de_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/el_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/el_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/el_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/es_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/es_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/es_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fi_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fi_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fi_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fr_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fr_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fr_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hr_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hr_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hr_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hu_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hu_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hu_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/id_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/id_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/id_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/it_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/it_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/it_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ja_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ja_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ja_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/nl_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/nl_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/nl_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pl_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pl_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pl_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pt_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pt_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pt_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ro_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ro_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ro_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ru_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ru_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ru_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/se_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/se_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/se_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/sk_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/sk_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/sk_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/tr_mail_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/tr_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/tr_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/mail_alias_edit.htm	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/mail_forward_edit.htm	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/mail_user_mailbox_edit.htm	8 ●●●●● diff \| view \| raw \| blame \| history