ISPConfig 3:72be81baf8ea6d6aaa79217d7eeb4c3727dc04de commitshttps://git.ispconfig.org/helmo/ispconfig3/-/commits/72be81baf8ea6d6aaa79217d7eeb4c3727dc04de2018-07-30T10:42:58+02:00https://git.ispconfig.org/helmo/ispconfig3/-/commit/72be81baf8ea6d6aaa79217d7eeb4c3727dc04deMerge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stab...2018-07-30T10:42:58+02:00florian030florian@schaal-24.dehttps://git.ispconfig.org/helmo/ispconfig3/-/commit/7630f59c73ce29d0058e125bd7297ac34d138a26show reseller in client template list2018-07-25T20:11:14+02:00florian030florian@schaal-24.dehttps://git.ispconfig.org/helmo/ispconfig3/-/commit/081f738e6aee674e3cb20cb17bc9d0dda7518574show active for additional php-versions (#5090)2018-07-25T17:04:55+02:00florian030florian@schaal-24.dehttps://git.ispconfig.org/helmo/ispconfig3/-/commit/f055f5e9bf002bf5a35a2f0f397cdf43ee86a254Revert "show active for additional php-versions (#5090)"2018-07-25T17:01:57+02:00florian030florian@schaal-24.de
This reverts commit <a href="/GameO7er/ispconfig3/-/commit/c97bed4466ec457c9b9bb80f50b73fb3765aafea" data-reference-type="commit" data-original="c97bed4466ec457c9b9bb80f50b73fb3765aafea" data-link="false" data-link-reference="false" data-project="439" data-commit="c97bed4466ec457c9b9bb80f50b73fb3765aafea" data-container="body" data-placement="top" title="show active for additional php-versions (#5090)" class="gfm gfm-commit has-tooltip">c97bed44</a>.https://git.ispconfig.org/helmo/ispconfig3/-/commit/ef5c6457cce0f4d3b034b606bc804c8ef8c23f0eRevert "Revert "clean-up code""2018-07-25T17:01:33+02:00florian030florian@schaal-24.de
This reverts commit <a href="/t.heller/ispconfig3/-/commit/0933e16927f36ed30b64716228e6589c0d39beaf" data-reference-type="commit" data-original="0933e16927f36ed30b64716228e6589c0d39beaf" data-link="false" data-link-reference="false" data-project="448" data-commit="0933e16927f36ed30b64716228e6589c0d39beaf" data-container="body" data-placement="top" title='Revert "clean-up code"' class="gfm gfm-commit has-tooltip">0933e169</a>.https://git.ispconfig.org/helmo/ispconfig3/-/commit/0933e16927f36ed30b64716228e6589c0d39beafRevert "clean-up code"2018-07-25T17:00:51+02:00florian030florian@schaal-24.de
This reverts commit <a href="/t.heller/ispconfig3/-/commit/ff16ebc265c0c59e6966f5323e216dd257543d92" data-reference-type="commit" data-original="ff16ebc265c0c59e6966f5323e216dd257543d92" data-link="false" data-link-reference="false" data-project="448" data-commit="ff16ebc265c0c59e6966f5323e216dd257543d92" data-container="body" data-placement="top" title="clean-up code" class="gfm gfm-commit has-tooltip">ff16ebc2</a>.https://git.ispconfig.org/helmo/ispconfig3/-/commit/c97bed4466ec457c9b9bb80f50b73fb3765aafeashow active for additional php-versions (#5090)2018-07-25T16:59:12+02:00florian030florian@schaal-24.dehttps://git.ispconfig.org/helmo/ispconfig3/-/commit/09a9ecbbe1dadffa0247f3dafdc0e673a2de264cMerge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stab...2018-07-25T15:32:51+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/helmo/ispconfig3/-/commit/840f3954b51c9c494b6dea661b2d20ad92460e89- fixed module button display on dashlet if multiple modules have same order ...2018-07-25T15:32:28+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/helmo/ispconfig3/-/commit/ff16ebc265c0c59e6966f5323e216dd257543d92clean-up code2018-07-25T15:25:12+02:00florian030florian@schaal-24.dehttps://git.ispconfig.org/helmo/ispconfig3/-/commit/c7ab115f8929a290822a962619c674eb4342c552Add option to "name" default php-version for websites per server (#5089)2018-07-25T15:21:49+02:00florian030florian@schaal-24.dehttps://git.ispconfig.org/helmo/ispconfig3/-/commit/b1cfd5bb00082502f2543728faae19700ded73caImproved code to set server_name under system config.2018-07-16T18:12:06+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/helmo/ispconfig3/-/commit/ef20902f74dcc1f11a61e536c79d7388afa2eb1bMerge branch 'stable-3.1' into 'stable-3.1'2018-07-16T18:10:48+02:00Till Brehmtbrehm@ispconfig.org
Show server hostname under system > server config (#5063)
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/800" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!800" data-link="false" data-link-reference="false" data-project="1" data-merge-request="914" data-project-path="ispconfig/ispconfig3" data-iid="800" data-container="body" data-placement="top" title="Show server hostname under system > server config (#5063)" class="gfm gfm-merge_request">ispconfig/ispconfig3!800</a>https://git.ispconfig.org/helmo/ispconfig3/-/commit/67d81d3f6d367b8ce011b5bf85c566fdb815c6ceFixed nginx socket path in apps vhost for Ubuntu 18.04.2018-07-16T17:31:29+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/helmo/ispconfig3/-/commit/da1e393d7bed829d180dd9006019201e3370e77aMerge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stab...2018-07-16T14:25:29+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/helmo/ispconfig3/-/commit/43e1d025cf60e25577647827c9c26ed609999638Extended IDS whitelist.2018-07-16T14:24:20+02:00Till Brehmtbrehm@ispconfig.orgFixed connection issue in mail account import tool.https://git.ispconfig.org/helmo/ispconfig3/-/commit/0b249e76bdf3efb6576fe47d243b156d358a7e0dMerge branch 'stable-kernel-lang' into 'stable-3.1'2018-07-16T11:35:27+02:00Till Brehmtbrehm@ispconfig.org
Add word "Kernel" to respective language files
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/808" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!808" data-link="false" data-link-reference="false" data-project="1" data-merge-request="923" data-project-path="ispconfig/ispconfig3" data-iid="808" data-container="body" data-placement="top" title='Add word "Kernel" to respective language files' class="gfm gfm-merge_request">ispconfig/ispconfig3!808</a>https://git.ispconfig.org/helmo/ispconfig3/-/commit/bd0a143197df67a69c8b6926466070b02b1245acMerge branch 'patch-2' into 'stable-3.1'2018-07-16T11:35:10+02:00Till Brehmtbrehm@ispconfig.org
Update show_sys_state.php to display current kernel info.
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/806" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!806" data-link="false" data-link-reference="false" data-project="1" data-merge-request="921" data-project-path="ispconfig/ispconfig3" data-iid="806" data-container="body" data-placement="top" title="Update show_sys_state.php to display current kernel info." class="gfm gfm-merge_request">ispconfig/ispconfig3!806</a>https://git.ispconfig.org/helmo/ispconfig3/-/commit/01500b41c74eaf64b696befcf006dd034ee8ad6bMerge branch 'patch-1' into 'stable-3.1'2018-07-16T11:34:58+02:00Till Brehmtbrehm@ispconfig.org
Add new file 100-monitor_kernel_version.inc.php to stable-3.1
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/805" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!805" data-link="false" data-link-reference="false" data-project="1" data-merge-request="920" data-project-path="ispconfig/ispconfig3" data-iid="805" data-container="body" data-placement="top" title="Add new file 100-monitor_kernel_version.inc.php to stable-3.1" class="gfm gfm-merge_request">ispconfig/ispconfig3!805</a>https://git.ispconfig.org/helmo/ispconfig3/-/commit/8f688ff07e800176eade9652397f199e87724156Add word "Kernel" to respective language files2018-07-14T15:26:08+08:00ahrasisahrasis@gmail.com
Add word "Kernel" to all respective language files in stable3.1.
$wb['monitor_serverstate_kernel_txt'] = 'Kernel';
In relation with the earlier merged commits of <a href="/ispconfig/ispconfig3/-/merge_requests/790" data-reference-type="merge_request" data-original="!790" data-link="false" data-link-reference="false" data-project="1" data-merge-request="902" data-project-path="ispconfig/ispconfig3" data-iid="790" data-container="body" data-placement="top" title="Update show_sys_state.php to display current kernel info." class="gfm gfm-merge_request">!790</a>
and <a href="/ispconfig/ispconfig3/-/merge_requests/791" data-reference-type="merge_request" data-original="!791" data-link="false" data-link-reference="false" data-project="1" data-merge-request="903" data-project-path="ispconfig/ispconfig3" data-iid="791" data-container="body" data-placement="top" title="Add new file to display current kernel info." class="gfm gfm-merge_request">!791</a>.https://git.ispconfig.org/helmo/ispconfig3/-/commit/aa5687d9dee57ce452714fe9996f01aa1f8ed94dUpdate show_sys_state.php to display current kernel info for stable-3.1 in...2018-07-14T07:24:28+02:00Hj Ahmad Rasyid Hj Ismailahrasis@gmail.comUpdate show_sys_state.php to display current kernel info for stable-3.1 in relation to recently merged commits of <a href="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/790" data-reference-type="merge_request" data-original="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/790" data-link="false" data-link-reference="true" data-project="1" data-merge-request="902" data-project-path="ispconfig/ispconfig3" data-iid="790" data-container="body" data-placement="top" title="Update show_sys_state.php to display current kernel info." class="gfm gfm-merge_request">ispconfig/ispconfig3!790</a> and <a href="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/791" data-reference-type="merge_request" data-original="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/791" data-link="false" data-link-reference="true" data-project="1" data-merge-request="903" data-project-path="ispconfig/ispconfig3" data-iid="791" data-container="body" data-placement="top" title="Add new file to display current kernel info." class="gfm gfm-merge_request">ispconfig/ispconfig3!791</a>.
There is a fix to the filename for master submitted via commit <a href="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/804" data-reference-type="merge_request" data-original="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/804" data-link="false" data-link-reference="true" data-project="1" data-merge-request="919" data-project-path="ispconfig/ispconfig3" data-iid="804" data-container="body" data-placement="top" title="Missed .inc in filename 100-monitor-kernel-version.php" class="gfm gfm-merge_request">ispconfig/ispconfig3!804</a> that is still pending.https://git.ispconfig.org/helmo/ispconfig3/-/commit/bd449bbe02da00cc71bbac55c371d17b1627d43bAdd new file 100-monitor_kernel_version.inc.php to stable-3.1 in relation to...2018-07-14T07:19:03+02:00Hj Ahmad Rasyid Hj Ismailahrasis@gmail.comAdd new file 100-monitor_kernel_version.inc.php to stable-3.1 in relation to recently merged commits of <a href="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/790" data-reference-type="merge_request" data-original="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/790" data-link="false" data-link-reference="true" data-project="1" data-merge-request="902" data-project-path="ispconfig/ispconfig3" data-iid="790" data-container="body" data-placement="top" title="Update show_sys_state.php to display current kernel info." class="gfm gfm-merge_request">ispconfig/ispconfig3!790</a> and <a href="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/791" data-reference-type="merge_request" data-original="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/791" data-link="false" data-link-reference="true" data-project="1" data-merge-request="903" data-project-path="ispconfig/ispconfig3" data-iid="791" data-container="body" data-placement="top" title="Add new file to display current kernel info." class="gfm gfm-merge_request">ispconfig/ispconfig3!791</a>.
There is a fix to the filename for master submitted via commit <a href="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/804" data-reference-type="merge_request" data-original="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/804" data-link="false" data-link-reference="true" data-project="1" data-merge-request="919" data-project-path="ispconfig/ispconfig3" data-iid="804" data-container="body" data-placement="top" title="Missed .inc in filename 100-monitor-kernel-version.php" class="gfm gfm-merge_request">ispconfig/ispconfig3!804</a> that is still pending.https://git.ispconfig.org/helmo/ispconfig3/-/commit/cbd3cd11d56d2704daac8e1df442dbc66cf49229typo in resync-tool and fixed server-list for mailfilter2018-07-06T08:40:48+02:00florian030florian@schaal-24.dehttps://git.ispconfig.org/helmo/ispconfig3/-/commit/ebe19f2109cca4e226a890e1b08d6b3719a73db5Show server hostname under system > server config (#5063)2018-07-06T08:09:25+02:00florian030florian@schaal-24.dehttps://git.ispconfig.org/helmo/ispconfig3/-/commit/88f9b3a054abb4d3411e60fa8cd6c917001c24ffMerge branch 'stable-3.1' into 'stable-3.1'2018-07-05T15:29:58+02:00Till Brehmtbrehm@ispconfig.org
mail routing configuration allows every server to be selected (Fixes #5068)
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/799" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!799" data-link="false" data-link-reference="false" data-project="1" data-merge-request="913" data-project-path="ispconfig/ispconfig3" data-iid="799" data-container="body" data-placement="top" title="mail routing configuration allows every server to be selected (Fixes #5068)" class="gfm gfm-merge_request">ispconfig/ispconfig3!799</a>https://git.ispconfig.org/helmo/ispconfig3/-/commit/1801e0657ce9bc566631a9f37e8182531b8711c3mail routing configuration allows every server to be selected (Fixes #5068)2018-07-05T13:48:55+02:00florian030florian@schaal-24.dehttps://git.ispconfig.org/helmo/ispconfig3/-/commit/88240a914d1e12e6d2e72b3f975360b4c8426baeMerge branch 'feature/4558-mysql-connect-with-client-flags' into 'stable-3.1'2018-07-03T16:12:14+02:00Marius Burkardm.burkard@pixcept.de
MySQL connect with client flags. Fixes #4558
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/798" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!798" data-link="false" data-link-reference="false" data-project="1" data-merge-request="912" data-project-path="ispconfig/ispconfig3" data-iid="798" data-container="body" data-placement="top" title="MySQL connect with client flags. Fixes #4558" class="gfm gfm-merge_request">ispconfig/ispconfig3!798</a>https://git.ispconfig.org/helmo/ispconfig3/-/commit/a1c15afc49444c4c32890caedcb82f314b59f671MySQL connect with client flags. Fixes #45582018-07-03T10:52:16+02:00Choong Wei Tjengchoong@bixels.nlhttps://git.ispconfig.org/helmo/ispconfig3/-/commit/416cda95999fcfd1f29d52cfbc52a65ba9df629fMerge branch 'feature/fix-remoting-sys-user-lang-update' into 'stable-3.1'2018-07-03T10:08:56+02:00Till Brehmtbrehm@ispconfig.org
Also update sys_user language if it was specified through API client_update
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/797" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!797" data-link="false" data-link-reference="false" data-project="1" data-merge-request="911" data-project-path="ispconfig/ispconfig3" data-iid="797" data-container="body" data-placement="top" title="Also update sys_user language if it was specified through API client_update" class="gfm gfm-merge_request">ispconfig/ispconfig3!797</a>https://git.ispconfig.org/helmo/ispconfig3/-/commit/95d4d5cf93ce890c9c4a1b3635d730f040efb3dbAlso update sys_user language if it was specified through API client_update2018-07-03T09:57:51+02:00Choong Wei Tjengchoong@bixels.nlhttps://git.ispconfig.org/helmo/ispconfig3/-/commit/7c05ac3970e3c5de5ab68f9d3fe7df4a6b2e81e3Fixed: #5062 log rotate ispconfig error.log.1.gz2018-06-19T15:33:56+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/helmo/ispconfig3/-/commit/c9abb2d53343035f5460000e8f196c7754f5153bMerge branch 'stable-3.1' into 'stable-3.1'2018-06-15T21:13:06+02:00Till Brehmtbrehm@ispconfig.org
re-creation for dkim keys fails (Fixes #5061)
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/796" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!796" data-link="false" data-link-reference="false" data-project="1" data-merge-request="908" data-project-path="ispconfig/ispconfig3" data-iid="796" data-container="body" data-placement="top" title="re-creation for dkim keys fails (Fixes #5061)" class="gfm gfm-merge_request">ispconfig/ispconfig3!796</a>https://git.ispconfig.org/helmo/ispconfig3/-/commit/641043555f12aa9b6d0d9ff944789045616d75e1update last commit2018-06-15T19:25:54+02:00florian030florian@schaal-24.dehttps://git.ispconfig.org/helmo/ispconfig3/-/commit/f3de95cbaee74e18b2dd25b7b57f9cbcf150fc31re-creation for dkim keys fails (Fixes #5061)2018-06-15T16:28:38+02:00florian030florian@schaal-24.dehttps://git.ispconfig.org/helmo/ispconfig3/-/commit/a25fa66c1b97217940863317cce5d41d5568fdc4Added remote functions config_value_get, config_value_add,...2018-06-11T17:12:39+02:00Till Brehmtbrehm@ispconfig.orgAdded remote functions config_value_get, config_value_add, config_value_update, config_value_replace and config_value_delete to access the sys_config key / value store in ISPConfig from remote api.
https://git.ispconfig.org/helmo/ispconfig3/-/commit/e15923ab7b37140935d68de26a96e6c7e14dc348Merge branch 'patch-1' into 'stable-3.1'2018-05-29T19:06:35+02:00Till Brehmtbrehm@ispconfig.org
Fix #select_server a that is affected by #sidebar a
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/786" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!786" data-link="false" data-link-reference="false" data-project="1" data-merge-request="898" data-project-path="ispconfig/ispconfig3" data-iid="786" data-container="body" data-placement="top" title="Fix #select_server a that is affected by #sidebar a" class="gfm gfm-merge_request">ispconfig/ispconfig3!786</a>https://git.ispconfig.org/helmo/ispconfig3/-/commit/83738cbe02bfd19747a29bae72121a4090bac8a0Merge branch 'patch-2' into 'stable-3.1'2018-05-29T19:06:13+02:00Till Brehmtbrehm@ispconfig.org
Use Acme v2 if supported
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/787" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!787" data-link="false" data-link-reference="false" data-project="1" data-merge-request="899" data-project-path="ispconfig/ispconfig3" data-iid="787" data-container="body" data-placement="top" title="Use Acme v2 if supported" class="gfm gfm-merge_request">ispconfig/ispconfig3!787</a>https://git.ispconfig.org/helmo/ispconfig3/-/commit/e3a1292ead0fae92635f14b7d3bf00a29121766eUpdate letsencrypt.inc.php as per the discussion at...2018-05-26T03:43:38+02:00Hj Ahmad Rasyid Hj Ismailahrasis@gmail.comUpdate letsencrypt.inc.php as per the discussion at <a href="https://git.ispconfig.org/ispconfig/ispconfig3/issues/5030" data-reference-type="issue" data-original="https://git.ispconfig.org/ispconfig/ispconfig3/issues/5030" data-link="false" data-link-reference="true" data-project="1" data-issue="23508" data-project-path="ispconfig/ispconfig3" data-iid="5030" data-issue-type="issue" data-container="body" data-placement="top" title="Use Acme v2 if supported" class="gfm gfm-issue">ispconfig/ispconfig3#5030</a>. Already pr'ed and merged in master via <a href="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/778" data-reference-type="merge_request" data-original="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/778" data-link="false" data-link-reference="true" data-project="1" data-merge-request="890" data-project-path="ispconfig/ispconfig3" data-iid="778" data-container="body" data-placement="top" title="Update letsencrypt.inc.php to use Acme v2 if it is supported." class="gfm gfm-merge_request">ispconfig/ispconfig3!778</a>. Perhaps can be merged with stable too?https://git.ispconfig.org/helmo/ispconfig3/-/commit/ed46ade140dca708e597634fb6e6324f1e7ddf92Update ispconfig.css to fix #select_server a that is affected by #sidebar a...2018-05-26T03:37:02+02:00Hj Ahmad Rasyid Hj Ismailahrasis@gmail.comUpdate ispconfig.css to fix #select_server a that is affected by #sidebar a padding of 10px. Already pr'ed and merged in master via <a href="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/766" data-reference-type="merge_request" data-original="https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/766" data-link="false" data-link-reference="true" data-project="1" data-merge-request="877" data-project-path="ispconfig/ispconfig3" data-iid="766" data-container="body" data-placement="top" title="Fix #select_server a that is affected by #sidebar a padding of 10px." class="gfm gfm-merge_request">ispconfig/ispconfig3!766</a>. Perhaps can be merged with stable too?https://git.ispconfig.org/helmo/ispconfig3/-/commit/122ee008305034a7fdd1878852ab06d296b0b7f3Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stab...2018-05-25T17:02:17+02:00Till Brehmtbrehm@ispconfig.org