Commits · 1819a71ff90181700f47533f0d9002b9785fefef · Jan Kraljič / ISPConfig 3

Jan 27, 2014
- corrected file content · 1819a71f
  Dominik authored Jan 27, 2014
  
  1819a71f
- now the correct one · a416b997
  Dominik authored Jan 27, 2014
  
  a416b997
- readded upd_0063.sql · 808db535
  Dominik authored Jan 27, 2014
  
  808db535
- added missing change of uid/gid when mail-user is updated · 98273d12
  Dominik authored Jan 27, 2014
  
  98273d12
- Merge remote-tracking branch 'ispc3master/master' · 7bc0bcdf
  Dominik authored Jan 27, 2014
  
  7bc0bcdf
- Merge branch 'master' into 'master' · e4e2a430
  Marius Cramer authored Jan 27, 2014
```
Master
```
  e4e2a430
Jan 26, 2014
- ... · 98aae1fe
  Florian Schaal authored Jan 26, 2014
  
  98aae1fe
- updated lng-files · 71144cdd
  Florian Schaal authored Jan 26, 2014
  
  71144cdd
Jan 25, 2014
- Typo in class name of patch file · 616c2a34
  Marius Cramer authored Jan 25, 2014
  
  616c2a34
- Added script to remove all files that are no longer contained in the installation package · 7b9c18ec
  Marius Cramer authored Jan 25, 2014
```
- Important for plugin files!
```
  7b9c18ec
Jan 24, 2014
- Merge branch 'master' into 'master' · b50d36a3
  Marius Cramer authored Jan 24, 2014
```
Merge of domains, vhost subdomains and vhost aliasdomains to vhost domains
```
  b50d36a3
- Merged domains, vhost subdomains and vhost aliasdomains into vhost domains · 73813a4b
  Marius Cramer authored Jan 24, 2014
  
  73813a4b
- Undone some changes from vhostalias merge. · 29e1b0c9
  Marius Cramer authored Jan 24, 2014
  
  29e1b0c9
- Merge remote-tracking branch 'renky/vhostalias' · e60d4c7e
  Marius Cramer authored Jan 24, 2014
```
Conflicts:
	interface/web/sites/web_aliasdomain_edit.php
```
  e60d4c7e
- Merge branch 'master' into 'master' · 20e30b45
  Marius Cramer authored Jan 24, 2014
```
Master
```
  20e30b45
- Merge branch 'master' into 'master' · 5a9c50a9
  Marius Cramer authored Jan 24, 2014
```
Merged aliasdomain and subdomain files for easier code maintenance
```
  5a9c50a9
- Merged subdomain and aliasdomain files to childdomain · 3669b3c1
  Marius Cramer authored Jan 24, 2014
  
  3669b3c1
- changed the regex; new line at the end is allowed - prevents problems when... · cd072acb
  Florian Schaal authored Jan 24, 2014
```
changed the regex; new line at the end is allowed - prevents problems when using cut&paste for the private-key in the interface
```
  cd072acb
- changed sql-query and make ure that the backup-sub-dir exists · c220da99
  Florian Schaal authored Jan 24, 2014
  
  c220da99
- Merge remote-tracking branch 'origin/stable-3.0.5' · 8828f850
  Marius Cramer authored Jan 24, 2014
```
Conflicts:
	interface/web/sites/web_aliasdomain_edit.php
```
  8828f850
- Resolved differences in aliasdomain/subdomain files · 9a02e240
  Marius Cramer authored Jan 24, 2014
  
  9a02e240
- Copied missing changes of web_domain module to vhost subdomain module · 1c365587
  Marius Cramer authored Jan 24, 2014
  
  1c365587
Jan 23, 2014
- removed other commented parts · f902e3bd
  Dominik authored Jan 23, 2014
  
  f902e3bd
- Merge branch 'vhostalias' of http://git.ispconfig.org/renky/ispconfig3 into vhostalias · 484e5931
  Dominik authored Jan 23, 2014
  
  484e5931
- removed unnecessary lines and removed temporary comments · ab752875
  Dominik authored Jan 23, 2014
  
  ab752875
- Merge remote-tracking branch 'ispc3master/master' · 6250b7ea
  Dominik authored Jan 23, 2014
```
Conflicts:
	install/sql/incremental/upd_0063.sql
```
  6250b7ea
- Merge remote-tracking branch 'ispc3master/master' into vhostalias · 2d7d9eaa
  Dominik authored Jan 23, 2014
  
  2d7d9eaa
- - Added autocomplete="off" to relayhost user and relayhost password fields (server config > mail). · 99a911da
  Falko Timme authored Jan 23, 2014
  
  99a911da
- Resolved sql difference between stable and master · f91908ca
  Marius Cramer authored Jan 23, 2014
  
  f91908ca
- Resolved differences in incremental sql between master and stable · aca2df45
  Marius Cramer authored Jan 23, 2014
  
  aca2df45
- Resolved differences in sql incremental files between master and stable · 88d47d2c
  Marius Cramer authored Jan 23, 2014
  
  88d47d2c
- Inserted incremental sql from master branch · 91b176e6
  Marius Cramer authored Jan 23, 2014
  
  91b176e6
- Changed: Template class tag processing. Tags can now contain any amount of attributes. · ccdf702f
  Marius Cramer authored Jan 23, 2014
  
  ccdf702f
- Merge branch 'stable-3.0.5' of /home/git/repositories/ispconfig/ispconfig3 · daf67b7c
  Marius Cramer authored Jan 23, 2014
  
  daf67b7c
- Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5 · e39e91c8
  Marius Cramer authored Jan 23, 2014
  
  e39e91c8
- Fixed: tpl class now accepts 4 parameters instead of 3 in tags · d6aadf81
  Marius Cramer authored Jan 23, 2014
  
  d6aadf81
- Prevent that the type of a sys_user that belongs to a client or reseller can be changed to admin. · 132df214
  Till Brehm authored Jan 23, 2014
  
  132df214
- Merge branch 'vmailuid' of /home/git/repositories/renky/ispconfig3 · 8507b06f
  Marius Cramer authored Jan 23, 2014
  
  8507b06f
- Merge remote-tracking branch 'origin/stable-3.0.5' · cf646e99
  Marius Cramer authored Jan 23, 2014
```
Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/web/sites/web_domain_edit.php
	server/lib/classes/monitor_tools.inc.php
	server/plugins-available/maildeliver_plugin.inc.php
```
  cf646e99
Jan 22, 2014
- Added columns for policyd in spamfilter_policy table. · 08462d0f
  Till Brehm authored Jan 22, 2014
  
  08462d0f