Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

ISPConfig 3
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

4d6f1cce

Commit 4d6f1cce authored 7 years ago by Marius Burkard

Downloads
- Plain Diff

Merge branch 'stable-3.1' into 'stable-3.1'

use pigz if available for tar-backups and add definable tmp-dir for zip-backups

See merge request ispconfig/ispconfig3!731

parents 3d245ca6 8079c424

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

install/tpl/server.ini.master 1 addition, 0 deletions

install/tpl/server.ini.master
interface/web/admin/form/server_config.tform.php 14 additions, 0 deletions

interface/web/admin/form/server_config.tform.php
interface/web/admin/lib/lang/de_server_config.lng 3 additions, 0 deletions

interface/web/admin/lib/lang/de_server_config.lng
interface/web/admin/lib/lang/en_server_config.lng 3 additions, 0 deletions

interface/web/admin/lib/lang/en_server_config.lng
interface/web/admin/templates/server_config_server_edit.htm 4 additions, 0 deletions

interface/web/admin/templates/server_config_server_edit.htm
server/lib/classes/cron.d/500-backup.inc.php 19 additions, 5 deletions

server/lib/classes/cron.d/500-backup.inc.php
server/lib/classes/cron.d/500-backup_mail.inc.php 19 additions, 5 deletions

server/lib/classes/cron.d/500-backup_mail.inc.php

with 63 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment