ISPConfig3 devel
parent: cbdc7a | patch | commitdiff
Marius Cramer
2014-07-08 adb0e74cf23b4d766f29ef3662751cc59046a4cc
refs
author Marius Cramer <m.cramer@pixcept.de>
Tuesday, July 8, 2014 10:09 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Tuesday, July 8, 2014 10:09 -0400
commitadb0e74cf23b4d766f29ef3662751cc59046a4cc
tree 5c5eab827ce62255bca3ff80fa17dc117b7420e0 tree | zip | gz
parent cbdc7acabd3c61c3e8da7a3b04421f0d061fc5fa view | diff
726f15c465cca1c2d968d87793a682610624754a view | diff 
Merge branch 'favourite_servers' of http://git.ispconfig.org/Cambra/ispconfig3 into Cambra/ispconfig3-favourite_servers

Conflicts:
	install/sql/incremental/upd_dev_collection.sql
24 files modified
298 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 6 ●●●●● diff | view | raw | blame | history
interface/lib/classes/client_templates.inc.php 16 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/system_config.tform.php 69 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_system_config.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_system_config.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/admin/list/server.list.php 14 ●●●●● diff | view | raw | blame | history
interface/web/admin/system_config_edit.php 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/system_config_mail_edit.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/system_config_sites_edit.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/client/client_edit.php 31 ●●●●● diff | view | raw | blame | history
interface/web/client/client_template_edit.php 9 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client_template.tform.php 55 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client_template.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_client_template.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_template_edit_limits.htm 30 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_import.php 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_slave_edit.php 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_soa_edit.php 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_wizard.php 3 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_edit.php 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_edit.php 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 3 ●●●●● diff | view | raw | blame | history