Merge branch 'pixcept/ispconfig3-mods-new-layout-3.1'
Conflicts: interface/web/admin/templates/directive_snippets_list.htm interface/web/sites/templates/web_vhost_domain_ssl.htm
No related branches found
No related tags found
Showing
- interface/lib/classes/listform.inc.php 16 additions, 12 deletionsinterface/lib/classes/listform.inc.php
- interface/lib/classes/quota_lib.inc.php 14 additions, 3 deletionsinterface/lib/classes/quota_lib.inc.php
- interface/lib/classes/tools_monitor.inc.php 29 additions, 23 deletionsinterface/lib/classes/tools_monitor.inc.php
- interface/web/admin/templates/directive_snippets_edit.htm 26 additions, 30 deletionsinterface/web/admin/templates/directive_snippets_edit.htm
- interface/web/admin/templates/directive_snippets_list.htm 35 additions, 41 deletionsinterface/web/admin/templates/directive_snippets_list.htm
- interface/web/admin/templates/firewall_edit.htm 23 additions, 28 deletionsinterface/web/admin/templates/firewall_edit.htm
- interface/web/admin/templates/firewall_list.htm 37 additions, 40 deletionsinterface/web/admin/templates/firewall_list.htm
- interface/web/admin/templates/groups_edit.htm 16 additions, 20 deletionsinterface/web/admin/templates/groups_edit.htm
- interface/web/admin/templates/groups_list.htm 31 additions, 34 deletionsinterface/web/admin/templates/groups_list.htm
- interface/web/admin/templates/iptables_edit.htm 45 additions, 55 deletionsinterface/web/admin/templates/iptables_edit.htm
- interface/web/admin/templates/iptables_list.htm 49 additions, 51 deletionsinterface/web/admin/templates/iptables_list.htm
- interface/web/admin/templates/language_add.htm 16 additions, 20 deletionsinterface/web/admin/templates/language_add.htm
- interface/web/admin/templates/language_complete.htm 13 additions, 11 deletionsinterface/web/admin/templates/language_complete.htm
- interface/web/admin/templates/language_edit.htm 7 additions, 11 deletionsinterface/web/admin/templates/language_edit.htm
- interface/web/admin/templates/language_export.htm 13 additions, 19 deletionsinterface/web/admin/templates/language_export.htm
- interface/web/admin/templates/language_import.htm 17 additions, 27 deletionsinterface/web/admin/templates/language_import.htm
- interface/web/admin/templates/language_list.htm 28 additions, 29 deletionsinterface/web/admin/templates/language_list.htm
- interface/web/admin/templates/remote_action_ispcupdate.htm 15 additions, 11 deletionsinterface/web/admin/templates/remote_action_ispcupdate.htm
- interface/web/admin/templates/remote_action_osupdate.htm 13 additions, 16 deletionsinterface/web/admin/templates/remote_action_osupdate.htm
- interface/web/admin/templates/remote_user_edit.htm 24 additions, 29 deletionsinterface/web/admin/templates/remote_user_edit.htm
Loading
Please register or sign in to comment