ISPConfig 3:master commitshttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commits/master2014-11-06T11:24:04+01:00https://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/a66bbd6cba18494f48190025b525f903ef3d384dMerge branch 'master' into 'master'2014-11-06T11:24:04+01:00Marius Cramerm.cramer@pixcept.de
Master
See merge request !138https://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/208a069f90fe68ecf2242b8ef177b1a5a0095f00Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32014-11-06T10:52:26+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/990ca8a44d72cddc12db503f8e623fb9979e5b45moved "mount backup_dir" from various plugins to system.inc.php2014-11-06T10:47:00+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/0b22b5eff8e4fa2b12c375539997c1ad6933561c(re)add filesize to website-backups2014-11-04T08:35:48+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/0269573d9f6d3f54f22ca957d953fa8de256ba2fupdated db-queries to the new query form2014-11-04T08:26:31+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/bc0ad024a3ff0c1030ac6dc3c54ec3c626e254b3updated db-queries to the new query form2014-11-04T08:00:56+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/28a1dcf7efcfbe9ad7cb3010759d111b80659d63add $backup_dir_mount_cmd to mail-backup2014-11-04T07:08:18+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/8797b6fa1805d056422120de0a0d1c6de09e5273FS#3726 - Generated DKIM Selector has an invalid format2014-11-03T22:12:22+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/ea5eee59af75b1e26d7ab287b18afed6d557dc56backup: change mounts to backup_dir_mount_cmd2014-11-03T15:14:37+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/c4be523f5bd2fe7cabb993d37d4fe0685d9f60f7mailbackup: fixed domain-query2014-11-03T14:59:15+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/c28bb43232ab64cd17fc359fc482fc274974822fMerge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32014-10-31T12:46:46+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/1102cc886cf42a23cb3145cd9cc8b0d8f6123b61Merge remote-tracking branch 'origin/stable-3.0.5'2014-10-31T12:46:37+01:00Marius Cramerm.cramer@pixcept.de
Conflicts:
install/sql/ispconfig3.sql
install/tpl/config.inc.php.master
install/uninstall.php
interface/lib/config.inc.php
interface/web/themes/blue/ispconfig_versionhttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/474f4595c7aa07c678dceb90d06dfecf51007dd0Merge branch 'master' into 'master'2014-10-31T12:43:30+01:00Marius Cramerm.cramer@pixcept.de
Master
See merge request !135https://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/21cdaaaa73d0c73869a6463f179ff47364260b7cfixed template and query in mail_domain_dkim.js2014-10-30T17:50:50+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/c91c7a6249cdbcd235fc17f6bc4104d6da93a1d9Fixed: FS#3721 - php-fpm brocken2014-10-29T19:26:11+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/872f64b3574232bfafa2d2a33fa3ad44696c44c7re-add missing part to mail_domain_dkim.js2014-10-29T16:45:01+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/b3a7a341047dd7549046b540b3b1a04373153c61dkim: fixed issue with the domain-module2014-10-29T16:40:44+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/871298f2b5dc76c4bdc8501464aeeeaa5a44677eMerge branch 'master' into 'master'2014-10-29T11:05:11+01:00Marius Cramerm.cramer@pixcept.de
Master
See merge request !134https://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/4e52e111c859bc586d0379c7cda59111555c9ac0Merge branch 'master_fixes' into 'master'2014-10-29T11:04:54+01:00Marius Cramerm.cramer@pixcept.de
Master fixes
Fixed problem that broke the updater (wrong name of variable)
See merge request !133https://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/6db036235287dbf4d7920027fa2118d239e0e6d5Fixed a Bug in Centos 7 were php-fpm uses sockets while mod_proxy_fcgi in...2014-10-29T10:28:09+01:00Till Brehmtbrehm@ispconfig.orgFixed a Bug in Centos 7 were php-fpm uses sockets while mod_proxy_fcgi in centos 7 does not support that yet.
https://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/9514971687b22a80bef27ab49e46e689ad69d165fixed sql-query when resync mailbox2014-10-28T22:01:05+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/a8739d9edf01977137e4b116584611b2d52c9fc1changed checkpath for dkim-dir2014-10-28T22:00:25+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/1ecc750c5e346f30a6d53c483a437e0e2cbb1d22Fixed broken updater2014-10-28T21:31:42+01:00Dominik Müllerinfo@profi-webdesign.comhttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/8348c8143be4775eccb5c24edebf7f7215a6f90aChanged version number to 3.0.5.4p52014-10-28T11:16:36+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/574a163ae3874020fda9cb921fe88f2711afa4b3Fixed mysql restart problems in Ubuntu 14.102014-10-28T10:54:11+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/61f73820621d4ea17ecde3c8d6872e6ce8f9eb12- Changed tform_actions.inc.php to always provide oldDataRecord array for...2014-10-28T09:35:30+01:00Till Brehmtbrehm@ispconfig.org- Changed tform_actions.inc.php to always provide oldDataRecord array for updates even when dbhistory = off.
https://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/1e67c170df357c0d0831d223e93a6512d84c523e- Fixed hanging update on ubuntu 14.10 caused by mysql restart script.2014-10-27T20:46:52+01:00Till Brehmtbrehm@ispconfig.org- Fixed: FS#3710 - Bug with PHP-FPM configuration since 3.0.5.4 Patch 4
- Fixed wrong function calls in system lib.https://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/bc04c3a563378372d8779dac9e307cbb00e12316- Added version detection for Ubuntu 14.102014-10-27T16:36:19+01:00Till Brehmtbrehm@ispconfig.org- Fixed a problem with restart of services due to the fact that Ubuntu has upstart and systemd installed, but only upstart is working without errors.https://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/0e34bade9cc2fa831f9c8a344b2ebfdf4047848cFixed: FS#3718 - SQL injection checker false positive alert in APS installer2014-10-27T13:53:37+01:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/919c23676940bee3a7b21ec98700ea74152f1615Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32014-10-24T15:34:05+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/5ec4395f0e23bf11b3edef5c745e8f38c73ce637Merge branch 'stable-3.0.5'2014-10-24T15:33:54+02:00Marius Cramerm.cramer@pixcept.de
Conflicts:
install/dist/lib/fedora.lib.php
install/dist/lib/opensuse.lib.phphttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/2d5fcd53c19a65b9c968a1db2e9af643537379c3Merge branch 'master' into 'master'2014-10-24T15:29:47+02:00Marius Cramerm.cramer@pixcept.de
Master
See merge request !132https://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/712363b14c4adcd0e9f5c0d2ea286471665f8d1cfixed resync_do.php2014-10-24T10:53:05+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/a5e1da5a9cc519a987b09d1dc42aaf181cbe31d9Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32014-10-24T10:49:36+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/bdf99f4160bd537cf815eb687c3e062c450d029efixed issue with php 5.32014-10-24T10:48:15+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/67fedede3887d97078862e9b58524dc71162ba24Fixed: FS#3712 - Client DB credentials not escaped2014-10-23T21:02:15+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/ccebb93050b9d2c32146882083fa50ae7c018f0dImproved Centos 7 support in installer.2014-10-23T20:47:23+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/7972151d0448b99e0ba28c819a698757c27c1d55Merge branch 'stable-3.0.5'2014-10-23T19:13:09+02:00Marius Cramerm.cramer@pixcept.de
Conflicts:
install/autoupdate.php
install/install.php
install/sql/incremental/upd_0078.sql
install/sql/ispconfig3.sql
install/tpl/config.inc.php.master
install/tpl/debian_postfix.conf.master
install/tpl/fedora_postfix.conf.master
install/tpl/gentoo_postfix.conf.master
install/tpl/opensuse_postfix.conf.master
interface/lib/classes/db_mysql.inc.php
interface/lib/classes/remoting.inc.php
interface/lib/classes/tform.inc.php
interface/lib/classes/validate_reseller.inc.php
interface/lib/config.inc.php
interface/lib/lang/es.lng
interface/web/admin/lib/lang/de_server_config.lng
interface/web/admin/lib/lang/en_server_config.lng
interface/web/admin/lib/lang/es_server_config.lng
interface/web/admin/lib/lang/fr_server_config.lng
interface/web/admin/lib/lang/hr_server_config.lng
interface/web/dns/lib/lang/hr_dns_wizard.lng
interface/web/mail/lib/lang/hr_mail_user.lng
interface/web/mail/mail_domain_edit.php
interface/web/mail/mail_user_edit.php
interface/web/remote/index.php
interface/web/sites/database_edit.php
interface/web/sites/form/database.tform.php
interface/web/sites/form/web_vhost_subdomain.tform.php
interface/web/sites/lib/lang/ar_web_childdomain_list.lng
interface/web/sites/lib/lang/ar_web_vhost_domain_list.lng
interface/web/sites/lib/lang/cz_web_childdomain.lng
interface/web/sites/lib/lang/cz_web_subdomain.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_list.lng
interface/web/sites/lib/lang/de_ftp_user.lng
interface/web/sites/lib/lang/de_shell_user.lng
interface/web/sites/lib/lang/en_ftp_user.lng
interface/web/sites/lib/lang/en_web_childdomain.lng
interface/web/sites/lib/lang/en_web_domain.lng
interface/web/sites/lib/lang/es_ftp_user.lng
interface/web/sites/lib/lang/es_shell_user.lng
interface/web/sites/lib/lang/es_web_domain.lng
interface/web/sites/lib/lang/fr_web_subdomain.lng
interface/web/sites/lib/lang/hr_web_aliasdomain.lng
interface/web/sites/lib/lang/hr_web_subdomain.lng
interface/web/sites/lib/lang/hr_web_subdomain_list.lng
interface/web/sites/lib/lang/hr_web_vhost_domain.lng
interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng
interface/web/sites/lib/lang/hr_web_vhost_subdomain_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_subdomain.lng
interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
interface/web/sites/web_aliasdomain_edit.php
interface/web/sites/web_domain_edit.php
interface/web/sites/web_vhost_subdomain_edit.php
interface/web/themes/blue/ispconfig_version
interface/web/themes/default-304/templates/admin/server_config_mail_edit.htm
interface/web/themes/default-304/templates/admin/system_config_sites_edit.htm
interface/web/themes/default-304/templates/dns/dns_wizard.htm
interface/web/themes/default-304/templates/mail/spamfilter_config_mail_edit.htm
interface/web/themes/default-304/templates/sites/web_vhost_subdomain_advanced.htm
interface/web/themes/default-304/templates/sites/web_vhost_subdomain_backup.htm
interface/web/themes/default-304/templates/sites/web_vhost_subdomain_redirect.htm
interface/web/themes/default-304/templates/sites/web_vhost_subdomain_ssl.htm
interface/web/themes/default-304/templates/sites/web_vhost_subdomain_stats.htm
server/conf/vhost.conf.master
server/cron_daily.php
server/lib/classes/db_mysql.inc.php
server/mods-available/monitor_core_module.inc.phphttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/6faa009faad39be196c28d290ba89ff58d20172adkim: fixed issue with php 5.32014-10-23T10:30:40+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/stefanmcds-mnt/ispconfig3/-/commit/b79f6ca284856d5ad1e260540b418b7eb634bc16Improved dovecot version detection in installer for Fedora and CentOS.2014-10-19T16:15:00+02:00Till Brehmtbrehm@ispconfig.org