Commits · 7b4df68ebbfa7edd70bc5c560c4d8aa0780e8a5b · ISPConfig / ISPConfig 3

Feb 06, 2016
- ISPConfig coding guidelines · 7b4df68e
  Marius Burkard authored Feb 06, 2016
  
  7b4df68e
Feb 05, 2016

Allow HTML based welcome messages · be2cd735

Daniel Steglich authored Feb 05, 2016

In addition to /conf-custom/mail/welcome_email_DOMAINNAME.txt and /conf-custom/mail/welcome_email_LANGUAGE.txt one may place a /conf-custom/mail/welcome_email_DOMAINNAME.html or /conf-custom/mail/welcome_email_LANGUAGE.html file to allow HTML based welcome messages.

be2cd735

Feb 04, 2016
- Merge branch 'stable-3.1' · eca13b96
  Marius Burkard authored Feb 04, 2016
  
  eca13b96
- - switch password field to hidden on input (Fixes #3401) · a6e53043
  Marius Burkard authored Feb 04, 2016
  
  a6e53043
- - redirect md5sum STDERR to /dev/null (Fixes #3383) · cffa2fa2
  Marius Burkard authored Feb 04, 2016
  
  cffa2fa2
- Fixes #3396 · c7654c48
  Marius Burkard authored Feb 04, 2016
  
  c7654c48
- - removed subject header from notifications (Fixes #3319) · b31c1492
  Marius Burkard authored Feb 04, 2016
  
  b31c1492
- Merge branch 'stable-3.1' · 0c6ca563
  Marius Burkard authored Feb 04, 2016
  
  0c6ca563
- - made state, locality, organization and organization unit optional on ssl creation (Fixes #2811) · 2436971b
  Marius Burkard authored Feb 04, 2016
  
  2436971b
- Merge branch 'stable-3.1' · 22efd48f
  Marius Burkard authored Feb 04, 2016
  
  22efd48f
- - don't change admin count in security check on failed query · cd50a4c3
  Marius Burkard authored Feb 04, 2016
```
Fixes ispconfig/ispconfig3#3645
```
  cd50a4c3
- added missing tables to client_delete function - Closes #3712 · c795dfd6
  Marius Burkard authored Feb 04, 2016
  
  c795dfd6
- Merge branch 'stable-3.1' · b973ff12
  Marius Burkard authored Feb 04, 2016
  
  b973ff12
Feb 03, 2016
- Added Readme file. · e36880df
  Till Brehm authored Feb 03, 2016
  
  e36880df
- Add license · 7d6317d6
  Till Brehm authored Feb 03, 2016
  
  7d6317d6
Jan 31, 2016
- Fixed issue in updater for git-stable mode. · 99768b5e
  Till Brehm authored Jan 31, 2016
  
  99768b5e
- Updated and merged language files. · 40700364
  Till Brehm authored Jan 31, 2016
  
  40700364
- Improved Log view in Monitor. · a8177a49
  Till Brehm authored Jan 31, 2016
  
  a8177a49
- Fixeed UI issues in Monitor module. · 942a6075
  Till Brehm authored Jan 31, 2016
  
  942a6075
- Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1 · 7e0103f9
  Till Brehm authored Jan 31, 2016
  
  7e0103f9
- - fixed upload form problem (CSRF and message) · d82de9c3
  Marius Burkard authored Jan 31, 2016
  
  d82de9c3
- Updated version number to 3.1a1. · ddb08644
  Till Brehm authored Jan 31, 2016
  
  ddb08644
- Merge branch 'stable-3.1' · 3117f2e7
  Marius Burkard authored Jan 31, 2016
  
  3117f2e7
- Fixed typo in HTML code of client and reseller form. · 06a34758
  Till Brehm authored Jan 31, 2016
  
  06a34758
- Improved server config form. · 874c6802
  Till Brehm authored Jan 31, 2016
  
  874c6802
- Added: FS#3807 - Add NE Flag to seo redirects in apache · 6acf3242
  Till Brehm authored Jan 31, 2016
  
  6acf3242
- Added: FS#2686 - set mod_fcgi max request len automatically during install · ef561f7c
  Till Brehm authored Jan 31, 2016
  
  ef561f7c
- Added "X-Content-Type-Options: nosniff" header. · 467f40ce
  Till Brehm authored Jan 31, 2016
  
  467f40ce
- Added: FS#2589 - User Mail Filter tracing patch · dee5898d
  Till Brehm authored Jan 31, 2016
  
  dee5898d
- Implemented: FS#435 - Stats icon for domains under Sites · bf4b951d
  Till Brehm authored Jan 31, 2016
  
  bf4b951d
- Improved client message form. · ff4da3ed
  Till Brehm authored Jan 31, 2016
  
  ff4da3ed
- Added improved generate password buttons in reseller and client forms. · dfa9f540
  Till Brehm authored Jan 31, 2016
  
  dfa9f540
- Fixed: FS#3933 - Invalid sendmail "from" in php_fpm_pool.conf.master · a538a121
  Till Brehm authored Jan 31, 2016
  
  a538a121
- Added support for git-stable branch (currently stable-3.1 branch) in ISPConfig... · 299f8ebf
  Till Brehm authored Jan 31, 2016
```
Added support for git-stable branch (currently stable-3.1 branch) in ISPConfig update script for easier development and testing.
```
  299f8ebf
- Fixed: FS#4077 - php update.php --autoinstall=autoinstall.conf.php does not run non-interactive · 6368225a
  Till Brehm authored Jan 31, 2016
  
  6368225a
- Add code to recognize Ubuntu 15.10 in installer and monitor. · 0a0647df
  Till Brehm authored Jan 31, 2016
  
  0a0647df
Jan 30, 2016
- Merge branch 'master' into 'stable-3.1' · f686264a
  Marius Burkard authored Jan 30, 2016
```
Master



See merge request !274
```
  f686264a
Jan 29, 2016
- fixed reconfigure services during update · cffef259
  Florian Schaal authored Jan 29, 2016
  
  cffef259
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · 52e1a987
  Florian Schaal authored Jan 29, 2016
  
  52e1a987
- Merge branch 'stable-3.1' · f611abe1
  Marius Burkard authored Jan 29, 2016
  
  f611abe1