ISPConfig 3:7bcf62fc4e4b119c68998e2570005695eb5778f8 commitshttps://git.ispconfig.org/dirkd/ispconfig3/-/commits/7bcf62fc4e4b119c68998e2570005695eb5778f82015-06-29T10:00:49+02:00https://git.ispconfig.org/dirkd/ispconfig3/-/commit/7bcf62fc4e4b119c68998e2570005695eb5778f8Merge branch 'master' into 'master'2015-06-29T10:00:49+02:00Marius Cramerm.cramer@pixcept.de
made email mandatory for client and reseller
See merge request !205https://git.ispconfig.org/dirkd/ispconfig3/-/commit/4039c82a3dee9c57e328c9dc369365b43ca39046made email mandatory for client and reseller2015-06-29T09:52:37+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/3ba59d59a2ad4068d78753635531b7625c916258Merge branch 'master' into 'master'2015-06-27T20:17:33+02:00Marius Cramerm.cramer@pixcept.de
add missing wb-entry
See merge request !204https://git.ispconfig.org/dirkd/ispconfig3/-/commit/3fa4439583c61c28737848cbce7e02b6ebadad5aFS#3526 - Add option to disable BIND zone check (the intention for the featur...2015-06-27T11:18:53+02:00Florian Schaalflorian@schaal-24.deFS#3526 - Add option to disable BIND zone check (the intention for the feature request was more to hide log-messages and not to disable the named-checkzone-call)
https://git.ispconfig.org/dirkd/ispconfig3/-/commit/ab8fe4df558b9acad7a3f640103dc13ede47516dadd missing wb-entry2015-06-27T09:41:08+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/dc679e382b6f60405861ae888c1b560c5117f0e8- added fuser calls to unmount directoriies more securely2015-06-26T18:00:42+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/5b3c29178704c047d4020df2ae445ff01c6e1f3aMerge branch 'master' into 'master'2015-06-22T14:48:27+02:00Marius Cramerm.cramer@pixcept.de
Master
See merge request !203https://git.ispconfig.org/dirkd/ispconfig3/-/commit/eac49003df65e223905c7e7f4458a752b9caf146fix system_config_misc_edit.htm2015-06-22T10:57:27+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/8f5b513ed53ab241fc496e5728c61705e7503348option to set the company name in the page title2015-06-22T10:54:15+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/b42486c6fea976fe5f0615c6fb679fd3c084e7a9fixed inserted text for document root in domain edit page2015-06-22T09:18:32+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/18bf6c12b96e58b3ec8da6127fb68d6cb6f90465FS#3551 - Change title of web pages2015-06-21T13:25:19+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/568b4b12d291f928b0755f130df026ba6ecfa656display the documnet_root for a website2015-06-20T11:11:02+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/fe8aa64b7001b00e8fb230dedae930860889a6acadd fetchmail to resync-tool2015-06-19T19:28:34+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/96c95ad8ca4c460394b64a4d0ce7d2f0622125af- added anothier lock check for apt2015-06-18T08:23:08+02:00Marius Cramerm.cramer@pixcept.de- changed language import to use mb_substrhttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/02e7eaf2860f6f892eb32639940e97c76b65baad- backported patches2015-06-15T19:24:18+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/c2419b0e309de8597916f5dc753d99120f416ff7- prevent failure of update check on debian system (on running dpkg process)2015-06-12T09:57:56+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44Merge branch 'master' into 'master'2015-06-07T18:16:19+02:00Marius Cramerm.cramer@pixcept.de
add mailfilter to resync
See merge request !202https://git.ispconfig.org/dirkd/ispconfig3/-/commit/a8ac8563fde1c019664512d983a592df49e2908creadd missing code2015-06-05T16:57:50+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/dadfb45a9a29e239ff722e6d8e91c75f76c314b8Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32015-06-05T16:47:36+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/0deff130c6d7404da71e9ab9d8ee738112bd4f74add mailfilter to resync2015-06-05T16:47:18+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/1fa1bcead3a1fc02c1ff81732ce0e561df64822bMerge branch 'bash' into 'master'2015-06-05T12:24:41+02:00Marius Cramerm.cramer@pixcept.de
Dash problem
Define bash as a parser, some systems can have "dash" as a "sh" that will end with errors.
/usr/local/ispconfig/server/cron_daily.sh
[: 10: root: unexpected operator
[: 10: root: unexpected operator
See merge request !201https://git.ispconfig.org/dirkd/ispconfig3/-/commit/bbe74734cca27546ce03f36649adc8056f2ce803Dash problem2015-06-05T12:06:34+02:00RKolodziejczxykRKolodziejczxyk@rkolodziejczyk-itdesk-stacja
Define bash as a parser, some systems can have "dash" as a "sh" that will end with errors.
# /usr/local/ispconfig/server/cron_daily.sh
[: 10: root: unexpected operator
[: 10: root: unexpected operatorhttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/f0dfa9f4bb885178de0dde42eebc4e5e5321bef2- added http -> https rewriting2015-06-05T10:50:05+02:00Marius Cramerm.cramer@pixcept.de- backported patcheshttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/8cb6f8ffd31ec33479c9696c5263b7a8e27fe273Merge branch 'stable-3.0.5'2015-06-05T10:40:23+02:00Marius Cramerm.cramer@pixcept.de
Conflicts:
install/sql/ispconfig3.sql
install/tpl/config.inc.php.master
interface/lib/classes/tform.inc.php
interface/lib/config.inc.php
interface/web/admin/server_config_edit.php
interface/web/themes/blue/ispconfig_version
interface/web/tools/import_plesk.php
interface/web/tools/resync.php
interface/web/vm/openvz_action.phphttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/e97f841c7c987e3b4ef26ce87665f8857612ff4dMerge branch 'master' into 'master'2015-06-05T10:28:16+02:00Marius Cramerm.cramer@pixcept.de
FS#3749 - Disable smtp checkbox in mailbox setting has no effect on courier servers
See merge request !199https://git.ispconfig.org/dirkd/ispconfig3/-/commit/46e82c7cf25aa70af7caf04d11bb19ac29425013Changed to use IF()2015-06-05T10:27:41+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/4863035ea5677eb73a7d75d95157d990387798abUpdated version number to 3.0.5.4p82015-06-05T10:06:30+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/e5c68a10633302896a8562f17577f015b3506c84- fixed csrf handling on server config edit2015-06-05T09:55:06+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/536488819d354c23f47f41c4117af81368d0f5daUpdated version number to 3.0.5.4p72015-06-04T11:07:25+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/b7a416586d491945ff77c1a3c27130304b7601f2FS#3900 - Invalid home dir for shell users. Changed description from -Dir- to...2015-06-03T19:33:07+02:00Till Brehmtbrehm@ispconfig.orgFS#3900 - Invalid home dir for shell users. Changed description from -Dir- to -Base Dir- to refelect that /home/username is appaneded to this directory.
https://git.ispconfig.org/dirkd/ispconfig3/-/commit/69a57d959dc422eaa4d10ba7005bd884b87b5fdfAdded csrf protection to dns wizard.2015-06-03T19:02:55+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/99e9ac79849510f74b85a9af1697458dd1731601Fixed: FS#3906 - Wrong home folder permisions after changing ssh username.2015-06-03T19:02:22+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/3fb9be68159f94f4fe9f6fac579b31b5533b6dc7Fix for FS#3857 .ssh key directory problem.2015-06-03T18:44:01+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/5af0cfd99a13fda9afad3380b0c50a3428acd299Extended the CSRF check.2015-06-03T18:14:07+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/0494a0c22ed568e3d96ae6a7b163a21d7fa1410aMerge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32015-06-03T16:49:54+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/a4cfc3cd050a2e7a2193b5a0485afd28b5d46162FS#3749 - Disable smtp checkbox in mailbox setting has no effect on courier s...2015-06-03T16:43:35+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/dirkd/ispconfig3/-/commit/1e24e990804732a0f6981cd2db7fda2da11b29edMerge branch 'master' into 'master'2015-06-03T16:09:09+02:00Marius Cramerm.cramer@pixcept.de
Master Fixes
See merge request !198https://git.ispconfig.org/dirkd/ispconfig3/-/commit/3f19613b5ebca832e8f341980278df5f8427c1caMerge branch 'stable-3.0.5' into 'stable-3.0.5'2015-06-03T16:07:43+02:00Marius Cramerm.cramer@pixcept.de
Stable 3.0.5 Fixes
See merge request !197https://git.ispconfig.org/dirkd/ispconfig3/-/commit/c3fab8f2cdf92d6b9d66202e3210cc01e5c53db5Merge branch 'master' into 'master'2015-06-03T08:29:59+02:00Marius Cramerm.cramer@pixcept.de
FS#1212 - IP Address in fetchmail - allow ipv4 or hostname for pop/imap-server
See merge request !196https://git.ispconfig.org/dirkd/ispconfig3/-/commit/91b6ac2752c03b641702aecd5968da299e43b70bFS#1212 - IP Address in fetchmail - allow ipv4 or hostname for pop/imap-server2015-06-02T21:12:04+02:00Florian Schaalflorian@schaal-24.de