Commits · 146783b0c7eaa828434f06d500abce07afbd1ea5 · Zvonimir / ISPConfig 3

Oct 21, 2013
- Changed all windows line breaks to unix line breaks (coding guidelines!) · 146783b0
  Marius Cramer authored Oct 21, 2013
  
  146783b0
Oct 16, 2013
- - Added possibility to delete pre-defined locations with the "##delete##" string. For example, · aeb810f5
  Falko Timme authored Oct 16, 2013
```
location ~ \.php$ { ##delete##
}

will delete the pre-defined

location ~ \.php$

location.
```
  aeb810f5
Oct 14, 2013
- Copied files from svn 3.0.5 stable branch (git migration) · 992797f7
  Marius Cramer authored Oct 14, 2013
  
  992797f7
Aug 21, 2013
- Merged revisions 4069-4117 from stable branch. · 7b47c0aa
  tbrehm authored Aug 21, 2013
  
  7b47c0aa
Jul 31, 2013
- Merged revisions 3960-4065 from stable branch. · 615a0a96
  tbrehm authored Jul 31, 2013
  
  615a0a96
Apr 19, 2013
- Merged revisions 3922-3958 from stable branch. · 3f478f7b
  tbrehm authored Apr 19, 2013
  
  3f478f7b
- Reverted SVN trunk back to revision 3938 to remove changes in default theme an... · 2a4acdb4
  tbrehm authored Apr 19, 2013
```
Reverted SVN trunk back to revision 3938 to remove changes in default theme an a replacement of the ispconfig logo.
```
  2a4acdb4
Apr 16, 2013
- - Merged revisions 3922-3958 from svn stable branch · a0fd5ab7
  tbrehm authored Apr 16, 2013
```
- Added backup size to web backups
```
  a0fd5ab7
Mar 26, 2013
- Merged revisions 3845-3876 and 3879-3918 from stable branch. · cc65688b
  hellkat authored Mar 26, 2013
  
  cc65688b
Feb 22, 2013
- Merged revisions 3803-3844 from stable branch. · 526b997c
  tbrehm authored Feb 22, 2013
  
  3.0.5.1
  
  526b997c
Feb 12, 2013
- Merged Revisions 3771-3801 from stable branch. · 72695f03
  tbrehm authored Feb 12, 2013
  
  72695f03
Jan 17, 2013
- Merged revisions from 3.0.5 stable branch: 3758-3768, 3769 shall not be merged to trunk. · 43b345ca
  tbrehm authored Jan 17, 2013
  
  43b345ca
Jan 03, 2013
- Merged revisons 3687-3748 from 3.0.5 stable branch. · 10b4c85a
  tbrehm authored Jan 03, 2013
  
  10b4c85a
Nov 20, 2012
- Merged revisions 3670-3683 from 3.0.5 stable branch. · 68ec4374
  tbrehm authored Nov 20, 2012
  
  68ec4374
Nov 14, 2012
- Merged revisions 3596-3670 from 3.0.5 stable branch. · bfcdef6b
  tbrehm authored Nov 14, 2012
  
  bfcdef6b
Oct 24, 2012
- Merged revisions 3557-3594 from 3.0.5 stable branch. · 4bd960b1
  tbrehm authored Oct 24, 2012
  
  4bd960b1
Oct 04, 2012
- - Fixed FS#2436: nginx + php-fpm: commented out custom php.ini settings get into pool config. · 254a4af7
  Falko Timme authored Oct 04, 2012
  
  254a4af7
Oct 03, 2012
- Fixed: FS#2417 - Custom awstats_index.php.master · a464e1f4
  tbrehm authored Oct 03, 2012
  
  a464e1f4
Sep 13, 2012
- Bugfix: previous bugfix was missing a thing · c7d735ff
  mcramer authored Sep 13, 2012
  
  c7d735ff
- Fixed: Domain names in rewrite rules need the . and special chars to be escaped · 95e8cecd
  mcramer authored Sep 13, 2012
  
  95e8cecd
Sep 06, 2012
- - Added space at the end of $auto_alias. · cece69b0
  Falko Timme authored Sep 06, 2012
  
  cece69b0
Sep 04, 2012
- - Fixed FS#2399. · 5c71e911
  Falko Timme authored Sep 04, 2012
  
  5c71e911
- - Ported changes from Apache plugin to nginx plugin. · b889edb3
  Falko Timme authored Sep 04, 2012
```
- Fixed errors in system.inc.php-
```
  b889edb3
- - Added random PHP dummy file to "location ~ \.php$ {}". · c8c13a72
  Falko Timme authored Sep 04, 2012
  
  c8c13a72
Aug 22, 2012
- Bugfix: missing bracket :( · 9ec43488
  mcramer authored Aug 22, 2012
  
  9ec43488
- Fix: web content and some other data of vhost subdomain did not get deleted on subdomain deletion · 837d1830
  mcramer authored Aug 22, 2012
  
  837d1830
Aug 20, 2012
- Fixed error in path comparison (error.log part missing in path) · 418b41f7
  mcramer authored Aug 20, 2012
  
  418b41f7
- Changes for subdomain vhosts: · c3bf39ef
  mcramer authored Aug 20, 2012
```
- Fixed missing templates and language entries
- Previous subdomain mode can be used concurrently
- Changed log path to a more convenient location
```
  c3bf39ef
- Implemented (as optional!) FS#1993 - Creating Subdomains as VirtualHost · 6fb93dd3
  mcramer authored Aug 20, 2012
  
  6fb93dd3
Aug 19, 2012
- Implemented FS#2382 - automatically add alias domain when creating a domain · 3501f913
  mcramer authored Aug 19, 2012
  
  3501f913
May 29, 2012
- - Fixed bug for custom php.ini settings for PHP-FPM where "1" and "on" were interpreted as "off". · 0f603d77
  Falko Timme authored May 29, 2012
  
  0f603d77
May 04, 2012
- - Implemented FS#1888 and FS#2211. · dd7ce475
  Falko Timme authored May 04, 2012
  
  dd7ce475
Apr 20, 2012
- - Bugfix: nginx: delete non-default PHP-FPM pool if PHP is disabled for website. · 4d69f4fa
  Falko Timme authored Apr 20, 2012
  
  4d69f4fa
- - nginx: renamed PHP option "Fast-CGI" to "PHP-FPM". · 87152714
  Falko Timme authored Apr 20, 2012
  
  87152714
Apr 12, 2012
- Merged revisions 3028-3045 from stable branch. · 02bf9972
  tbrehm authored Apr 12, 2012
  
  02bf9972
Apr 05, 2012
- Merged revisions 2943-3026 from stable branch. · b6734423
  tbrehm authored Apr 05, 2012
  
  b6734423
Apr 03, 2012
- - Fixed FS#2139. · 93f24e17
  Falko Timme authored Apr 03, 2012
  
  93f24e17
Mar 30, 2012

- nginx: merge function: default action is now to replace older locations in... · 9b16a379

Falko Timme authored Mar 30, 2012

- nginx: merge function: default action is now to replace older locations in the nginx vhost configuration; a merge  instead of a replacement can be achieved by putting the string "##merge##" (without quotes) at the end of the most recent location line (e.g. "location ~ \.php$ { ##merge##").

9b16a379

- nginx: added function to merge duplicate locations in the nginx vhost configuration. · 2655f931
Falko Timme authored Mar 30, 2012

2655f931

Mar 26, 2012
- - Added restart function for PHP-FPM. · e2c00a17
  Falko Timme authored Mar 26, 2012
  
  e2c00a17