Commit 7972151
Marius Cramer
Merge branch 'stable-3.0.5'
Conflicts:
install/autoupdate.php
install/install.php
install/sql/incremental/upd_0078.sql
install/sql/ispconfig3.sql
install/tpl/config.inc.php.master
install/tpl/debian_postfix.conf.master
install/tpl/fedora_postfix.conf.master
install/tpl/gentoo_postfix.conf.master
install/tpl/opensuse_postfix.conf.master
interface/lib/classes/db_mysql.inc.php
interface/lib/classes/remoting.inc.php
interface/lib/classes/tform.inc.php
interface/lib/classes/validate_reseller.inc.php
interface/lib/config.inc.php
interface/lib/lang/es.lng
interface/web/admin/lib/lang/de_server_config.lng
interface/web/admin/lib/lang/en_server_config.lng
interface/web/admin/lib/lang/es_server_config.lng
interface/web/admin/lib/lang/fr_server_config.lng
interface/web/admin/lib/lang/hr_server_config.lng
interface/web/dns/lib/lang/hr_dns_wizard.lng
interface/web/mail/lib/lang/hr_mail_user.lng
interface/web/mail/mail_domain_edit.php
interface/web/mail/mail_user_edit.php
interface/web/remote/index.php
interface/web/sites/database_edit.php
interface/web/sites/form/database.tform.php
interface/web/sites/form/web_vhost_subdomain.tform.php
interface/web/sites/lib/lang/ar_web_childdomain_list.lng
interface/web/sites/lib/lang/ar_web_vhost_domain_list.lng
interface/web/sites/lib/lang/cz_web_childdomain.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_subdomain_list.lng
interface/web/sites/lib/lang/de_ftp_user.lng
interface/web/sites/lib/lang/de_shell_user.lng
interface/web/sites/lib/lang/en_ftp_user.lng
interface/web/sites/lib/lang/en_web_childdomain.lng
interface/web/sites/lib/lang/en_web_domain.lng
interface/web/sites/lib/lang/es_ftp_user.lng
interface/web/sites/lib/lang/es_shell_user.lng
interface/web/sites/lib/lang/es_web_domain.lng
interface/web/sites/lib/lang/fr_web_subdomain.lng
interface/web/sites/lib/lang/hr_web_aliasdomain.lng
interface/web/sites/lib/lang/hr_web_subdomain.lng
interface/web/sites/lib/lang/hr_web_subdomain_list.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/hr_web_vhost_subdomain_list.lng
interface/web/sites/lib/lang/se_web_subdomain.lng
interface/web/sites/lib/lang/se_web_subdomain_list.lng
interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
interface/web/sites/web_aliasdomain_edit.php
interface/web/sites/web_domain_edit.php
interface/web/sites/web_vhost_subdomain_edit.php
interface/web/themes/blue/ispconfig_version
interface/web/themes/default-304/templates/admin/server_config_mail_edit.htm
interface/web/themes/default-304/templates/admin/system_config_sites_edit.htm
interface/web/themes/default-304/templates/dns/dns_wizard.htm
interface/web/themes/default-304/templates/mail/spamfilter_config_mail_edit.htm
interface/web/themes/default-304/templates/sites/web_vhost_subdomain_advanced.htm
interface/web/themes/default-304/templates/sites/web_vhost_subdomain_backup.htm
interface/web/themes/default-304/templates/sites/web_vhost_subdomain_redirect.htm
interface/web/themes/default-304/templates/sites/web_vhost_subdomain_ssl.htm
interface/web/themes/default-304/templates/sites/web_vhost_subdomain_stats.htm
server/conf/vhost.conf.master
server/cron_daily.php
server/lib/classes/db_mysql.inc.php
server/mods-available/monitor_core_module.inc.phpFile tree
2,651 files changed
+12873
-25594
lines changed- docs/autoinstall_samples
- install
- dist/lib
- lib
- sql
- incremental
- tpl
- interface
- lib
- classes
- IDS
- Caching
- Config
- Filter
- remote.d
- lang
- plugins
- temp
- web
- admin
- form
- lib/lang
- templates
- client
- lib/lang
- templates
- dashboard
- dashlets
- lib/lang
- designer
- form
- lib
- lang
- list
- templates
- dns
- lib/lang
- list
- templates
- help/lib/lang
- js
- login
- lib/lang
- templates
- mailuser
- lib/lang
- mail
- form
- lib/lang
- monitor/lib/lang
- remote
- sites
- form
- lib/lang
- strengthmeter/lib/lang
- themes
- blue/templates
- default-304
- css
- patches
- print
- screen
- redmond
- images
- icons
- x12
- x16-list
- x16
- x32
- x64
- images
- templates
- admin
- client
- dashboard
- dashlets
- designer
- dns
- help
- login
- mailuser
- mail
- monitor
- sites
- tools
- vm
- yaml
- core
- debug
- images
- patches
- print
- screen
- default_combobox/templates
- default/templates
- tools
- lib/lang
- vm/lib/lang
- remoting_client/examples
- security
- data
- server
- conf
- lib
- classes
- cron.d
- mods-available
- plugins-available
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
2,651 files changed
+12873
-25594
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
0 commit comments