Commits · 2ebc3305eb8126da3fd0bef788342f1ee2e68fb2 · ISPConfig / ISPConfig 3

Jan 03, 2014
- Implemented: FS#2837 - New functions for the API · 2ebc3305
  Till Brehm authored Jan 03, 2014
  
  2ebc3305
Jan 02, 2014
- Merge branch 'master' of /home/git/repositories/grungy/ispconfig3 · b80a703a
  Marius Cramer authored Jan 02, 2014
  
  b80a703a
- Merge branch 'master' of /home/git/repositories/florian030/ispconfig3 · 0d11ae20
  Marius Cramer authored Jan 02, 2014
  
  0d11ae20
- FS#3264 - Put domain name in php-fom pool name · d33fd260
  Nedim Hadzimahmutovic authored Jan 02, 2014
  
  d33fd260
Dec 27, 2013
- changed hard-coded conversion to formatBytes for web-traffic stats · 91c842be
  Florian Schaal authored Dec 27, 2013
  
  91c842be
- changed hard-coded conversion to formatBytes for mail-traffic stats · ad24a14c
  Florian Schaal authored Dec 27, 2013
  
  ad24a14c
- changed hard-coded conversion to formatBytes for user-quota web-stats · e7bb4100
  Florian Schaal authored Dec 27, 2013
  
  e7bb4100
- changed hard-coded conversion to formatBytes for mail-user-quota stats · 3319b451
  Florian Schaal authored Dec 27, 2013
  
  3319b451
- move function formatBytes to lib/classes/functions.inc.php · 5561eb82
  Florian Schaal authored Dec 27, 2013
  
  5561eb82
- Merge branch 'master' of /home/git/repositories/florian030/ispconfig3 · 6b1d788d
  Marius Cramer authored Dec 27, 2013
  
  6b1d788d
Dec 24, 2013
- re-add rewrite ipv6 on mirror - lost in conversion from SVN to git · fbeb11d1
  Florian Schaal authored Dec 24, 2013
  
  fbeb11d1
Dec 18, 2013
- Merge branch 'master' of /home/git/repositories/florian030/ispconfig3 · 5a234a89
  Marius Cramer authored Dec 18, 2013
  
  5a234a89
- avoid signing header field 'received' by amavis · d6742cf3
  Florian Schaal authored Dec 18, 2013
  
  d6742cf3
Dec 03, 2013
- Merge branch 'master' of /home/git/repositories/florian030/ispconfig3 · 5cbbea45
  Marius Cramer authored Dec 03, 2013
  
  5cbbea45
Dec 02, 2013
- added german language-file · 5d75c17f
  Florian Schaal authored Dec 02, 2013
  
  5d75c17f
- allow dkim-public-key in dns only for mail-domains with dkim enabed. · e95eee31
  Florian Schaal authored Dec 02, 2013
  
  e95eee31
Nov 29, 2013
- Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 · c54948fb
  Marius Cramer authored Nov 29, 2013
  
  c54948fb
- Fixed wrong argument passing method in alias query functions · 7ae5b04f
  Marius Cramer authored Nov 29, 2013
  
  7ae5b04f
Nov 25, 2013
- Merge branch 'master' of /home/git/repositories/florian030/ispconfig3 · 5b5f7c5e
  Marius Cramer authored Nov 25, 2013
  
  5b5f7c5e
- Added: new validator ISASCII to forbid non-ascii characters · bd8b728a
  Marius Cramer authored Nov 25, 2013
  
  bd8b728a
Nov 24, 2013
- fixed loop in uninstall* · c1245b53
  Florian Schaal authored Nov 24, 2013
  
  c1245b53
- add amavis-configfile-location for centos 6.4; add amavis-initscrip-name for... · 03200f17
  Florian Schaal authored Nov 24, 2013
```
add amavis-configfile-location for centos 6.4; add amavis-initscrip-name for centos 6.4; fixed missing private_key in mail/mail_domain_dkim_create.php
```
  03200f17
Nov 22, 2013
- add DROP DATABASE and DROP USER · d24bb483
  Florian Schaal authored Nov 22, 2013
  
  d24bb483
- Merge branch 'master' of /home/git/repositories/RealOpty/ispconfig3 · ea1e356d
  Marius Cramer authored Nov 22, 2013
  
  ea1e356d
- Fix todo and uninstall error · 35f02f3e
  unknown authored Nov 22, 2013
  
  35f02f3e
Nov 21, 2013
- Few more fixes on uninstall · c63b399f
  unknown authored Nov 21, 2013
  
  c63b399f
- Working uninstall confirmation · 92aea2e8
  unknown authored Nov 21, 2013
  
  92aea2e8
- Confirm uninstall · ec70dd51
  unknown authored Nov 21, 2013
  
  ec70dd51
- Testing - Updating todo: uninstall · b07d3f5f
  unknown authored Nov 21, 2013
  
  b07d3f5f
- corrected typo from merge · 775c05d4
  Marius Cramer authored Nov 21, 2013
  
  775c05d4
- Merge branch 'master' of /home/git/repositories/florian030/ispconfig3 · 1324b803
  Marius Cramer authored Nov 21, 2013
  
  1324b803
- interface/web/dns/dns_soa_edit.php - fixed error in line 122 · 18f479a2
  Florian Schaal authored Nov 21, 2013
  
  18f479a2
- interface/web/dns/dns_wizard.php · b283598a
  Florian Schaal authored Nov 21, 2013
  
  b283598a
Nov 20, 2013

Added: FS#3228 - remoting: add mail_relay_recipient functions · f18ff118
Marius Cramer authored Nov 20, 2013

f18ff118
Disabled function calls to not yet implemented backtrace · 56364927
Marius Cramer authored Nov 20, 2013

56364927
Fixed FS#3173 - Update Domain Status via API · def1f785
Marius Cramer authored Nov 20, 2013

def1f785

Added new mysqli database class · cd8bb801

Marius Cramer authored Nov 20, 2013

Changed query syntax of alias domain edit file
Changed deprecated syntax in alpha plesk importer

cd8bb801

Merge remote-tracking branch 'origin/stable-3.0.5' · 1a2cbfbf

Marius Cramer authored Nov 20, 2013

Conflicts:
	interface/lib/classes/tform.inc.php
	interface/web/admin/lib/lang/de_directive_snippets.lng
	interface/web/dns/dns_import.php
	interface/web/dns/dns_soa_edit.php
	interface/web/dns/dns_wizard.php
	interface/web/mail/mail_domain_edit.php
	interface/web/sites/database_edit.php
	interface/web/sites/lib/lang/de_web_domain.lng
	interface/web/sites/lib/lang/en_web_domain.lng
	interface/web/sites/web_domain_edit.php
	server/server.php

1a2cbfbf

Nov 19, 2013

- nginx: added {DOCROOT} and {FASTCGIPASS} placeholders to directive snippets... · c02d3f04
Falko Timme authored Nov 19, 2013
```
- nginx: added {DOCROOT} and {FASTCGIPASS} placeholders to directive snippets and nginx Directives fields.
```
c02d3f04

add dkim-keys to the resync-tool · c6d29c1c

Florian Schaal authored Nov 19, 2013

display dns-record for dkim in the mail-domain
rewrite function domain_dkim_update in server/plugins-available/mail_plugin_dkim.inc.php
change dns*.php according to commit 604c0c24

c6d29c1c