Marius Cramer
2014-09-29 178258f86cdf00b9c047023b97937c794bac88ec
refs
author Marius Cramer <m.cramer@pixcept.de>
Monday, September 29, 2014 13:00 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Monday, September 29, 2014 13:00 -0400
commit178258f86cdf00b9c047023b97937c794bac88ec
tree 064d8f194f774ca570512e3e5f62d2fe7107f663 tree | zip | gz
parent b4f3f515ba92d74006f1f44f5e97c6625cfd8f43 view | diff
7c2e3eab8e08be9d93f3792a8f1107dee5d5d232 view | diff
Merge branch 'master' into 'master'

Master

See merge request !124
1 files deleted
71 files modified
4 files added
1608 ■■■■ changed files
install/sql/incremental/upd_0078.sql 1 ●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 2 ●●● diff | view | raw | blame | history
install/tpl/master_cf_amavis10027.master 1 ●●●● diff | view | raw | blame | history
install/tpl/server.ini.master 1 ●●●● diff | view | raw | blame | history
install/tpl/system.ini.master 1 ●●●● diff | view | raw | blame | history
interface/lib/classes/validate_dkim.inc.php 8 ●●●● diff | view | raw | blame | history
interface/web/admin/form/server_config.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 1 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_config.lng 1 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_config.lng 2 ●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_system_config.lng 2 ●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fr_server_config.lng 24 ●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_mail_edit.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/client/domain_edit.php 2 ●●● diff | view | raw | blame | history
interface/web/js/mail_domain_dkim.js 12 ●●●●● diff | view | raw | blame | history
interface/web/mail/form/mail_blacklist.tform.php 2 ●●● diff | view | raw | blame | history
interface/web/mail/form/mail_content_filter.tform.php 2 ●●● diff | view | raw | blame | history
interface/web/mail/form/mail_get.tform.php 2 ●●● diff | view | raw | blame | history
interface/web/mail/form/mail_relay_recipient.tform.php 2 ●●● diff | view | raw | blame | history
interface/web/mail/form/mail_whitelist.tform.php 2 ●●● diff | view | raw | blame | history
interface/web/mail/form/spamfilter_blacklist.tform.php 2 ●●● diff | view | raw | blame | history
interface/web/mail/form/spamfilter_users.tform.php 2 ●●● diff | view | raw | blame | history
interface/web/mail/form/spamfilter_whitelist.tform.php 2 ●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/ar_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/bg_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/br_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/cz_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/fi_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/fr_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/hr_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/hu_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/id_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/it_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/ja_mail_domain.lng 2 ●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/nl_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/pl_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/pt_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/ro_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/se_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/sk_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/tr_mail_domain.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_dkim_create.php 76 ●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_edit.php 12 ●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_domain_edit.htm 4 ●●●● diff | view | raw | blame | history
interface/web/tools/form/resync.tform.php 114 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ar_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/bg_resync.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/br_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/cz_resync.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/de_resync.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/en_resync.lng 10 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/es_resync.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fi_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fr_resync.lng 6 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hu_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/id_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/it_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ja_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/nl_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pl_resync.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pt_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ro_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ru_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/se_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/sk_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/tr_resync.lng 11 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/menu.d/resync.menu.php 2 ●●● diff | view | raw | blame | history
interface/web/tools/resync.php 238 ●●●●● diff | view | raw | blame | history
interface/web/tools/resync_do.php 373 ●●●●● diff | view | raw | blame | history
interface/web/tools/resync_show.php 114 ●●●●● diff | view | raw | blame | history
interface/web/tools/templates/resync.htm 278 ●●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin_dkim.inc.php 21 ●●●● diff | view | raw | blame | history