gitlabFork/ISPConfig3.git - Solinfo Gitblit

Marius Cramer

2014-01-24 5a9c50a9e8705f92f1830606ddbdd98fed174ba8

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Friday, January 24, 2014 06:31 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Friday, January 24, 2014 06:31 -0500
commit	5a9c50a9e8705f92f1830606ddbdd98fed174ba8
tree	883c978a50cef7ce69f3d0c4eeec265fa6716bae tree \| zip \| gz
parent	8828f85084203f52c9548872e880d5922e448d5f view \| diff 3669b3c10e2ead466165be34fa28078e59703567 view \| diff

 Merge branch 'master' into 'master'

Merged aliasdomain and subdomain files for easier code maintenance

4 files added

8 files modified

30 files renamed

72 files deleted

20 files copied

	interface/web/admin/lib/lang/nl_system_config.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/form/web_childdomain.tform.php	58 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/form/web_subdomain.tform.php	174 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ar_web_childdomain.lng	38 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ar_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ar_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ar_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/bg_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/bg_web_childdomain.lng	66 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/bg_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/bg_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/bg_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/br_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/br_web_childdomain.lng	90 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/br_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/br_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/br_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_web_childdomain.lng	81 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_web_childdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_web_subdomain.lng	47 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_web_subdomain_list.lng	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/de_web_childdomain.lng	62 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/de_web_childdomain_list.lng	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/de_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/de_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/el_web_childdomain.lng	60 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/el_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/el_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/el_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_web_aliasdomain_list.lng	14 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_web_childdomain.lng	38 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/es_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/es_web_childdomain.lng	92 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/es_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/es_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/es_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fi_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fi_web_childdomain.lng	92 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fi_web_childdomain_list.lng	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fi_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fi_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fr_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fr_web_childdomain.lng	84 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fr_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fr_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fr_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hr_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hr_web_childdomain.lng	88 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hr_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hr_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hr_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hu_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hu_web_childdomain.lng	90 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hu_web_childdomain_list.lng	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hu_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hu_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/id_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/id_web_childdomain.lng	84 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/id_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/id_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/id_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/it_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/it_web_aliasdomain_list.lng	14 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/it_web_childdomain.lng	62 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/it_web_childdomain_list.lng	15 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/it_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/it_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ja_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ja_web_childdomain.lng	86 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ja_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ja_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ja_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/nl_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/nl_web_childdomain.lng	84 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/nl_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/nl_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/nl_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pl_web_childdomain.lng	70 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pl_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pl_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pl_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pt_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pt_web_childdomain.lng	90 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pt_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pt_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pt_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ro_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ro_web_childdomain.lng	60 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ro_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ro_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ro_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ru_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ru_web_childdomain.lng	80 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ru_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ru_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ru_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/se_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/se_web_aliasdomain_list.lng	14 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/se_web_childdomain.lng	40 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/se_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/se_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/se_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/sk_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/sk_web_childdomain.lng	88 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/sk_web_childdomain_list.lng	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/sk_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/sk_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/tr_web_aliasdomain.lng	115 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/tr_web_childdomain.lng	90 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/tr_web_childdomain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/tr_web_subdomain.lng	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/tr_web_subdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/module.conf.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/list/web_childdomain.list.php	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/list/web_subdomain.list.php	105 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/web_childdomain_advanced.htm	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/web_childdomain_edit.htm	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/web_childdomain_list.htm	20 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/web_subdomain_advanced.htm	37 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/web_subdomain_edit.htm	144 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/web_subdomain_list.htm	81 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_aliasdomain_del.php	49 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_aliasdomain_edit.php	187 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_aliasdomain_list.php	52 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_childdomain_del.php	58 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_childdomain_edit.php	243 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_childdomain_list.php	73 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_subdomain_del.php	49 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_subdomain_edit.php	196 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_subdomain_list.php	53 ●●●●● diff \| view \| raw \| blame \| history