ISPConfig3 devel
parent: 5b3d2c | patch | commitdiff
florian030
2014-02-25 cce9d63279d9078dd0292dd015be497600ac5f32
refs
author florian030 <florian@schaal-24.de>
Tuesday, February 25, 2014 09:16 -0500
committer florian030 <florian@schaal-24.de>
Tuesday, February 25, 2014 09:16 -0500
commitcce9d63279d9078dd0292dd015be497600ac5f32
tree 00f4921daafa2c633fe6f1117a2afa691abffcea tree | zip | gz
parent 5b3d2c2b17c9191a60017a8d08db06b8a9366b16 view | diff
3faab0ca9e097627420aec19c01ad8336fe79c22 view | diff 
Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
42 files modified
1 files added
212 ■■■■■ changed files
install/sql/incremental/upd_0070.sql 1 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 1 ●●●●● diff | view | raw | blame | history
install/tpl/debian6_dovecot-sql.conf.master 2 ●●●●● diff | view | raw | blame | history
install/tpl/fedora_dovecot-sql.conf.master 2 ●●●●● diff | view | raw | blame | history
install/tpl/opensuse_dovecot-sql.conf.master 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/db_mysql.inc.php 2 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_a.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_aaaa.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_alias.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_cname.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_hinfo.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_mx.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_ns.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_ptr.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_rp.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_srv.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_txt.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_a.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_aaaa.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_alias.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_cname.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_hinfo.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_mx.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_ns.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_ptr.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_rp.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_srv.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_txt.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_user_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/monitor/show_sys_state.php 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_folder.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_folder_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_vhost_domain.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_folder.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_folder_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_folder_edit.php 36 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_folder_user_edit.php 36 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 29 ●●●●● diff | view | raw | blame | history
server/lib/classes/aps_installer.inc.php 15 ●●●●● diff | view | raw | blame | history
server/lib/classes/db_mysql.inc.php 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 8 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 8 ●●●●● diff | view | raw | blame | history