Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: interface/lib/classes/remoting.inc.php interface/lib/classes/remoting_lib.inc.php interface/lib/classes/tform.inc.php interface/web/admin/lib/lang/de_server_config.lng interface/web/admin/lib/lang/de_system_config.lng interface/web/admin/lib/lang/en_server_config.lng interface/web/client/lib/lang/en_client.lng interface/web/client/lib/lang/en_reseller.lng interface/web/login/lib/lang/de.lng interface/web/mail/form/mail_user.tform.php interface/web/mail/lib/lang/de_mail_user.lng interface/web/mail/lib/lang/en_mail_user.lng interface/web/sites/lib/lang/de_web_domain.lng interface/web/sites/lib/lang/de_web_vhost_subdomain.lng interface/web/sites/web_domain_edit.php server/cron_daily.php server/plugins-available/backup_plugin.inc.php
Showing
- install/lib/install.lib.php 2 additions, 0 deletionsinstall/lib/install.lib.php
- install/sql/ispconfig3.sql 11 additions, 1 deletioninstall/sql/ispconfig3.sql
- install/tpl/apache_apps.vhost.master 5 additions, 2 deletionsinstall/tpl/apache_apps.vhost.master
- install/tpl/server.ini.master 2 additions, 0 deletionsinstall/tpl/server.ini.master
- install/tpl/system.ini.master 5 additions, 0 deletionsinstall/tpl/system.ini.master
- interface/lib/app.inc.php 26 additions, 1 deletioninterface/lib/app.inc.php
- interface/lib/classes/aps_guicontroller.inc.php 1 addition, 0 deletionsinterface/lib/classes/aps_guicontroller.inc.php
- interface/lib/classes/ispcmail.inc.php 2 additions, 2 deletionsinterface/lib/classes/ispcmail.inc.php
- interface/lib/classes/session.inc.php 38 additions, 10 deletionsinterface/lib/classes/session.inc.php
- interface/lib/config.inc.php 2 additions, 2 deletionsinterface/lib/config.inc.php
- interface/web/admin/form/server_config.tform.php 14 additions, 0 deletionsinterface/web/admin/form/server_config.tform.php
- interface/web/admin/form/system_config.tform.php 42 additions, 0 deletionsinterface/web/admin/form/system_config.tform.php
- interface/web/admin/lib/lang/de_server_config.lng 2 additions, 1 deletioninterface/web/admin/lib/lang/de_server_config.lng
- interface/web/admin/lib/lang/de_system_config.lng 6 additions, 0 deletionsinterface/web/admin/lib/lang/de_system_config.lng
- interface/web/admin/lib/lang/en_server_config.lng 2 additions, 0 deletionsinterface/web/admin/lib/lang/en_server_config.lng
- interface/web/admin/lib/lang/en_system_config.lng 6 additions, 0 deletionsinterface/web/admin/lib/lang/en_system_config.lng
- interface/web/admin/system_config_edit.php 5 additions, 2 deletionsinterface/web/admin/system_config_edit.php
- interface/web/admin/templates/server_config_server_edit.htm 10 additions, 0 deletionsinterface/web/admin/templates/server_config_server_edit.htm
- interface/web/admin/templates/system_config_misc_edit.htm 23 additions, 1 deletioninterface/web/admin/templates/system_config_misc_edit.htm
- interface/web/client/client_edit.php 41 additions, 1 deletioninterface/web/client/client_edit.php
Loading
Please register or sign in to comment