ISPConfig 3:8cb6f8ffd31ec33479c9696c5263b7a8e27fe273 commitshttps://git.ispconfig.org/edspiner/ispconfig3/-/commits/8cb6f8ffd31ec33479c9696c5263b7a8e27fe2732015-06-05T10:40:23+02:00https://git.ispconfig.org/edspiner/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/edspiner/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/edspiner/ispconfig3/-/commit/46e82c7cf25aa70af7caf04d11bb19ac29425013Changed to use IF()2015-06-05T10:27:41+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/4863035ea5677eb73a7d75d95157d990387798abUpdated version number to 3.0.5.4p82015-06-05T10:06:30+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/e5c68a10633302896a8562f17577f015b3506c84- fixed csrf handling on server config edit2015-06-05T09:55:06+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/536488819d354c23f47f41c4117af81368d0f5daUpdated version number to 3.0.5.4p72015-06-04T11:07:25+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/edspiner/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/edspiner/ispconfig3/-/commit/69a57d959dc422eaa4d10ba7005bd884b87b5fdfAdded csrf protection to dns wizard.2015-06-03T19:02:55+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/edspiner/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/edspiner/ispconfig3/-/commit/3fb9be68159f94f4fe9f6fac579b31b5533b6dc7Fix for FS#3857 .ssh key directory problem.2015-06-03T18:44:01+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/5af0cfd99a13fda9afad3380b0c50a3428acd299Extended the CSRF check.2015-06-03T18:14:07+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/edspiner/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/edspiner/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/edspiner/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/edspiner/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/edspiner/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.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/af6cf4d1ccb5a380d400e1685368ec3b24e3f770- updated minified css2015-06-02T15:19:15+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/464a8c61bbb3062eea1f42b4e59adb57e45ef277Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32015-06-02T15:11:52+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/2c1a639ca242bd8f6d2d4a6e24122962153bf3d3- fixed mysql query parameter in datalogInsert2015-06-02T15:08:50+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/6f2d95f4f36043e38b14599f5878af320566f8f4Merge branch 'master' into 'master'2015-06-02T13:05:39+02:00Marius Cramerm.cramer@pixcept.de
Master
See merge request !195https://git.ispconfig.org/edspiner/ispconfig3/-/commit/8a74454bb560d019315cb84815ad872b8d6fe997cleanup server_ip_map.tform.php2015-06-02T12:45:30+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/6c424f1677753663ca1e086a955f2843f86854f3add option to rewite ipv4-addresses on web-mirrors2015-06-02T12:42:06+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/daf5a71d75dafb532b442e314d92ea3b7b7b0460Merge branch 'master' into 'master'2015-05-30T13:10:41+02:00Marius Cramerm.cramer@pixcept.de
Master
See merge request !194https://git.ispconfig.org/edspiner/ispconfig3/-/commit/e4a89be38efa2cae0ab9ec26b52d0c7dd64578b3fixed dmarc-template2015-05-30T13:09:03+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/f2c7c219f65185a0a25ba45eef06c3aa6bb64072add "postfix reload"2015-05-30T10:16:08+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/b3c7c7b203a0731bf27393b13ab34f5300f48b8dmin. cosmetical changes2015-05-30T10:03:59+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/5d0363973f993a39448531ce5590303f2ab9a904- fixed sql query in apache plugin2015-05-27T17:05:23+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/a977405f9a3ce8078b791156700c1a819a5112d4Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32015-05-27T17:02:57+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/8c517c8727938361382f0d7d350391fa757b90a5- fixed SQL error and error display2015-05-27T17:02:40+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/28eaf22574fcf1b82c2794ce0c7af971aed1baa0Merge branch 'master' into 'master'2015-05-27T09:34:09+02:00Marius Cramerm.cramer@pixcept.de
postfix plugins should not corrupt "other" settings + fix
postfix plugins should not corrupt "other" settings - sysadmin, ...
fixes some misconfiguration under certain circonstances
See merge request !191https://git.ispconfig.org/edspiner/ispconfig3/-/commit/88559338da630f5afe2c95c543f5e06608ddc268postfix plugins should not corrupt settings "other" settings2015-05-26T23:10:49+02:00(d)oekiadoekia@gmail.comfixes also some misconfiguration under some circonstanceshttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/76c0bd312d2db7f30dbf93552151dbee1abeb365- fixed FS#3907 - "Reset password" generates too short passwords2015-05-26T14:22:14+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/d7ababc9ebb9bcb03c56e39ba5a4e06c8348d3ff- fixed FS#3907 - "Reset password" generates too short passwords2015-05-26T14:21:27+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/1e00f89050a47a987d86a40ca94bfb5a25d41d1a- fixed html of module buttons in dashboard2015-05-26T08:58:01+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/8081dfc524267e6e779303ad15f5224123c02add- fixed sql query from previous commit2015-05-26T08:55:32+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/6a3742bc7837817a786552c9c4f1339aac983c1e- fixed monitor cron job not deleting old values from db2015-05-26T08:42:07+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/64466c9c72397911c86b12f1ad9b098c242b139a- ported fix for logo dimensions2015-05-26T08:29:40+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/8ae1387d225034725a0ead1bcbd2756d4d053f43- fixed sql problems2015-05-25T11:28:03+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/eb35b58576960c6f007c77ccdae11a99a106c3f4Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32015-05-25T11:11:03+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/edspiner/ispconfig3/-/commit/acd2383df6ad83df839334b2cb9646fc5f3e49bf- added missing sql to installer2015-05-25T11:09:59+02:00Marius Cramerm.cramer@pixcept.de