ISPConfig 3:master commitshttps://git.ispconfig.org/mk/ispconfig3/-/commits/master2015-05-21T11:12:56+02:00https://git.ispconfig.org/mk/ispconfig3/-/commit/7de1b7b5971c74d5b251501b27ea7919e80db923- fixed MySQL port separation2015-05-21T11:12:56+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/8d3466b091af302eaf6ed81deb8ff946cd04c74a- backported patches2015-05-20T19:52:58+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/6f6aa983d80882d10038945c10d7dedf572e0641Merge branch 'feature/mysql-port' into 'master'2015-05-19T15:40:21+02:00Marius Cramerm.cramer@pixcept.de
Define MySQL port by its own (rather than in the host with :port)
As the title says, this MR allows defining the MySQL server port in a new variable.
After having done the work I saw that it can simply be passed with the hostname, like `hostname:port`....
so I'm not going to be sad if this MR is getting closed asap. *rofl*
Leaving it here anyway.
See merge request !187https://git.ispconfig.org/mk/ispconfig3/-/commit/8603b4abde47d11ce9900166cd38ed8f46dc11d2Merge branch 'feature/independent-php' into 'master'2015-05-19T15:38:34+02:00Marius Cramerm.cramer@pixcept.de
Ensure the internal PHP scripts work even if system-wide PHP settings are set
Another solution would be to reference the `php.ini` in `./server/lib` from all scripts...but maybe that's a bit of an overkill.
See: <a href="http://bugtracker.ispconfig.org/index.php?do=details&task_id=3293&project=3&string=php&type%5B0%5D=&sev%5B0%5D=&pri%5B0%5D=&due%5B0%5D=&reported%5B0%5D=&cat%5B0%5D=&status%5B0%5D=open&percent%5B0%5D=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=&openedto=&closedfrom=&closedto=&pagenum=2" rel="nofollow noreferrer noopener" target="_blank">http://bugtracker.ispconfig.org/index.php?do=details&task_id=3293&project=3&string=php&type[0]=&sev[0]=&pri[0]=&due[0]=&reported[0]=&cat[0]=&status[0]=open&percent[0]=&opened=&dev=&closed=&duedatefrom=&duedateto=&changedfrom=&changedto=&openedfrom=&openedto=&closedfrom=&closedto=&pagenum=2</a>
See merge request !188https://git.ispconfig.org/mk/ispconfig3/-/commit/6e1f2d5a20fd65493fc52293c669d772f287556eMerge branch 'bug/mod_proxy_fcgi' into 'master'2015-05-19T15:38:19+02:00Marius Cramerm.cramer@pixcept.de
ProxyPassMatch is only possible if running PHP-FPM over TCP
This fixes an error when `mod_proxy_fcgi` is installed/enabled but PHP-FPM is listening on a socket.
See merge request !189https://git.ispconfig.org/mk/ispconfig3/-/commit/44fe3b506b6559a3a0112008d91839d1982be2b1ProxyPassMatch is only possible if running PHP-FPM over TCP2015-05-19T14:12:39+02:00Michel Käsermail@michelkaeser.chhttps://git.ispconfig.org/mk/ispconfig3/-/commit/4bc030979267303b2ff1668c99af0a4e7089824bensure the internal PHP scripts work even if system-wide PHP settings are set...2015-05-17T09:03:48+02:00Michel Käsermail@michelkaeser.chensure the internal PHP scripts work even if system-wide PHP settings are set that could affect how ISPConfig would work. See FS#3293
https://git.ispconfig.org/mk/ispconfig3/-/commit/2332f196052b467beb2038aaa917faa2eeb05919two small fixes + indentation2015-05-16T23:56:30+02:00Michel Käsermail@michelkaeser.chhttps://git.ispconfig.org/mk/ispconfig3/-/commit/82e9b9e7c7ecf1664a7b0d4e57a5c4893739559ddefine MySQL port by its own (rather than in the host with :port); it's simpl...2015-05-16T23:44:59+02:00Michel Käsermail@michelkaeser.chhttps://git.ispconfig.org/mk/ispconfig3/-/commit/a52337130b0675d43e8b15d33cea1fa8c7654ef4- ported patch2015-05-15T08:49:17+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/86bc6556b8378eb3ff0c3f39f98002d8d42d7a8a- ported some patches2015-05-13T09:04:02+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/72773a6744609fdbc3bf39f58f073b05bd074c70Merge branch 'stable-3.0.5'2015-05-13T08:50:27+02:00Marius Cramerm.cramer@pixcept.de
Conflicts:
install/dist/lib/fedora.lib.php
install/dist/lib/opensuse.lib.php
install/lib/installer_base.lib.php
install/sql/ispconfig3.sql
install/tpl/config.inc.php.master
interface/lib/classes/aps_crawler.inc.php
interface/lib/classes/auth.inc.php
interface/lib/classes/plugin_backuplist.inc.php
interface/lib/config.inc.php
interface/lib/plugins/mail_user_filter_plugin.inc.php
interface/web/login/password_reset.php
interface/web/sites/templates/web_backup_list.htm
interface/web/sites/webdav_user_edit.php
interface/web/themes/blue/ispconfig_version
server/plugins-available/backup_plugin.inc.php
server/plugins-available/shelluser_base_plugin.inc.phphttps://git.ispconfig.org/mk/ispconfig3/-/commit/c2470177339f1db5bb5750dd955285b1b63c25e3Merge branch 'master' into 'master'2015-05-07T18:45:08+02:00Marius Cramerm.cramer@pixcept.de
Master
See merge request !186https://git.ispconfig.org/mk/ispconfig3/-/commit/0d73295b42edb4d0dbd7d6727af6939d95cdb963Updated ISPConfig version number to 3.0.5.4p62015-05-07T18:08:03+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/mk/ispconfig3/-/commit/2814e4f24f70bbef0f7daeda16a308a24e6518b3fixed lng-files from last commit2015-05-07T17:49:50+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/77f1ed0adcfa08ad404fe68d0f28a6aa4360342dRevert "fixed lng-files from last commit"2015-05-07T17:46:57+02:00Florian Schaalflorian@schaal-24.de
This reverts commit <a href="/ispconfig/ispconfig3/-/commit/1357c3e3c18c936671dac487877bd019470cac4e" data-reference-type="commit" data-original="1357c3e3c18c936671dac487877bd019470cac4e" data-link="false" data-link-reference="false" data-project="1" data-commit="1357c3e3c18c936671dac487877bd019470cac4e" data-container="body" data-placement="top" title="fixed lng-files from last commit" class="gfm gfm-commit has-tooltip">1357c3e3</a>.https://git.ispconfig.org/mk/ispconfig3/-/commit/42f0c93c2aeb981c3b9ee98bb484ffefc5ac9c1dFixed: FS#3888 - APS installer: String could not be parsed as XML2015-05-07T17:43:59+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/mk/ispconfig3/-/commit/741aa6aa3ec188aa4f37b26dc3314e2d0cd811aaMerge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32015-05-07T17:43:50+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/1357c3e3c18c936671dac487877bd019470cac4efixed lng-files from last commit2015-05-07T17:43:05+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/f6e42fc631acad20006ad79f63ccecc0a86ad0ebMerge branch 'master' into 'master'2015-05-07T17:26:41+02:00Marius Cramerm.cramer@pixcept.de
Prevent empty hostname during install
See merge request !184https://git.ispconfig.org/mk/ispconfig3/-/commit/5a56e6a9966a656796685494bf75902d01fae3dfSuppress errors on tmp_out array2015-05-07T17:06:48+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/d94b1e279416bcbd1a517851e7e3d606d6289fc8Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into st...2015-05-07T17:03:16+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/mk/ispconfig3/-/commit/743330f11621b2817c43a1fc73a298b82d8a8867Fixed: FS#3857 - Users unable to write in home directory.2015-05-07T17:03:07+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/mk/ispconfig3/-/commit/bb690d44eb8cbfce446b5bf023cdc7bd47a53fdbupdated avoid the second use of query in install.php2015-05-07T15:45:28+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/7eade0da5ec04ec86a89aed3c98e27cba3dae491 avoid the second use of query in install.php2015-05-07T14:33:08+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/14dff26f2bde65a931a368ef912823f2d035cc4euncomment vhost_rewrite_v6 in server_config.tform.php2015-05-07T14:16:43+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/9c79079e9cd5c53b61209bed6754ac6c06bbbda2Backported password generator patch2015-05-07T13:52:47+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/a3609a0f7fbd97ae487341e88c0b81fc5bf5b81dFS#2096 - Add "iptables" line in openvz vhost template file2015-05-07T10:48:16+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/671f79d3b1162d8b88f18f71949a13063f73fd6fMerge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32015-05-07T10:41:28+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/be531cf1d37d2293a572eef25d0190e23fc8a3b4Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig32015-05-07T10:12:05+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/mk/ispconfig3/-/commit/e1f709dcb98590b2158736f965ec5d08f5d3a4d4Allow longer IDs in capp.php2015-05-07T10:11:56+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/mk/ispconfig3/-/commit/c83951c5710f482bcced81084b17c12768ac996fSet stronger permission settings on amavis configuration files.2015-05-07T10:11:24+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/mk/ispconfig3/-/commit/5538547761447df757fa42d68c0bf17e219a6a73Set stronger permission settings on amavis configuration files.2015-05-07T10:10:42+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/mk/ispconfig3/-/commit/e59fe36d9eb59c79cb0eba03569358f9257c13beMerge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig32015-05-07T07:50:29+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/43e5b6608a6302e33824f27e9768079d883b38ac- replaced date time selects by textbox with datepicker2015-05-06T18:54:08+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/68af0bbdd603e8b8bb9eae2cbd55264ce0647ddbAdded Support for Ubuntu 15.04 in OS detect code.2015-05-06T18:33:08+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/mk/ispconfig3/-/commit/ed46b479b558fd5dba53f4bf79caf360130ba4ceAdded Support for Ubuntu 15.04 in OS detect code.2015-05-06T18:31:05+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/mk/ispconfig3/-/commit/ee405d849b027618eec69425ed845afdc076b562Prevent empty hostname during install2015-05-06T16:08:15+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/mk/ispconfig3/-/commit/b2f827b04393eecf33e16d6a883f5e6ff30086d9Merge branch 'master' into 'master'2015-05-05T16:25:51+02:00Marius Cramerm.cramer@pixcept.de
'repeat password'-query if the default password is not used
See merge request !183https://git.ispconfig.org/mk/ispconfig3/-/commit/480ebab07341507e76924eef9f5054b6abcafcabFixed smaller typo2015-05-05T16:25:17+02:00Marius Cramerm.cramer@pixcept.de