Merge branch 'favourite_servers' of http://git.ispconfig.org/Cambra/ispconfig3...
Merge branch 'favourite_servers' of http://git.ispconfig.org/Cambra/ispconfig3 into Cambra/ispconfig3-favourite_servers Conflicts: install/sql/incremental/upd_dev_collection.sql
No related branches found
No related tags found
Showing
- install/sql/incremental/upd_dev_collection.sql 6 additions, 0 deletionsinstall/sql/incremental/upd_dev_collection.sql
- interface/lib/classes/client_templates.inc.php 14 additions, 2 deletionsinterface/lib/classes/client_templates.inc.php
- interface/web/admin/form/system_config.tform.php 69 additions, 0 deletionsinterface/web/admin/form/system_config.tform.php
- interface/web/admin/lib/lang/en.lng 3 additions, 1 deletioninterface/web/admin/lib/lang/en.lng
- interface/web/admin/lib/lang/en_system_config.lng 5 additions, 0 deletionsinterface/web/admin/lib/lang/en_system_config.lng
- interface/web/admin/lib/lang/es.lng 2 additions, 0 deletionsinterface/web/admin/lib/lang/es.lng
- interface/web/admin/lib/lang/es_system_config.lng 5 additions, 0 deletionsinterface/web/admin/lib/lang/es_system_config.lng
- interface/web/admin/list/server.list.php 7 additions, 7 deletionsinterface/web/admin/list/server.list.php
- interface/web/admin/system_config_edit.php 3 additions, 0 deletionsinterface/web/admin/system_config_edit.php
- interface/web/admin/templates/system_config_mail_edit.htm 6 additions, 0 deletionsinterface/web/admin/templates/system_config_mail_edit.htm
- interface/web/admin/templates/system_config_sites_edit.htm 12 additions, 0 deletionsinterface/web/admin/templates/system_config_sites_edit.htm
- interface/web/client/client_edit.php 23 additions, 8 deletionsinterface/web/client/client_edit.php
- interface/web/client/client_template_edit.php 8 additions, 1 deletioninterface/web/client/client_template_edit.php
- interface/web/client/form/client_template.tform.php 55 additions, 0 deletionsinterface/web/client/form/client_template.tform.php
- interface/web/client/lib/lang/en_client_template.lng 5 additions, 0 deletionsinterface/web/client/lib/lang/en_client_template.lng
- interface/web/client/lib/lang/es_client_template.lng 5 additions, 0 deletionsinterface/web/client/lib/lang/es_client_template.lng
- interface/web/client/templates/client_template_edit_limits.htm 30 additions, 0 deletions...face/web/client/templates/client_template_edit_limits.htm
- interface/web/dns/dns_import.php 2 additions, 1 deletioninterface/web/dns/dns_import.php
- interface/web/dns/dns_slave_edit.php 3 additions, 0 deletionsinterface/web/dns/dns_slave_edit.php
- interface/web/dns/dns_soa_edit.php 3 additions, 0 deletionsinterface/web/dns/dns_soa_edit.php
Loading
Please register or sign in to comment