ISPConfig3 devel
parent: 5e3aad | patch | commitdiff
Florian Schaal
2014-12-14 a549793dccc43cbbd47b40fb339c1a1c37cbc6e6
refs
author Florian Schaal <florian@schaal-24.de>
Sunday, December 14, 2014 07:11 -0500
committer Florian Schaal <florian@schaal-24.de>
Sunday, December 14, 2014 07:11 -0500
commita549793dccc43cbbd47b40fb339c1a1c37cbc6e6
tree e1b4298aac1affd05b7d674f056826a4a4dae0f3 tree | zip | gz
parent 5e3aadc044ac6b55fb6b247287f886f60cb71733 view | diff
62fd31b9f97bc43dff837dcf525798153bfa2c98 view | diff 
Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
1 files added
21 files modified
167 ■■■■■ changed files
install/sql/incremental/upd_0080.sql 1 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 1 ●●●●● diff | view | raw | blame | history
install/tpl/server.ini.master 1 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_client.inc.php 78 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_config.tform.php 9 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_web_edit.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client.tform.php 7 ●●●●● diff | view | raw | blame | history
interface/web/client/form/reseller.tform.php 7 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_client.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_reseller.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_reseller.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_vhost_domain.tform.php 9 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_vhost_domain.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_vhost_domain.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_advanced.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_ssl.htm 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 6 ●●●●● diff | view | raw | blame | history
server/conf/apache_apps.vhost.master 10 ●●●●● diff | view | raw | blame | history
server/conf/nginx_vhost.conf.master 6 ●●●●● diff | view | raw | blame | history