Till Brehm
2015-01-05 9ca1e3b8acc34e15ff4bdbdd4b61402da06b4227
refs
author Till Brehm <tbrehm@ispconfig.org>
Monday, January 5, 2015 01:40 -0500
committer Till Brehm <tbrehm@ispconfig.org>
Monday, January 5, 2015 01:40 -0500
commit9ca1e3b8acc34e15ff4bdbdd4b61402da06b4227
tree 3d517a490c7575649933181728d930ed1adb2caf tree | zip | gz
parent 5fd2b145c2e55ae0d4c394cb2fe0b903802316ce view | diff
ccfc84e610de6a58eeb3b8f49209b82a9124c309 view | diff
Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
1 files added
25 files modified
173 ■■■■■ 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/db_mysql.inc.php 2 ●●● 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/mail/lib/lang/de_mail_forward.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_forward.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
server/lib/classes/db_mysql.inc.php 2 ●●● diff | view | raw | blame | history