Merge branch 'develop' into 'develop'
allow custom rspamd url (Implements #6010) use idn_decode for mailuser and login fails for mail-users with IDN domains (Fixes #6021) wrong server-id in admin/server_config_edit.php (Fixes #6022) Closes #6022, #6021, and #6010 See merge request ispconfig/ispconfig3!1386
No related branches found
No related tags found
Showing
- install/install.php 0 additions, 1 deletioninstall/install.php
- install/lib/installer_base.lib.php 0 additions, 7 deletionsinstall/lib/installer_base.lib.php
- install/tpl/server.ini.master 1 addition, 0 deletionsinstall/tpl/server.ini.master
- install/update.php 0 additions, 1 deletioninstall/update.php
- interface/web/admin/form/server_config.tform.php 12 additions, 0 deletionsinterface/web/admin/form/server_config.tform.php
- interface/web/admin/server_config_edit.php 7 additions, 3 deletionsinterface/web/admin/server_config_edit.php
- interface/web/admin/templates/server_config_mail_edit.htm 7 additions, 1 deletioninterface/web/admin/templates/server_config_mail_edit.htm
- interface/web/login/index.php 2 additions, 2 deletionsinterface/web/login/index.php
- interface/web/mailuser/index.php 3 additions, 1 deletioninterface/web/mailuser/index.php
- interface/web/mailuser/mail_user_cc_edit.php 1 addition, 1 deletioninterface/web/mailuser/mail_user_cc_edit.php
- interface/web/mailuser/mail_user_password_edit.php 1 addition, 1 deletioninterface/web/mailuser/mail_user_password_edit.php
- interface/web/mailuser/mail_user_spamfilter_edit.php 1 addition, 1 deletioninterface/web/mailuser/mail_user_spamfilter_edit.php
Loading
Please register or sign in to comment