Commits · master · ISPConfig / ISPConfig 3

20 Apr, 2018 2 commits
- Merge branch 'master' into 'master' · 285cbd66
```
Add shell script example

See merge request !769
```
  Till Brehm authored Apr 20, 2018
  285cbd66 Browse Files
- Add shell script example · 7873050d
  Johan Ehnberg authored Apr 20, 2018
  
  7873050d Browse Files
12 Apr, 2018 3 commits
- Merge branch 'fix_servers_client_select' into 'master' · a07267aa
```
Server select fixes (only one selectable when more servers where appointed) Fixes #4725

Closes #4725

See merge request !755
```
  Till Brehm authored Apr 12, 2018
  a07267aa Browse Files
- Renamed ubuntu1804.conf to ubuntu1804.conf.php · de6860bb
  Till Brehm authored Apr 12, 2018
  
  de6860bb Browse Files
- Merge branch 'patch-1' into 'master' · d05d23d7
```
Add new install dist conf file to support Ubuntu 18.04 (Bionic Beaver)

See merge request !767
```
  Till Brehm authored Apr 12, 2018
  d05d23d7 Browse Files
09 Apr, 2018 1 commit
- Merge branch 'master' into 'master' · 4d84ee0d
```
Master

See merge request !768
```
  Till Brehm authored Apr 09, 2018
  4d84ee0d Browse Files
08 Apr, 2018 2 commits
- Update 100-monitor_raid.inc.php · 23c86135
  Alexandre authored Apr 08, 2018
  
  23c86135 Browse Files
- Update 100-monitor_raid.inc.php · 210fa38c
  Alexandre authored Apr 08, 2018
  
  210fa38c Browse Files
31 Mar, 2018 1 commit
- Add new file to support Ubuntu 18.04 (Bionic Beaver) · 5ba46db6
  Hj Ahmad Rasyid Hj Ismail authored Mar 31, 2018
  
  5ba46db6 Browse Files
27 Mar, 2018 2 commits
- Merge branch 'patch-1' into 'master' · 2910de64
```
Fix #select_server a that is affected by #sidebar a padding of 10px.

See merge request !766
```
  Till Brehm authored Mar 27, 2018
  2910de64 Browse Files
- Fix #select_server a that is affected by #sidebar a padding of 10px. · 6a04558f
  Hj Ahmad Rasyid Hj Ismail authored Mar 27, 2018
  
  6a04558f Browse Files
25 Mar, 2018 2 commits
- Merge branch 'master' into 'master' · 979ef41d
```
Add upload component to ssl and status

See merge request !765
```
  Till Brehm authored Mar 25, 2018
  979ef41d Browse Files
- Add upload component to ssl and status · 130e30de
  Michael Fürmann authored Mar 25, 2018
  
  130e30de Browse Files
22 Mar, 2018 2 commits
- Merge branch 'master' into 'master' · ade8dcd2
```
Added very simple LSI PERC H200 check using sas2ircu tool.

See merge request !764
```
  Till Brehm authored Mar 22, 2018
  ade8dcd2 Browse Files
- Added very simple LSI PERC H200 check using sas2ircu tool. · 4987f38d
  James.Sanders authored Mar 22, 2018
  
  4987f38d Browse Files
20 Mar, 2018 1 commit
- Merge branch 'patch-2' into 'master' · b10d02ff
```
Update ids.whitelist

See merge request !762
```
  Till Brehm authored Mar 20, 2018
  b10d02ff Browse Files
19 Mar, 2018 4 commits
- Update ids.whitelist · e45c8e22
  Jesse Norell authored Mar 20, 2018
  
  e45c8e22 Browse Files
- Update ids.whitelist · 803e968a
```
I've had hits for legitimate traffic on these fields.
```
  Jesse Norell authored Mar 20, 2018
  803e968a Browse Files
- Merge branch 'master' into 'master' · d3d64565
```
XMPP Service with prosody

See merge request !759
```
  Till Brehm authored Mar 19, 2018
  d3d64565 Browse Files
- Merge branch 'fastcgi_server_name' into 'master' · d375fad3
```
Add seo target domain as fcgi server_name

See merge request !760
```
  Till Brehm authored Mar 19, 2018
  d375fad3 Browse Files
18 Mar, 2018 1 commit
- Merge branch 'patch-1' into 'master' · fc0cea8f
```
Update rest_example.php

See merge request !758
```
  Till Brehm authored Mar 18, 2018
  fc0cea8f Browse Files
16 Mar, 2018 1 commit
- Add seo target as server_name · 1aaf919a
  Qroac authored Mar 16, 2018
  
  1aaf919a Browse Files
09 Mar, 2018 3 commits
- Purge data of deleted users and domains · 95fa12f8
  Michael Fürmann authored Mar 10, 2018
  
  95fa12f8 Browse Files
- Added configuration for webpresence and http_upload · e68211cf
  Michael Fürmann authored Mar 09, 2018
  
  e68211cf Browse Files
- Update rest_example.php · 7961b975
  batgau authored Mar 09, 2018
  
  7961b975 Browse Files
06 Mar, 2018 1 commit
- Host setup compliant for Conversations · 95fa2f04
  Michael Fürmann authored Mar 06, 2018
  
  95fa2f04 Browse Files
05 Mar, 2018 1 commit

Merge branch 'master' into 'master' · 5ec4cf10

Dmarc editing bug (missing checkbox) Fixes #4592

Closes #4592, #4529, and #4386

See merge request !754

authored Mar 05, 2018

5ec4cf10 Browse Files

04 Mar, 2018 1 commit
- Setup routine for prosody · 23216f74
  Michael Fürmann authored Mar 04, 2018
  
  23216f74 Browse Files
02 Mar, 2018 6 commits
- Merge branch 'stable-3.1' · 7a2f3234
  Marius Burkard authored Mar 02, 2018
  
  7a2f3234 Browse Files
- - fixed htpasswd path for nginx awstats, fixes #4937 · 6165e36f
  Marius Burkard authored Mar 02, 2018
  
  6165e36f Browse Files
- - replace server_id in gentoo dovecot sql config, fixes #4926 · 542eb1da
  Marius Burkard authored Mar 02, 2018
  
  542eb1da Browse Files
- - adjusted amavis config for gentoo, fixes #4925 · ca9f5ab9
  Marius Burkard authored Mar 02, 2018
  
  ca9f5ab9 Browse Files
- - return instance id on APS install through API, fixes #4933 · 0fd1cec1
```
- fixed backups not downloadable on multiserver slave, fixes #4973
```
  Marius Burkard authored Mar 02, 2018
  0fd1cec1 Browse Files
- - added --no-check-certificate to wget on web cron, fixes #4960 · 616db814
  Marius Burkard authored Mar 02, 2018
  
  616db814 Browse Files
01 Mar, 2018 4 commits
- Server select fixes (only one selectable when more servers where appointed) Fixes #4725 · 492fb7a9
  Pascal Dreissen authored Mar 01, 2018
  
  492fb7a9 Browse Files
- Merge branch 'revert-76fab21b' into 'master' · 060c00d3
```
Revert "Merge branch 'applemooz_master' into 'master'"

See merge request pdreissen/ispconfig3!46
```
  Pascal Dreissen authored Mar 01, 2018
  060c00d3 Browse Files
- Revert "Merge branch 'applemooz_master' into 'master'" · 36aa7bd2
```
This reverts commit 76fab21b
```
  Pascal Dreissen authored Mar 01, 2018
  36aa7bd2 Browse Files
- Merge branch 'applemooz_master' into 'master' · 76fab21b
```
# Conflicts:
#   install/tpl/apache_ispconfig.vhost.master
```
  Pascal Dreissen authored Mar 01, 2018
  76fab21b Browse Files
28 Feb, 2018 2 commits
- Dmarc editing bug (missing checkbox) Fixes #4592 · 72cd6fbd
  Pascal Dreissen authored Feb 28, 2018
  
  72cd6fbd Browse Files
- Merge branch 'master_develop' into 'master' · 6f4ac3d3
```
Check for http2 existance due to specific http2 configuration. Fixes #4969 and skip aps_packages folder during backup (update)

Closes #4969

See merge request !752
```
  Till Brehm authored Feb 28, 2018
  6f4ac3d3 Browse Files