Merge remote-tracking branch 'ispc/master' into new-layout-3.1
Showing
- interface/web/admin/form/users.tform.php 13 additions, 0 deletionsinterface/web/admin/form/users.tform.php
- interface/web/admin/lib/lang/de_users.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/de_users.lng
- interface/web/admin/lib/lang/en_users.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/en_users.lng
- interface/web/admin/templates/users_user_edit.htm 7 additions, 1 deletioninterface/web/admin/templates/users_user_edit.htm
- interface/web/dns/dns_soa_edit.php 5 additions, 1 deletioninterface/web/dns/dns_soa_edit.php
- interface/web/login/lib/lang/de.lng 1 addition, 0 deletionsinterface/web/login/lib/lang/de.lng
- interface/web/login/lib/lang/en.lng 2 additions, 1 deletioninterface/web/login/lib/lang/en.lng
- interface/web/login/password_reset.php 39 additions, 36 deletionsinterface/web/login/password_reset.php
- interface/web/mail/mail_domain_dkim_create.php 1 addition, 1 deletioninterface/web/mail/mail_domain_dkim_create.php
- server/lib/classes/cron.d/500-backup.inc.php 31 additions, 35 deletionsserver/lib/classes/cron.d/500-backup.inc.php
- server/lib/classes/cron.d/500-backup_mail.inc.php 15 additions, 23 deletionsserver/lib/classes/cron.d/500-backup_mail.inc.php
- server/lib/classes/system.inc.php 16 additions, 0 deletionsserver/lib/classes/system.inc.php
- server/plugins-available/apache2_plugin.inc.php 6 additions, 12 deletionsserver/plugins-available/apache2_plugin.inc.php
- server/plugins-available/backup_plugin.inc.php 5 additions, 33 deletionsserver/plugins-available/backup_plugin.inc.php
- server/plugins-available/mail_plugin.inc.php 10 additions, 26 deletionsserver/plugins-available/mail_plugin.inc.php
- server/plugins-available/nginx_plugin.inc.php 22 additions, 0 deletionsserver/plugins-available/nginx_plugin.inc.php
Loading
Please register or sign in to comment