ISPConfig3 devel
parent: 9ca1e3 | patch | commitdiff
Marius Cramer
2015-01-05 dee987b263b021b990ea4c62cb15be47c6d61fb5
refs
author Marius Cramer <m.cramer@pixcept.de>
Monday, January 5, 2015 08:30 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Monday, January 5, 2015 08:30 -0500
commitdee987b263b021b990ea4c62cb15be47c6d61fb5
tree 296ea3470771c717afb6557ebc6b37df442dfd06 tree | zip | gz
parent 9ca1e3b8acc34e15ff4bdbdd4b61402da06b4227 view | diff
d48a08cab8343b4ef4824db9d395772450a277de view | diff 
Merge branch 'master' into 'master'

Master

See merge request !140
2 files deleted
33 files modified
51 files added
3427 ■■■■■ changed files
interface/web/admin/form/server_config.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_dkim_edit.php 31 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_dkim_get.php 86 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_dmarc_edit.php 377 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_spf_edit.php 269 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_dmarc.tform.php 164 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_spf.tform.php 164 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_txt.tform.php 31 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ar_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ar_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ar_dns_txt.lng 29 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/bg_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/bg_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/bg_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/br_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/br_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/br_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/cz_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/cz_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/cz_dns_txt.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_txt.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fi_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fi_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fi_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/hr_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/hr_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/hr_dns_txt.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/hu_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/hu_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/hu_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/id_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/id_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/id_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/it_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/it_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/it_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ja_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ja_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ja_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/nl_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/nl_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/nl_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/pl_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/pl_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/pl_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/pt_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/pt_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/pt_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ro_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ro_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ro_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ru_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ru_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ru_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/se_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/se_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/se_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/sk_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/sk_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/sk_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/tr_dns_dmarc.lng 50 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/tr_dns_spf.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/tr_dns_txt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_dkim_edit.htm 5 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_dmarc_edit.htm 100 ●●●●● diff | view | raw | blame | history
interface/web/js/dns_dkim.js 72 ●●●●● diff | view | raw | blame | history
interface/web/js/mail_domain_dkim.js 25 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_dkim_create.php 96 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_edit.php 161 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_domain_edit.htm 2 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/500-backup_mail.inc.php 8 ●●●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin_dkim.inc.php 7 ●●●●● diff | view | raw | blame | history