ISPConfig3 devel
parent: 015dff | patch | commitdiff
Marius Cramer
2013-11-20 1a2cbfbf0cd666af05c28c3a7e51de3fb59bdd99
refs
author Marius Cramer <m.cramer@pixcept.de>
Wednesday, November 20, 2013 03:34 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Wednesday, November 20, 2013 03:34 -0500
commit1a2cbfbf0cd666af05c28c3a7e51de3fb59bdd99
tree aa789659c3c591532c303ec7e0cdc300541a0418 tree | zip | gz
parent 015dffdc589b396d72092583cc526674f0a9a8d5 view | diff
c02d3f0464b0e7faa50ddd2ed2a20fe88cd60845 view | diff 
Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	interface/lib/classes/tform.inc.php
	interface/web/admin/lib/lang/de_directive_snippets.lng
	interface/web/dns/dns_import.php
	interface/web/dns/dns_soa_edit.php
	interface/web/dns/dns_wizard.php
	interface/web/mail/mail_domain_edit.php
	interface/web/sites/database_edit.php
	interface/web/sites/lib/lang/de_web_domain.lng
	interface/web/sites/lib/lang/en_web_domain.lng
	interface/web/sites/web_domain_edit.php
	server/server.php
100 files modified
797 ■■■■■ changed files
interface/lib/classes/aps_crawler.inc.php 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/aps_guicontroller.inc.php 20 ●●●●● diff | view | raw | blame | history
interface/lib/classes/auth.inc.php 7 ●●●●● diff | view | raw | blame | history
interface/lib/classes/client_templates.inc.php 12 ●●●●● diff | view | raw | blame | history
interface/lib/classes/custom_datasource.inc.php 14 ●●●●● diff | view | raw | blame | history
interface/lib/classes/db_mysql.inc.php 13 ●●●●● diff | view | raw | blame | history
interface/lib/classes/form.inc.php 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/plugin_backuplist.inc.php 4 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform.inc.php 5 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_actions.inc.php 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_client.inc.php 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_dns.inc.php 4 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_domain.inc.php 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_directive_snippets.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_directive_snippets.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/login_as.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/remote_action_ispcupdate.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/remote_action_osupdate.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/server_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/server_ip_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/server_php_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/software_package_install.php 10 ●●●●● diff | view | raw | blame | history
interface/web/admin/software_package_list.php 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/software_update_list.php 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/system_config_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/directive_snippets_edit.htm 21 ●●●●● diff | view | raw | blame | history
interface/web/admin/users_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/client/client_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/client/client_message.php 2 ●●●●● diff | view | raw | blame | history
interface/web/client/reseller_edit.php 8 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/dashlets/limits.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/dashlets/mailquota.php 2 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/dashlets/quota.php 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_a_edit.php 6 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_aaaa_edit.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_alias_edit.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_cname_edit.php 6 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_hinfo_edit.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_import.php 18 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_mx_edit.php 8 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_ns_edit.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_ptr_edit.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_rp_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_slave_edit.php 8 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_soa_edit.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_srv_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_txt_edit.php 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_wizard.php 18 ●●●●● diff | view | raw | blame | history
interface/web/help/faq_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/help/support_message_edit.php 6 ●●●●● diff | view | raw | blame | history
interface/web/help/support_message_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_alias_edit.php 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_aliasdomain_edit.php 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_blacklist_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_catchall_edit.php 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_edit.php 18 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_forward_edit.php 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_get_edit.php 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_mailinglist_edit.php 16 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_spamfilter_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_transport_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_user_edit.php 12 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_user_filter_edit.php 158 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_user_stats.php 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_whitelist_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/spamfilter_blacklist_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/spamfilter_config_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/spamfilter_policy_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/spamfilter_users_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/spamfilter_whitelist_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/index.php 4 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/mail_user_filter_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/mail_user_filter_list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/mail_user_password_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/mail_user_spamfilter_edit.php 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/ajax_get_json.php 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/cron_edit.php 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_edit.php 20 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_user_edit.php 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/ftp_user_edit.php 22 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_domain.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_domain.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/shell_user_edit.php 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_domain_advanced.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_aliasdomain_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_domain_del.php 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_domain_edit.php 50 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_sites_stats.php 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_subdomain_edit.php 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_subdomain_del.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_subdomain_edit.php 20 ●●●●● diff | view | raw | blame | history
interface/web/tools/dns_import_tupa.php 22 ●●●●● diff | view | raw | blame | history
interface/web/tools/user_settings.php 10 ●●●●● diff | view | raw | blame | history
interface/web/vm/openvz_action.php 4 ●●●●● diff | view | raw | blame | history
interface/web/vm/openvz_template_edit.php 8 ●●●●● diff | view | raw | blame | history
interface/web/vm/openvz_vm_edit.php 12 ●●●●● diff | view | raw | blame | history
server/lib/classes/plugins.inc.php 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 3 ●●●●● diff | view | raw | blame | history
server/plugins-available/shelluser_base_plugin.inc.php 22 ●●●●● diff | view | raw | blame | history
server/server.php 4 ●●●●● diff | view | raw | blame | history