ISPConfig 3:1838fd1c4b1ceae77c852fe25e97a30592d44a69 commitshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commits/1838fd1c4b1ceae77c852fe25e97a30592d44a692014-03-06T15:47:16+01:00https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/1838fd1c4b1ceae77c852fe25e97a30592d44a69Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32014-03-06T15:47:16+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/82b723df86594a89fb53607981488319e39b1b92Merge remote-tracking branch 'origin/stable-3.0.5'2014-03-06T14:53:55+01:00Marius Cramerm.cramer@pixcept.de
Conflicts:
interface/lib/classes/remoting.inc.php
interface/web/dns/lib/lang/cz_dns_dkim.lng
interface/web/mail/lib/lang/cz_mail_backup_list.lng
interface/web/mail/lib/lang/cz_mail_user.lng
interface/web/sites/lib/lang/cz_web_childdomain.lng
interface/web/sites/lib/lang/cz_web_childdomain_list.lng
interface/web/sites/lib/lang/cz_web_subdomain_list.lng
interface/web/sites/lib/lang/cz_web_vhost_domain.lng
interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
interface/web/sites/web_vhost_domain_edit.phphttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a80ae1992c90a92245ec694438be201d7231c8e6Moved check_recipient_access to the front. Blacklist for recipients is ignore...2014-03-06T12:58:29+01:00Marius Cramerm.cramer@pixcept.deMoved check_recipient_access to the front. Blacklist for recipients is ignored on outgoing mails via smtp auth otherwise.
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/1df8fddfff3658fda8617cdc842b49f7377790e7Fixed syntax error in ispconfig_update.php2014-03-06T12:01:13+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/9bf0533ae4ed613ca5077d3b6460447175b3006ddb-quota: add lng-files2014-03-06T11:21:14+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/35b30fa77ef939f85b6d31446e8710e8f03486b6 Merge branch 'master' into 'master'2014-03-06T09:08:05+01:00Marius Cramerm.cramer@pixcept.de
Masterhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/18148bda7cbfea82de2b958d934879ff952154f4Removed outdated installation instructions.2014-03-06T09:07:36+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/623d691ab9309f25d144b5e421da64b70e07dc22fixed typo in ispconfig_update.php2014-03-06T07:28:03+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b7d3b1668e3a7e0932fdddde70169fc47be68347database-quota: add stats to website-tab2014-03-06T06:47:44+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/1715c1530c410c73e52c24768dc052da62d51c76fixed sql-syntax in database_edit.php2014-03-06T06:36:00+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/52983de57cf6d60fbd37b0c8e873aae4f69da10dMerge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into st...2014-03-06T02:59:02+01:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/aede496acf81c56df081e63840722ab40aa1ab6a- nginx: Increased fastcgi_read_timeout for phpMyAdmin in apps vhost to 1200 ...2014-03-06T02:58:17+01:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/323f1fc1a56abb69072290231d484f83172727efdb-quota: changed sql-queries for dkim to new syntax2014-03-05T22:08:18+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d9443da5f7186cae3f7235e1d51c966ba2b68206mail-backup: Make sure backup_interval is a string, not an integer.2014-03-05T22:06:40+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6c57e7f4983013c8535ca01e4fc698ea6e8ae2a6changed sql-queries for dkim to new syntax2014-03-05T21:59:33+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/1c58c1af20169691e135f22e0123058e4f8d41d4fixed type in databasq quota notifications2014-03-05T21:55:03+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/cd9e802b9f36c572d6ca9246c47f6795efccae22 Merge branch 'remote_quota' into 'master'2014-03-05T18:25:54+01:00Marius Cramerm.cramer@pixcept.de
Remote Quota
Added functions to get Website and Mail-Quota via Remote-Api
Moved Quota-Calculation-Functions to own lib-File for usage from dashlets and Remote-Api
Added Parameters to select if quota should be given readable (+kB, +MB) or as raw data (via remote)https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/78e231a6ed43838e1d1fa67b529dca40f7506f04combined sql-queries2014-03-05T18:17:23+01:00Dominik Muellerinfo@profi-webdesign.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b45479611dea99bcdc6cdd276e0d47e7ad902a21switched to new query syntax - do quoting where it is needed2014-03-05T17:37:08+01:00Dominik Muellerinfo@profi-webdesign.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f1c4cdd6a7c963d7357a7ea30e7413f2dbdd4cccChanged Quota-Functions from sys_group to client_id2014-03-05T15:14:38+01:00Dominik Muellerinfo@profi-webdesign.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/3de838ddf26c62a1f676c7cd9dc48de44bde54f9- Improved IP address loop.2014-03-05T10:26:55+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8555470d723d8221012063077d3a6788f531062fAdded missing ip addess loop in ispconfig.conf2014-03-05T10:21:01+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ccbf1497dde4aef031a39544235a284641e694de- Added templating library to installer.2014-03-04T22:18:36+01:00Till Brehmtbrehm@ispconfig.org- Added function to detect the apache version to installer.
- Added support for apache 2.4 to vhots templates for ispconfig vhost and apps vhost in installer.https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b846a278dd0bf34043c8d57fdbdc95c09a022809Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into st...2014-03-04T20:58:27+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ed76878626f9b8723f1113c3c2773f108a938da5Revert "- Remoting: added function to get all IP addresses of a server."2014-03-03T13:27:32+01:00Falko Timmeft@falkotimme.com
This reverts commit <a href="/zbuzanic/ispconfig3/-/commit/4cd62d78914e7a657f1471cd6d1aa1ad074b526c" data-reference-type="commit" data-original="4cd62d78914e7a657f1471cd6d1aa1ad074b526c" data-link="false" data-link-reference="false" data-project="92" data-commit="4cd62d78914e7a657f1471cd6d1aa1ad074b526c" data-container="body" data-placement="top" title="- Remoting: added function to get all IP addresses of a server." class="gfm gfm-commit has-tooltip">4cd62d78</a>.https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c7e23161d25fb772e364b3a38f82c66a01b58fe0moved quota-functions to site and mail-file2014-03-03T11:49:59+01:00Dominik Muellerinfo@profi-webdesign.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6eca510a65b361cb4a20fd168c5dd454701e709bMoved quotafunctions to monitor.inc.php2014-03-02T21:42:33+01:00Dominik Muellerinfo@profi-webdesign.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/4cd62d78914e7a657f1471cd6d1aa1ad074b526c- Remoting: added function to get all IP addresses of a server.2014-03-02T19:05:02+01:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d677ffa65917568806fda40d26954ffa0cc7305f- Remoting: add correct values for database backup_intervals and backup_copies.2014-02-28T19:41:39+01:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/7c19f2dbb4608ef6b3f219d45490b25aa05e848c- Databases: Make sure backup_interval is a string, not an integer.2014-02-28T19:02:30+01:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ceab233df7a9450fbb55810270523b8bdf17d3bc- MySQL databases: backup_interval must be a string, not an integer.2014-02-28T18:47:14+01:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/1aece9b8d53b51f3ce02241d96d7a1b2f38455dbFixed problem with new "multiple servers for clients" feature2014-02-28T16:36:34+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/361156e8395d3837a4cd0ff7a417d3ca8dc16a40Merge remote-tracking branch 'origin/stable-3.0.5'2014-02-27T18:31:52+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/9e444eb62454973ec1a25cc1dab0fa7f323f043fFixed SQL typos2014-02-27T18:31:09+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/3eefd1593f0bac36fb35f15164f8095cbd872e82made readable diableable2014-02-27T00:06:23+01:00Dominik Muellerinfo@profi-webdesign.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ac03e946c045ade95fe00849ebf0b5c05b61d900fixed wrong group-query2014-02-27T00:06:16+01:00Dominik Muellerinfo@profi-webdesign.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ced73f24a4f5199d9d0c9b23d5a4b8826ac8ac9bchanged wrong function call2014-02-27T00:06:07+01:00Dominik Muellerinfo@profi-webdesign.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b8ab8bf079d03ae4fc332b651397f49137a04a1ffixed uses-error2014-02-27T00:06:00+01:00Dominik Muellerinfo@profi-webdesign.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/0e80d1bc0a36526cc7cc73d6d1719128e965dac9Syntaxerror-korrektur2014-02-27T00:05:50+01:00Dominik Muellerinfo@profi-webdesign.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/e8b3291ecd0c5278b9ddc274769a3809e92f5c16Quota-Lib für remote-quota-angaben2014-02-27T00:05:31+01:00Dominik Muellerinfo@profi-webdesign.netErweiterungen für remote-Quota