Commits · 229a3f0989ef0371e1aa89ff06828dd2cd36e812 · ISPConfig / ISPConfig 3

Jul 18, 2016
- Prevent password managers to overwrite passwords in reseller / client and... · 229a3f09
  Pascal Dreissen authored Jul 19, 2016
```
Prevent password managers to overwrite passwords in reseller / client and mailbox edit screen (fixes #4030)
```
  229a3f09
Jul 12, 2016
- Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1 · 28ad72e0
  Marius Burkard authored Jul 12, 2016
  
  28ad72e0
- Fixed loading indicator (missing css/img), fixed #4018 · 575df561
  Marius Burkard authored Jul 12, 2016
  
  575df561
Jul 11, 2016
- Merge branch 'dutch-language' into 'stable-3.1' · 2258502d
  Till Brehm authored Jul 11, 2016
```
More dutch language adjustments



See merge request !375
```
  2258502d
- Merge branch 'master' into 'stable-3.1' · 8e7f8974
  Till Brehm authored Jul 11, 2016
```
Master



See merge request !376
```
  8e7f8974
- Merge branch 'spamfilter-delete-fix' into 'stable-3.1' · a62af307
  Till Brehm authored Jul 11, 2016
```
Fixed deleting spamfilter users when deleting mail domain

Signed-off-by: Kristián Feldsam <feldsam@gmail.com>

See merge request !377
```
  a62af307
Jul 10, 2016
- Fixed deleting spamfilter users when deleting mail domain · fb024aaf
  Kristián Feldsam authored Jul 07, 2016
```
Signed-off-by: Kristián Feldsam <feldsam@gmail.com>

# Conflicts:
#	interface/web/mail/mail_domain_del.php
```
  fb024aaf
- disallow underscore in maildomain-names · 1fad40ca
  Florian Schaal authored Jul 10, 2016
  
  1fad40ca
- Merge branch 'stable-3.1' · e1ceb050
  Marius Burkard authored Jul 10, 2016
  
  e1ceb050
- - replace *:* by 127.0.0.1:* in amavis config · 58b8f2bf
  Marius Burkard authored Jul 10, 2016
  
  58b8f2bf
- More dutch language adjustments · 11fd5d08
  Pascal Dreissen authored Jul 10, 2016
  
  11fd5d08
Jul 09, 2016
- Merge branch 'dutch-language' into 'stable-3.1' · 5693ad5e
  Till Brehm authored Jul 09, 2016
```
Dutch language adjustments



See merge request !372
```
  5693ad5e
Jul 08, 2016
- Dutch language adjustments for Interface and Mail · 46d2d1a9
  Pascal Dreissen authored Jul 08, 2016
  
  46d2d1a9
- More dutch language adjustment for dashboard / dns / clients / sites · 7e24fd5e
  Pascal Dreissen authored Jul 08, 2016
  
  7e24fd5e
- - prevent issue when using smtp binding in postfix · 73c2f4f9
  Marius Burkard authored Jul 08, 2016
  
  73c2f4f9
- Dashboard / DNS and Login dutch language ajdustments. · 173afc3e
  Pascal Dreissen authored Jul 08, 2016
  
  173afc3e
- more dutch language adjustments. · a2401ddb
  Pascal Dreissen authored Jul 08, 2016
  
  a2401ddb
- Merge branch 'fix-3984' into 'stable-3.1' · 9bcd2fd5
  Marius Burkard authored Jul 08, 2016
```
vhost quota not correctly pointing to document root (DF -T) (fixes #3984)



See merge request !370
```
  9bcd2fd5
- several updates on dutch language files · 505fc4fe
  Pascal Dreissen authored Jul 08, 2016
  
  505fc4fe
- escapeshellarg document root for security reasons (fixes #3984) · e8dda462
  Pascal Dreissen authored Jul 08, 2016
  
  e8dda462
- Merge branch 'dashboard-quota-tooltips' into 'stable-3.1' · a2681500
  Marius Burkard authored Jul 08, 2016
```
Dashboard quota tooltips (on used percentage only, so absolute number is visible within tooltip)



See merge request !371
```
  a2681500
- cron_plugin.inc.php $document root fix for quota · ff26b450
  Pascal Dreissen authored Jul 08, 2016
  
  ff26b450
- Database quota fix % lost in change · f1193b43
  Pascal Dreissen authored Jul 08, 2016
  
  f1193b43
- Tooltips on used percentage within Dashboard · c959635e
  Pascal Dreissen authored Jul 08, 2016
  
  c959635e
- vhost quota not correctly pointing to document root (DF -T) (fixes #3984) · a481a62a
  Pascal Dreissen authored Jul 08, 2016
  
  a481a62a
- Merge branch 'revert-7827db36' into 'stable-3.1' · 6a00e0d4
  Pascal Dreissen authored Jul 08, 2016
```
Revert "vhost quota not correctly pointing to document root (DF -T) fixes #3984"

This reverts commit 7827db36

See merge request !2
```
  6a00e0d4
- Revert "vhost quota not correctly pointing to document root (DF -T) fixes #3984" · 3dfce626
  Pascal Dreissen authored Jul 08, 2016
```
This reverts commit 7827db36
```
  3dfce626
- vhost quota not correctly pointing to document root (DF -T) fixes #3984 · 7827db36
  Pascal Dreissen authored Jul 08, 2016
  
  7827db36
Jul 06, 2016
- Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1 · 993d8282
  Till Brehm authored Jul 06, 2016
  
  993d8282
- Fixed permission issue of bin directory in on latest Debian in chroot jails. · e37c4206
  Till Brehm authored Jul 06, 2016
  
  e37c4206
- Fixed issue in SQL lib. · 3560c8d8
  Till Brehm authored Jul 06, 2016
  
  3560c8d8
Jul 05, 2016
- Merge branch 'stable-3.1' · 16517750
  Marius Burkard authored Jul 05, 2016
  
  16517750
- Merge branch 'missing_fonts' into 'stable-3.1' · a666126a
  Marius Burkard authored Jul 05, 2016
```
Missing glyphicon fonts (fixes #3981, #3886)



See merge request !368
```
  a666126a
- Merge branch 'stable-3.1' · ec063433
  Marius Burkard authored Jul 05, 2016
  
  ec063433
- Merge branch 'missing_fonts' into 'stable-3.1' · 1a485fd6
  Pascal Dreissen authored Jul 05, 2016
```
Missing glyphicon fonts (fixes #3981, #3886)



See merge request !1
```
  1a485fd6
- Missing glyphicon fonts (fixes #3981, #3886) · e8275798
  Pascal Dreissen authored Jul 05, 2016
  
  e8275798
- Merge branch 'stable-3.1' into 'stable-3.1' · 3cc04cc5
  Marius Burkard authored Jul 05, 2016
```
Forgot one template for tooltips as mentioned in: https://git.ispconfig.org/ispc…

…onfig/ispconfig3/issues/3995

See merge request !367
```
  3cc04cc5
- Forgot one template for tooltips as mentioned in:... · 6b42bfd0
  Pascal Dreissen authored Jul 05, 2016
```
Forgot one template for tooltips as mentioned in: #3995
```
  6b42bfd0
- Merge branch 'stable-3.1' into 'stable-3.1' · 72cefc43
  Marius Burkard authored Jul 05, 2016
```
Tooltips on several templates



See merge request !366
```
  72cefc43
- Move tooltip js to global javascript library · d75040c9
  Pascal Dreissen authored Jul 05, 2016
  
  d75040c9