ISPConfig3 devel
parent: b7ce7d | patch | commitdiff
Marius Cramer
2013-11-18 015dffdc589b396d72092583cc526674f0a9a8d5
refs
author Marius Cramer <m.cramer@pixcept.de>
Monday, November 18, 2013 07:36 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Monday, November 18, 2013 07:36 -0500
commit015dffdc589b396d72092583cc526674f0a9a8d5
tree c384a58de74b018b9f69f0798def06bc1aba3c53 tree | zip | gz
parent b7ce7d4c816fe48ef649351265fe6485da3c2362 view | diff
f19308703c8769cd943dfcef416484c3353fd5fb view | diff 
Merge remote-tracking branch 'sebj/master' and tidied up merged code

Conflicts:
	interface/lib/classes/custom_datasource.inc.php
	interface/lib/classes/validate_client.inc.php
	interface/web/client/client_edit.php
	interface/web/dns/dns_soa_edit.php
	interface/web/dns/dns_wizard.php
	interface/web/mail/mail_domain_edit.php
	interface/web/sites/database_edit.php
	interface/web/sites/web_domain_edit.php
5 files added
35 files modified
1432 ■■■■■ changed files
install/sql/ispconfig3.sql 4 ●●●●● diff | view | raw | blame | history
interface/lib/classes/custom_datasource.inc.php 12 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_client.inc.php 40 ●●●●● diff | view | raw | blame | history
interface/web/client/client_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client.tform.php 76 ●●●●● diff | view | raw | blame | history
interface/web/client/form/reseller.tform.php 73 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_reseller.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_client.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_reseller.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_edit_limits.htm 24 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_limits.htm 24 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_import.php 45 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_soa_edit.php 265 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_wizard.php 62 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_import.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_soa.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_wizard.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_import.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_soa.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_wizard.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_import.htm 15 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_soa_edit.htm 19 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_wizard.htm 11 ●●●●● diff | view | raw | blame | history
interface/web/js/chosen/chosen-sprite.png diff | view | raw | blame | history
interface/web/js/chosen/chosen-sprite@2x.png diff | view | raw | blame | history
interface/web/js/chosen/chosen.css 430 ●●●●● diff | view | raw | blame | history
interface/web/js/chosen/chosen.jquery.min.js 2 ●●●●● diff | view | raw | blame | history
interface/web/js/chosen/chosen.min.css 3 ●●●●● diff | view | raw | blame | history
interface/web/js/scrigo.js.php 3 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_domain.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/fr_mail_domain.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_edit.php 41 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_domain_edit.htm 19 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_edit.php 45 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_domain.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_web_domain.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/database_edit.htm 19 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_domain_edit.htm 19 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_domain_edit.php 89 ●●●●● diff | view | raw | blame | history