Skip to content
  1. Mar 13, 2014
    • Marius Cramer's avatar
      Removed obsolete files merged from stable · 773b716e
      Marius Cramer authored
      773b716e
    • Marius Cramer's avatar
      Merge remote-tracking branch 'origin/stable-3.0.5' · 7c2179f4
      Marius Cramer authored
      Conflicts:
      	interface/lib/lang/de.lng
      	interface/web/admin/lib/lang/ar_server_config.lng
      	interface/web/admin/lib/lang/bg_server_config.lng
      	interface/web/admin/lib/lang/br_server_config.lng
      	interface/web/admin/lib/lang/cz_server_config.lng
      	interface/web/admin/lib/lang/de_server_config.lng
      	interface/web/admin/lib/lang/de_software_package.lng
      	interface/web/admin/lib/lang/de_software_repo.lng
      	interface/web/admin/lib/lang/de_system_config.lng
      	interface/web/admin/lib/lang/de_users.lng
      	interface/web/admin/lib/lang/en_server_config.lng
      	interface/web/admin/lib/lang/es_server_config.lng
      	interface/web/admin/lib/lang/fi_server_config.lng
      	interface/web/admin/lib/lang/fr_server_config.lng
      	interface/web/admin/lib/lang/hr_server_config.lng
      	interface/web/admin/lib/lang/hu_server_config.lng
      	interface/web/admin/lib/lang/id_server_config.lng
      	interface/web/admin/lib/lang/it_server_config.lng
      	interface/web/admin/lib/lang/ja_server_config.lng
      	interface/web/admin/lib/lang/nl_server_config.lng
      	interface/web/admin/lib/lang/pl_server_config.lng
      	interface/web/admin/lib/lang/pt_server_config.lng
      	interface/web/admin/lib/lang/ro_server_config.lng
      	interface/web/admin/lib/lang/ru_server_config.lng
      	interface/web/admin/lib/lang/se_server_config.lng
      	interface/web/admin/lib/lang/sk_server_config.lng
      	interface/web/admin/lib/lang/tr_server_config.lng
      	interface/web/client/lib/lang/de_client.lng
      	interface/web/client/lib/lang/de_client_template.lng
      	interface/web/client/lib/lang/de_reseller.lng
      	interface/web/client/lib/lang/fr_client.lng
      	interface/web/client/lib/lang/fr_reseller.lng
      	interface/web/dns/lib/lang/cz_dns_dkim.lng
      	interface/web/dns/lib/lang/de_dns_a.lng
      	interface/web/dns/lib/lang/de_dns_aaaa.lng
      	interface/web/dns/lib/lang/de_dns_alias.lng
      	interface/web/dns/lib/lang/de_dns_cname.lng
      	interface/web/dns/lib/lang/de_dns_hinfo.lng
      	interface/web/dns/lib/lang/de_dns_mx.lng
      	interface/web/dns/lib/lang/de_dns_ns.lng
      	interface/web/dns/lib/lang/de_dns_ptr.lng
      	interface/web/dns/lib/lang/de_dns_rp.lng
      	interface/web/dns/lib/lang/de_dns_soa.lng
      	interface/web/dns/lib/lang/de_dns_srv.lng
      	interface/web/dns/lib/lang/de_dns_txt.lng
      	interface/web/login/lib/lang/de.lng
      	interface/web/mail/lib/lang/ar_mail_user.lng
      	interface/web/mail/lib/lang/cz_mail_backup_list.lng
      	interface/web/mail/lib/lang/de_mail_get.lng
      	interface/web/mail/lib/lang/es_mail_user.lng
      	interface/web/mail/lib/lang/fi_mail_user.lng
      	interface/web/mail/lib/lang/fr_mail_user.lng
      	interface/web/mail/lib/lang/hr_mail_user.lng
      	interface/web/mail/lib/lang/hu_mail_user.lng
      	interface/web/mail/lib/lang/id_mail_user.lng
      	interface/web/mail/lib/lang/it_mail_user.lng
      	interface/web/mail/lib/lang/ja_mail_user.lng
      	interface/web/mail/lib/lang/nl_mail_user.lng
      	interface/web/mail/lib/lang/pl_mail_user.lng
      	interface/web/mail/lib/lang/pt_mail_user.lng
      	interface/web/mail/lib/lang/ro_mail_user.lng
      	interface/web/mail/lib/lang/ru_mail_user.lng
      	interface/web/mail/lib/lang/se_mail_user.lng
      	interface/web/mail/lib/lang/sk_mail_user.lng
      	interface/web/mail/lib/lang/tr_mail_user.lng
      	interface/web/monitor/lib/lang/de.lng
      	interface/web/sites/form/web_vhost_subdomain.tform.php
      	interface/web/sites/lib/lang/ar_web_vhost_domain.lng
      	interface/web/sites/lib/lang/bg_web_vhost_domain.lng
      	interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/br_web_vhost_domain.lng
      	interface/web/sites/lib/lang/br_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/cz_web_aliasdomain.lng
      	interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
      	interface/web/sites/lib/lang/cz_web_childdomain.lng
      	interface/web/sites/lib/lang/cz_web_childdomain_list.lng
      	interface/web/sites/lib/lang/cz_web_domain.lng
      	interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
      	interface/web/sites/lib/lang/cz_web_domain_list.lng
      	interface/web/sites/lib/lang/cz_web_subdomain.lng
      	interface/web/sites/lib/lang/cz_web_subdomain_list.lng
      	interface/web/sites/lib/lang/cz_web_vhost_domain.lng
      	interface/web/sites/lib/lang/cz_web_vhost_domain_list.lng
      	interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
      	interface/web/sites/lib/lang/de_cron.lng
      	interface/web/sites/lib/lang/de_shell_user.lng
      	interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
      	interface/web/sites/lib/lang/de_web_childdomain.lng
      	interface/web/sites/lib/lang/de_web_subdomain.lng
      	interface/web/sites/lib/lang/de_web_subdomain_list.lng
      	interface/web/sites/lib/lang/de_web_vhost_domain_list.lng
      	interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng
      	interface/web/sites/lib/lang/el_web_vhost_domain.lng
      	interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/en_web_vhost_domain.lng
      	interface/web/sites/lib/lang/es_web_vhost_domain.lng
      	interface/web/sites/lib/lang/es_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/fi_web_vhost_domain.lng
      	interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/fr_web_vhost_domain.lng
      	interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/hr_web_vhost_domain.lng
      	interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/hu_web_vhost_domain.lng
      	interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/id_web_vhost_domain.lng
      	interface/web/sites/lib/lang/id_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/it_web_vhost_domain.lng
      	interface/web/sites/lib/lang/it_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/ja_web_vhost_domain.lng
      	interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/nl_web_vhost_domain.lng
      	interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/pl_web_vhost_domain.lng
      	interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/pt_web_vhost_domain.lng
      	interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/ro_web_vhost_domain.lng
      	interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/ru_web_vhost_domain.lng
      	interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/se_web_vhost_domain.lng
      	interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/sk_web_vhost_domain.lng
      	interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/tr_web_vhost_domain.lng
      	interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng
      	server/mods-available/monitor_core_module.inc.php
      7c2179f4
    • Marius Cramer's avatar
      Merge branch 'master' into 'master' · 478a6a0f
      Marius Cramer authored
      Master
      478a6a0f
    • Till Brehm's avatar
      Merged language files. · dc9e64c6
      Till Brehm authored
      dc9e64c6
    • Till Brehm's avatar
    • Till Brehm's avatar
  2. Mar 12, 2014
  3. Mar 11, 2014
  4. Mar 10, 2014
  5. Mar 09, 2014
  6. Mar 08, 2014
  7. Mar 07, 2014