Merge remote-tracking branch 'ispc3/stable-3.1' into rspamd
Client can create global whitelists and blacklists for email, fixes #5356
Showing
- install/sql/incremental/upd_dev_collection.sql 5 additions, 0 deletionsinstall/sql/incremental/upd_dev_collection.sql
- install/sql/ispconfig3.sql 5 additions, 5 deletionsinstall/sql/ispconfig3.sql
- interface/lib/app.inc.php 1 addition, 1 deletioninterface/lib/app.inc.php
- interface/lib/classes/auth.inc.php 20 additions, 5 deletionsinterface/lib/classes/auth.inc.php
- interface/lib/classes/functions.inc.php 2 additions, 2 deletionsinterface/lib/classes/functions.inc.php
- interface/lib/classes/remote.d/client.inc.php 5 additions, 9 deletionsinterface/lib/classes/remote.d/client.inc.php
- interface/lib/classes/remoting.inc.php 2 additions, 8 deletionsinterface/lib/classes/remoting.inc.php
- interface/lib/classes/system.inc.php 44 additions, 3 deletionsinterface/lib/classes/system.inc.php
- interface/lib/classes/validate_dkim.inc.php 4 additions, 1 deletioninterface/lib/classes/validate_dkim.inc.php
- interface/web/admin/users_edit.php 3 additions, 7 deletionsinterface/web/admin/users_edit.php
- interface/web/client/reseller_edit.php 9 additions, 15 deletionsinterface/web/client/reseller_edit.php
- interface/web/mail/ajax_get_json.php 6 additions, 4 deletionsinterface/web/mail/ajax_get_json.php
- interface/web/mail/mail_blacklist_del.php 3 additions, 0 deletionsinterface/web/mail/mail_blacklist_del.php
- interface/web/mail/mail_blacklist_edit.php 5 additions, 26 deletionsinterface/web/mail/mail_blacklist_edit.php
- interface/web/mail/mail_blacklist_list.php 2 additions, 0 deletionsinterface/web/mail/mail_blacklist_list.php
- interface/web/mail/mail_whitelist_del.php 2 additions, 0 deletionsinterface/web/mail/mail_whitelist_del.php
- interface/web/mail/mail_whitelist_edit.php 12 additions, 34 deletionsinterface/web/mail/mail_whitelist_edit.php
- interface/web/mail/mail_whitelist_list.php 2 additions, 0 deletionsinterface/web/mail/mail_whitelist_list.php
- interface/web/sites/form/ftp_user.tform.php 4 additions, 1 deletioninterface/web/sites/form/ftp_user.tform.php
- server/lib/app.inc.php 16 additions, 0 deletionsserver/lib/app.inc.php
Loading
Please register or sign in to comment