ISPConfig3 devel
parent: b19173 | patch | commitdiff
A. Täffner
2016-01-20 cab3bca1d75be6c7f3140a35396d8c6ee2011801
refs
author A. Täffner <darkalex@firesplash.de>
Wednesday, January 20, 2016 15:16 -0500
committer A. Täffner <darkalex@firesplash.de>
Wednesday, January 20, 2016 15:16 -0500
commitcab3bca1d75be6c7f3140a35396d8c6ee2011801
tree 5d3ea907f45e192dd693eb18150f6d7ab29008dc tree | zip | gz
parent b19173e3782a5cfba9491e0acf5fe9e9ea7b46e4 view | diff
337473b29af23892d2bcbe4cc97c087aa5ff8b30 view | diff 
Merge branch 'master' into dns-dnssec

Conflicts:
	install/sql/incremental/upd_dev_collection.sql
6 files added
17 files modified
621 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 13 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 15 ●●●●● diff | view | raw | blame | history
install/tpl/mysql-virtual_sender_login_maps.cf.master 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/quota_lib.inc.php 61 ●●●●● diff | view | raw | blame | history
interface/lib/classes/remote.d/sites.inc.php 15 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client.tform.php 9 ●●●●● diff | view | raw | blame | history
interface/web/client/form/reseller.tform.php 16 ●●●●● diff | view | raw | blame | history
interface/web/mail/form/mail_alias.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/form/mail_forward.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_alias.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_forward.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_alias.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_forward.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_alias_edit.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_forward_edit.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/form/mail_user_cc.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/ftp_sites_stats.php 181 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_ftp_sites_stats_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_ftp_sites_stats_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/list/ftp_sites_stats.list.php 60 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/ftp_sites_stats_list.htm 60 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/200-ftplogfiles.inc.php 126 ●●●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin.inc.php 5 ●●●●● diff | view | raw | blame | history