ISPConfig 3:8db41e9b3309300054907d2183692dd5fa0f0d56 commitshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commits/8db41e9b3309300054907d2183692dd5fa0f0d562014-07-08T13:42:54+02:00https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8db41e9b3309300054907d2183692dd5fa0f0d56Merge branch 'fix_is_reseller' into 'master'2014-07-08T13:42:54+02:00Marius Cramerm.cramer@pixcept.de
Fix is reseller
reseller are now allowed to have -1 for limit_client, but I found another place where a > 0 check was usedhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b4945ae0c3f4e108090d05b34b3e7df8a753a2ecMerge branch 'master' into 'master'2014-07-07T19:07:17+02:00Marius Cramerm.cramer@pixcept.de
Masterhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f50e0eff638ba506898a1f00bbdaebab2431dd58fix is_reseller for reseller with unlimited clients on apply_client_templates2014-07-07T14:38:11+02:00Sergio Cambrasergio@programatica.eshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/5588afe8cd57dc12bd7bfa59bf4517655680d65afixed type in interface/web/dns/dns_wizard.php2014-07-07T12:28:13+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/80e18c2c0e2e08e1c4ffb792b731451835cf01d4Merge branch 'unlimited_clients' into 'master'2014-07-04T08:33:11+02:00Marius Cramerm.cramer@pixcept.de
Unlimited clients
Allow unlimited clients for resellerhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f58a7adebed0a6a02ffb1c710c7f3fab1ae87571allow unlimited clients2014-07-03T15:53:25+02:00Sergio Cambrasergio@programatica.eshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/3645f7602d29869f76839ff6d8411a4e7431b1dfMerge branch 'Cambra/ispconfig3-master'2014-07-01T18:39:40+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/dbf29d9979fe779e8801685c0132dbee681e15cfMerge branch 'master' of http://git.ispconfig.org/Cambra/ispconfig3 into Camb...2014-07-01T18:39:22+02:00Marius Cramerm.cramer@pixcept.de
Conflicts:
interface/lib/lang/es.lnghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/47568c8833fcc26d53c32cb1369847c6dd40c384Merge branch 'master' into 'master'2014-07-01T18:37:19+02:00Marius Cramerm.cramer@pixcept.de
Masterhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/5dc7c8f6f604fb960e36d81e3a3d489f7852e723allow to change domain's owner to their reseller2014-07-01T15:50:12+02:00Sergio Cambrasergio@programatica.eshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a71b8a0f44cd4b05800c96dac304fc1de3d79515reseller has_clients if limit_client is != 0, e.g. -1 or > 02014-07-01T15:49:55+02:00Sergio Cambrasergio@programatica.eshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/78a0c4a8059d277daf290639eb497e08869ddfccdon't use setloop for only one message2014-07-01T14:53:53+02:00Sergio Cambrasergio@programatica.eshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/877874b0caa0efdb98780f0fd54eeebe6838028dupdate french translation2014-06-30T14:10:52+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/4824901a27fa6f2f3fc14955e3353b8ca58cc781display warning message instead of info2014-06-30T11:13:24+02:00Sergio Cambrasergio@programatica.eshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b91328b225502a9fd9d871bae4529b6ea04b9b67display info message after domain owner change2014-06-30T11:09:21+02:00Sergio Cambrasergio@programatica.eshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c67eea43798034415e7bcdbb49f90e8d6e3a141dMerge branch 'spanish_translation' into 'master'2014-06-28T09:24:43+02:00Marius Cramerm.cramer@pixcept.de
Spanish translation
I have fixed some wrong spanish translations and updated some untranslated oneshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/9df44a90fd7fd57693899ccbe2231955a48fe64bupdate spanish translation2014-06-27T15:43:39+02:00Sergio Cambrasergio@programatica.eshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/e9bb05d44d4672f7dc29a78cc7bb98cebc96abc6change domain owner2014-06-25T08:46:34+02:00Sergio Cambrasergio@programatica.eshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d3be569127300fa335a659c3ea40c100763d5fa9Merge branch 'master' into 'master'2014-06-12T13:36:09+02:00Marius Cramerm.cramer@pixcept.de
Masterhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/56ae2538dde73a415909cc6f398f86489a722006make sure "doveadm quota" works and quota is enabled (seems to be broken in d...2014-06-12T11:45:21+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/4a569d979c0e5d39b7ac9cb72a02e7ac2e906962 Merge branch 'master' into 'master'2014-06-05T09:09:33+02:00Marius Cramerm.cramer@pixcept.de
Masterhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/fac03aa97013f819bbc6c201d107ebfc4fab4e18Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32014-06-04T18:47:35+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/2dc842ede2c0c066287aa76fc3bf749e79fbaf00set grants for slave to mail_backup2014-06-04T18:46:48+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ba8b73bd762032d724f84c5ef94968a7b3af6becMerge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32014-05-30T13:56:56+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a66fd7d0856fa9006d18ed1ea2bd818a5bbc4764Improved API behaviour: The $params array must contain only the new values an...2014-05-30T13:56:44+02:00Till Brehmtbrehm@ispconfig.orgImproved API behaviour: The $params array must contain only the new values and not all values of a record on update. Setting all values does not hurt though, so the change is downwards compatible with older versions.
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/9b4702d833708415d0cf05a98a00aac1bc850ff7 Merge branch 'master' into 'master'2014-05-19T14:55:47+02:00Marius Cramerm.cramer@pixcept.de
Masterhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/58023ffd5ffbacac99776debf72aff6f49378200use doveadm instead of 'du -s' for email-quota2014-05-18T21:30:44+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/4ad9487deff3af54455ac87479dacea014ef9faeMerge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32014-05-18T21:09:47+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/706a074efe7d1ae3a1abf905b9f255597308b297better log-statemet2014-05-18T21:09:10+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f1634087ea8a852b58ec13d5099e94771ed80849Merge remote-tracking branch 'origin/stable-3.0.5'2014-05-12T14:47:22+02:00Marius Cramerm.cramer@pixcept.de
Conflicts:
interface/web/admin/lib/lang/se_remote_action.lng
interface/web/admin/lib/lang/se_system_config.lng
interface/web/dashboard/lib/lang/se_dashlet_limits.lng
interface/web/mail/lib/lang/se_mail_domain.lng
interface/web/monitor/lib/lang/se.lng
interface/web/sites/lib/lang/se_web_aliasdomain.lng
interface/web/sites/lib/lang/se_web_domain_list.lng
interface/web/sites/lib/lang/se_web_subdomain.lng
interface/web/sites/lib/lang/se_web_subdomain_list.lng
interface/web/sites/lib/lang/se_web_vhost_domain.lng
interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
server/mods-available/rescue_core_module.inc.php
server/plugins-available/cron_plugin.inc.phphttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/1deddf5482f45b3ba85f74996c41430634716e6fAdded sql incremental change to db dump from master2014-05-12T14:40:47+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/cda98dfeab6a50a9bf9964c2f47ce8f3871cc757Added incremental sql file from master2014-05-12T14:34:33+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/306c962fee7668697cf041f884cd33e6ba4e3cc6Corrected filename of incremental update2014-05-12T14:29:54+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/1d258eef7ce12c81cf4707ea62b4d2f1ae7b1a91 Merge branch 'ftp-autoexpire' into 'master'2014-05-12T14:18:51+02:00Marius Cramerm.cramer@pixcept.de
Ftp Autoexpire at specific datehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/9b155852f4a352ddb793ac4252702170b6509c17Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32014-05-11T23:39:51+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/39dd4ecc8b4a2b3b98a7ffe7056ae64240b22d56- Added functions client_get_emailcontact and client_login_get to remote api.2014-05-11T23:39:37+02:00Till Brehmtbrehm@ispconfig.org- Add option to _get functions of the remote-api to return all records when primaryID = -1
- Fixed permission problem in _get functions of remote api.
- Fixed typo in german dashboard language file.https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6a001aa768d5a7b9a9a5a638be84cee16df6afe0Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into st...2014-05-09T15:23:50+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/98868735b2b72285b5521f8c08ccb174d0cb70beFixed: FS#3481 - ipv6 field is too short when DNS PTR entry2014-05-09T15:23:35+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/021aece4a3ba62862bafafa5cc45ce0423f6bc1eAdd missing symlink for patch tool.2014-05-09T15:20:48+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ad90585f29a2ebef7100d23b2c0e5cc41395b636fixed: FS#3495 - PHP5-FPM listen.mode user not set in the pool script2014-05-09T15:19:56+02:00Till Brehmtbrehm@ispconfig.org