ISPConfig3 devel
parent: 2c1a63 | patch | commitdiff
Marius Cramer
2015-06-02 464a8c61bbb3062eea1f42b4e59adb57e45ef277
refs
author Marius Cramer <m.cramer@pixcept.de>
Tuesday, June 2, 2015 09:11 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Tuesday, June 2, 2015 09:11 -0400
commit464a8c61bbb3062eea1f42b4e59adb57e45ef277
tree b0c61a0a73aeb98733044e3a6f09e36441d0eed7 tree | zip | gz
parent 2c1a639ca242bd8f6d2d4a6e24122962153bf3d3 view | diff
6f2d95f4f36043e38b14599f5878af320566f8f4 view | diff 
Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
30 files modified
53 files added
970 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 15 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 19 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_ip_map.tform.php 92 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ar_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ar_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/bg_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/bg_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/br_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/br_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/cz_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/cz_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fi_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fi_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fr_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fr_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hr_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hr_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hu_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hu_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/id_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/id_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ja_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ja_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/nl_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/nl_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pl_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pl_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pt_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pt_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ro_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ro_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ru_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ru_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/se_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/se_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/sk_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/sk_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/tr_server_ip_map.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/tr_server_ip_map_list.lng 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/module.conf.php 5 ●●●●● diff | view | raw | blame | history
interface/web/admin/list/server_ip_map.list.php 62 ●●●●● diff | view | raw | blame | history
interface/web/admin/server_ip_map_del.php 44 ●●●●● diff | view | raw | blame | history
interface/web/admin/server_ip_map_edit.php 108 ●●●●● diff | view | raw | blame | history
interface/web/admin/server_ip_map_list.php 46 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_ip_map_edit.htm 44 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_ip_map_list.htm 49 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ar_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/bg_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/br_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/cz_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fi_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/hr_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/hu_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/id_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/it_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ja_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/nl_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/pl_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/pt_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ro_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ru_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/se_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/sk_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/tr_dns_dmarc.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_dmarc_edit.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_spf_edit.htm 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 9 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 11 ●●●●● diff | view | raw | blame | history
server/plugins-available/postfix_server_plugin.inc.php 4 ●●●●● diff | view | raw | blame | history