ISPConfig3 devel
parent: 441afe | patch | commitdiff
Marius Cramer
2014-02-17 ebbe6374fc9c308daf729d2ad1b2f8007ed771ce
refs
author Marius Cramer <m.cramer@pixcept.de>
Monday, February 17, 2014 05:34 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Monday, February 17, 2014 05:34 -0500
commitebbe6374fc9c308daf729d2ad1b2f8007ed771ce
tree ccc6a438c97e559fbe801725e7b65dd949664967 tree | zip | gz
parent 441afe553839d3522f9eb6a94279d63f75744b16 view | diff
ce1c6d8482a41e5ff31740474300f689ecdae806 view | diff 
Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	install/tpl/debian_postfix.conf.master
	install/tpl/fedora_postfix.conf.master
	install/tpl/gentoo_postfix.conf.master
	install/tpl/opensuse_postfix.conf.master
	install/uninstall.php
	interface/lib/classes/remoting_lib.inc.php
	interface/lib/classes/tform.inc.php
	interface/web/mail/lib/lang/de_mail_user.lng
	interface/web/mailuser/lib/lang/de_mail_user_cc.lng
	interface/web/sites/aps_install_package.php
	interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
	interface/web/sites/web_vhost_domain_edit.php
	interface/web/sites/web_vhost_subdomain_edit.php
	server/cron_daily.php
	server/lib/classes/monitor_tools.inc.php
1 files added
93 files modified
1389 ■■■■■ changed files
install/dist/lib/debian60.lib.php 4 ●●●●● diff | view | raw | blame | history
install/dist/lib/fedora.lib.php 3 ●●●●● diff | view | raw | blame | history
install/dist/lib/opensuse.lib.php 19 ●●●●● diff | view | raw | blame | history
install/lib/install.lib.php 31 ●●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 22 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0068.sql 4 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 13 ●●●●● diff | view | raw | blame | history
install/tpl/debian_dovecot2.conf.master 1 ●●●●● diff | view | raw | blame | history
install/tpl/debian_postfix.conf.master 2 ●●●●● diff | view | raw | blame | history
install/tpl/fedora_postfix.conf.master 2 ●●●●● diff | view | raw | blame | history
install/tpl/gentoo_postfix.conf.master 2 ●●●●● diff | view | raw | blame | history
install/tpl/jk_init.ini.master 4 ●●●●● diff | view | raw | blame | history
install/tpl/mysql-virtual_forwardings.cf.master 3 ●●●●● diff | view | raw | blame | history
install/tpl/opensuse_postfix.conf.master 2 ●●●●● diff | view | raw | blame | history
install/tpl/opensuse_pureftpd_conf.master 3 ●●●●● diff | view | raw | blame | history
install/uninstall.php 10 ●●●●● diff | view | raw | blame | history
interface/lib/classes/aps_crawler.inc.php 39 ●●●●● diff | view | raw | blame | history
interface/lib/classes/db_mysql.inc.php 3 ●●●●● diff | view | raw | blame | history
interface/lib/classes/functions.inc.php 5 ●●●●● diff | view | raw | blame | history
interface/lib/classes/remoting.inc.php 7 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_actions.inc.php 1 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_base.inc.php 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_tpl_generator.inc.php 4 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tools_monitor.inc.php 4 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_cron.inc.php 2 ●●●●● diff | view | raw | blame | history
interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/system_config.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/remote_user_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/users_user_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_edit_address.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_address.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_a.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_aaaa.tform.php 2 ●●●●● 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 2 ●●●●● 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 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_slave.tform.php 7 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_soa.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_srv.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_txt.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/help/templates/faq_manage_questions_list.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/js/jquery.tipsy.js 864 ●●●●● diff | view | raw | blame | history
interface/web/js/scrigo.js.php 2 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/en.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/form/mail_user.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_user.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_user.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_mailinglist_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_user_mailbox_edit.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/form/mail_user_cc.tform.php 3 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/de_mail_user_cc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/en_mail_user_cc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/mail_user_spamfilter_edit.php 3 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/templates/mail_user_cc_edit.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/templates/mail_user_password_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/aps_install_package.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_vhost_domain.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/shell_user_edit.php 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/database_user_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/ftp_user_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/shell_user_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_folder_user_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_advanced.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/webdav_user_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 43 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/de_resync.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/tools/templates/user_settings.htm 4 ●●●●● diff | view | raw | blame | history
remoting_client/API-docs/sites_database_add.html 1 ●●●●● diff | view | raw | blame | history
remoting_client/API-docs/sites_web_aliasdomain_update.html 1 ●●●●● diff | view | raw | blame | history
remoting_client/API-docs/sites_web_domain_add.html 1 ●●●●● diff | view | raw | blame | history
remoting_client/examples/sites_database_add.php 1 ●●●●● diff | view | raw | blame | history
remoting_client/examples/sites_web_domain_add.php 3 ●●●●● diff | view | raw | blame | history
server/conf/php-fcgi-starter.master 1 ●●●●● diff | view | raw | blame | history
server/conf/php_fpm_pool.conf.master 1 ●●●●● diff | view | raw | blame | history
server/conf/sieve_filter.master 4 ●●●●● diff | view | raw | blame | history
server/conf/sieve_filter_1.2.master 4 ●●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 18 ●●●●● diff | view | raw | blame | history
server/lib/classes/aps_installer.inc.php 4 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/100-monitor_email_quota.inc.php 4 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/100-monitor_raid.inc.php 4 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/300-quota_notify.inc.php 8 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/500-backup.inc.php 3 ●●●●● diff | view | raw | blame | history
server/lib/classes/system.inc.php 39 ●●●●● diff | view | raw | blame | history
server/mods-available/rescue_core_module.inc.php 11 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 4 ●●●●● diff | view | raw | blame | history
server/plugins-available/bind_plugin.inc.php 8 ●●●●● diff | view | raw | blame | history
server/plugins-available/maildeliver_plugin.inc.php 7 ●●●●● diff | view | raw | blame | history
server/plugins-available/maildrop_plugin.inc.php 6 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 1 ●●●●● diff | view | raw | blame | history
server/scripts/create_jailkit_user.sh 6 ●●●●● diff | view | raw | blame | history