Florian Schaal
2016-02-10 42e4c6e34d9ba18eebf16ef3b0c0af290c3d58d1
refs
author Florian Schaal <florian@schaal-24.de>
Wednesday, February 10, 2016 16:04 -0500
committer Florian Schaal <florian@schaal-24.de>
Wednesday, February 10, 2016 16:04 -0500
commit42e4c6e34d9ba18eebf16ef3b0c0af290c3d58d1
tree 07942a2c0765d536e8503dd578f0e724e46975d6 tree | zip | gz
parent 5d45b76998bfc6982e54aba6daee8478f19e536b view | diff
88c307b0ef30a94ea5e9b52a1f9078bf04033d29 view | diff
Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
3 files added
65 files modified
1118 ■■■■■ changed files
docs/autoinstall_samples/autoinstall.conf_sample.php 102 ●●●● diff | view | raw | blame | history
docs/autoinstall_samples/autoinstall.ini.sample 98 ●●●● diff | view | raw | blame | history
docs/examples/blacklist_helo.master 74 ●●●●● diff | view | raw | blame | history
install/dist/lib/gentoo.lib.php 6 ●●●● diff | view | raw | blame | history
install/install.php 10 ●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 28 ●●●●● diff | view | raw | blame | history
install/lib/mysql.lib.php 4 ●●●● diff | view | raw | blame | history
install/tpl/blacklist_helo.master 22 ●●●●● diff | view | raw | blame | history
install/tpl/debian_postfix.conf.master 7 ●●●●● diff | view | raw | blame | history
install/tpl/fedora_postfix.conf.master 7 ●●●●● diff | view | raw | blame | history
install/tpl/gentoo_postfix.conf.master 7 ●●●●● diff | view | raw | blame | history
install/tpl/helo_access.master 19 ●●●●● diff | view | raw | blame | history
install/tpl/mysql-virtual_outgoing_bcc.cf 14 ●●●● diff | view | raw | blame | history
install/tpl/mysql-virtual_outgoing_bcc.cf.master 14 ●●●● diff | view | raw | blame | history
install/tpl/opensuse_postfix.conf.master 7 ●●●●● diff | view | raw | blame | history
install/uninstall-fedora.php 12 ●●●● diff | view | raw | blame | history
install/uninstall.php 12 ●●●● diff | view | raw | blame | history
install/update.php 8 ●●●● diff | view | raw | blame | history
interface/lib/app.inc.php 7 ●●●●● diff | view | raw | blame | history
interface/lib/classes/plugin_directive_snippets.inc.php 142 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client_message_template.lng 20 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client_message_template_list.lng 8 ●●●● diff | view | raw | blame | history
interface/web/client/templates/message_template_list.htm 12 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/bg_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/br_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/cz_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/el_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/en_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/es_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/fi_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/hu_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/id_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/it_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/ja_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/nl_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/pl_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/pt_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/ru_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/se_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/sk_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/tr_dashlet_invoice_client_settings.lng 8 ●●●● diff | view | raw | blame | history
interface/web/js/scrigo.js.php 6 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/bg_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/br_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/cz_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fi_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/hu_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/id_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/it_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ja_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/nl_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/pl_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/pt_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ru_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/se_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/sk_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/tr_web_directive_snippets.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_directive_snippets.htm 26 ●●●● diff | view | raw | blame | history
server/conf/hhvm_monit.master 4 ●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/100-monitor_clamav_log.inc.php 2 ●●● diff | view | raw | blame | history
server/lib/classes/cron.d/550-bind_dnssec.inc.php 178 ●●●● diff | view | raw | blame | history
server/lib/classes/db_mysql.inc.php 10 ●●●● diff | view | raw | blame | history
server/lib/classes/system.inc.php 2 ●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin.inc.php 18 ●●●● diff | view | raw | blame | history
server/plugins-available/software_update_plugin.inc.php 16 ●●●● diff | view | raw | blame | history