ISPConfig 3:c7e7e585d2a47bc9556dbda09dbe287761e62762 commitshttps://git.ispconfig.org/ufoonline/ispconfig3/-/commits/c7e7e585d2a47bc9556dbda09dbe287761e627622018-10-25T21:45:21+02:00https://git.ispconfig.org/ufoonline/ispconfig3/-/commit/c7e7e585d2a47bc9556dbda09dbe287761e62762Update README.md2018-10-25T21:45:21+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/48bad7b8a604d2cb0fa07ab30f46e81aaeac58ecMerge branch 'stable-3.1'2018-10-25T17:13:01+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/c8e56a74d23f9f92cd15984c8f680612b653761f- changed gitignore file2018-10-25T17:12:45+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/8eca44099defc185804d88b7898d4eb6b95b0424Merge branch 'patch-ci-test' into 'master'2018-10-25T17:11:04+02:00Marius Burkardm.burkard@pixcept.de
Add ci test for php syntax
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/827" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!827" data-link="false" data-link-reference="false" data-project="1" data-merge-request="965" data-project-path="ispconfig/ispconfig3" data-iid="827" data-container="body" data-placement="top" title="Add ci test for php syntax" class="gfm gfm-merge_request">ispconfig/ispconfig3!827</a>https://git.ispconfig.org/ufoonline/ispconfig3/-/commit/e10bb13c983a8d7bc79bfc319d3b7854d80f5602Merge branch 'master' into 'patch-ci-test'2018-10-25T17:10:33+02:00Marius Burkardm.burkard@pixcept.de
# Conflicts:
# .gitlab-ci.ymlhttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/93edc7d2ef32e14b78c8c7ac6c8ea74582cc3df4Merge branch 'stable-3.1'2018-10-25T16:14:55+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/3121ea9f2c1af9509f4d6678a2e9fded6379ccc0phplint config from merge request !8272018-10-25T16:11:45+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/9a1f097fac4b0e1625389ff94243f26af4a3daa0- taken gitlab ci config from merge request !8272018-10-25T16:10:33+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/ca6e0cc0e5a17be3f2683e9bcf704febf571a7c7 taken gitlab ci from merge request !8272018-10-25T16:09:53+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/6ffa1f6f1e2ca8e835195620f2d913aaf4c26289Merge branch 'stable-3.1'2018-10-25T15:49:29+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/d8b0b8424f1d3cdc60bd150d94df08b17f4b860d- added gitlab ci file for php syntax check2018-10-25T15:48:31+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/c3be1c38b5f71d6b36c54d3480c49a9b1e76198eFixed #5165 PHP Syntax error in "install/dist/lib/opensuse.lib.php" on line 5102018-10-25T14:55:01+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/1c365f0cba035faf4307cb7d80880a38698dee31Merge branch 'stable-3.1' into 'stable-3.1'2018-10-18T09:48:18+02:00Till Brehmtbrehm@ispconfig.org
fix getDatabaseSize()
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/829" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!829" data-link="false" data-link-reference="false" data-project="1" data-merge-request="968" data-project-path="ispconfig/ispconfig3" data-iid="829" data-container="body" data-placement="top" title="fix getDatabaseSize()" class="gfm gfm-merge_request">ispconfig/ispconfig3!829</a>https://git.ispconfig.org/ufoonline/ispconfig3/-/commit/8c4359bb44c1d271234ee1f13c6af56289f62b26fix getDatabaseSize()2018-10-17T12:03:56-06:00Jesse Norelljesse@kci.nethttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/9e96b63baa27e2a9d9b63fb0c7fa17f00d75864cMerge branch 'patch-3' into 'master'2018-10-15T19:58:40+02:00Till Brehmtbrehm@ispconfig.org
Do not show db or site quota when the sites module is not active
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/825" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!825" data-link="false" data-link-reference="false" data-project="1" data-merge-request="963" data-project-path="ispconfig/ispconfig3" data-iid="825" data-container="body" data-placement="top" title="Do not show db or site quota when the sites module is not active" class="gfm gfm-merge_request">!825</a>https://git.ispconfig.org/ufoonline/ispconfig3/-/commit/e95c9a507c21946767101f4a43a1bd5d5864403eMerge branch 'patch-2' into 'master'2018-10-15T19:58:07+02:00Till Brehmtbrehm@ispconfig.org
My first translation update
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/826" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!826" data-link="false" data-link-reference="false" data-project="1" data-merge-request="964" data-project-path="ispconfig/ispconfig3" data-iid="826" data-container="body" data-placement="top" title="My first translation update" class="gfm gfm-merge_request">ispconfig/ispconfig3!826</a>https://git.ispconfig.org/ufoonline/ispconfig3/-/commit/6d28d42123a97ef9c1ffdafc013177d152ff50c1Merge branch 'patch-3' into 'stable-3.1'2018-10-15T19:56:37+02:00Till Brehmtbrehm@ispconfig.org
Update apache_ispconfig.vhost.master
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/828" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!828" data-link="false" data-link-reference="false" data-project="1" data-merge-request="966" data-project-path="ispconfig/ispconfig3" data-iid="828" data-container="body" data-placement="top" title="Update apache_ispconfig.vhost.master" class="gfm gfm-merge_request">ispconfig/ispconfig3!828</a>https://git.ispconfig.org/ufoonline/ispconfig3/-/commit/3b44e5d42ce4a0d8fcb1839fe866f4a8090bb270Update apache_ispconfig.vhost.master2018-10-15T19:39:45+02:00Jesse Norelljesse@kci.nethttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/b7794d7d7b9cfb4f1c81dcd7d1f93b6693c91e35Fix 3 syntax errors in Italian lang files2018-10-15T16:28:07+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/d641385baff2917cd66bafadf37a4ed0970941efAdd php syntax check via GitLab CI2018-10-15T16:08:50+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/ab6cf3fcf8154ee1a1b9858f2a414a369b91cab1My first translation update2018-10-15T14:58:05+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/baf703b92b4644f132db15987346a893a0a00702Do not show db or site quota when the sites module is not active2018-10-15T14:57:08+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/74a297a2409304a2e2ffdcc42cac154ecf7c7113Merge branch 'patch-3' into 'stable-3.1'2018-10-12T11:45:19+02:00Till Brehmtbrehm@ispconfig.org
Add Content-Security-Policy header and friends.
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/824" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!824" data-link="false" data-link-reference="false" data-project="1" data-merge-request="961" data-project-path="ispconfig/ispconfig3" data-iid="824" data-container="body" data-placement="top" title="Add Content-Security-Policy header and friends." class="gfm gfm-merge_request">ispconfig/ispconfig3!824</a>https://git.ispconfig.org/ufoonline/ispconfig3/-/commit/b5dd05ad4676a89362f91d8b12472181da2357c2Add Content-Security-Policy header and friends.2018-10-11T21:51:53+02:00Jesse Norelljesse@kci.nethttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/06cf8f6edcebb3c228dd8f9b080b034a487eac5bMerge branch 'revert-ca7c77d9' into 'stable-3.1'2018-10-11T19:23:53+02:00Till Brehmtbrehm@ispconfig.org
Revert "Update apache_ispconfig.vhost.master"
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/823" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!823" data-link="false" data-link-reference="false" data-project="1" data-merge-request="960" data-project-path="ispconfig/ispconfig3" data-iid="823" data-container="body" data-placement="top" title='Revert "Update apache_ispconfig.vhost.master"' class="gfm gfm-merge_request">ispconfig/ispconfig3!823</a>https://git.ispconfig.org/ufoonline/ispconfig3/-/commit/c825a73677068845d56e32abc4e6b709ec4b65b6Revert "Update apache_ispconfig.vhost.master"2018-10-11T19:22:36+02:00Till Brehmtbrehm@ispconfig.org
This reverts commit <a href="/florian030/ispconfig3/-/commit/ca7c77d98cf8e8136be883ea29056de7097beef8" data-reference-type="commit" data-original="ca7c77d98cf8e8136be883ea29056de7097beef8" data-link="false" data-link-reference="false" data-project="490" data-commit="ca7c77d98cf8e8136be883ea29056de7097beef8" data-container="body" data-placement="top" title="Update apache_ispconfig.vhost.master" class="gfm gfm-commit has-tooltip">ca7c77d9</a>https://git.ispconfig.org/ufoonline/ispconfig3/-/commit/eada920c539d5667c0538c81c00c7eab9c4339faMerge branch 'patch-3' into 'stable-3.1'2018-10-10T19:52:02+02:00Till Brehmtbrehm@ispconfig.org
Mulitple HSTS headers are not allowed, should either unset before adding new, or set conditionally.
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/822" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!822" data-link="false" data-link-reference="false" data-project="1" data-merge-request="959" data-project-path="ispconfig/ispconfig3" data-iid="822" data-container="body" data-placement="top" title="Mulitple HSTS headers are not allowed, should either unset before adding new, or set conditionally." class="gfm gfm-merge_request">ispconfig/ispconfig3!822</a>https://git.ispconfig.org/ufoonline/ispconfig3/-/commit/ca7c77d98cf8e8136be883ea29056de7097beef8Update apache_ispconfig.vhost.master2018-10-10T18:41:26+02:00Jesse Norelljesse@kci.nethttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/36684dcf752c761f02bc85c6513db81e6482facdMulitple HSTS headers are not allowed, should either unset before adding new,...2018-10-10T18:37:08+02:00Jesse Norelljesse@kci.nethttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/3f8c72efe88cfaa8738e2aefd9a3082eda7af0adMerge branch 'patch-1' into 'master'2018-09-21T12:41:51+02:00Till Brehmtbrehm@ispconfig.org
Various minor code cleanups
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/820" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!820" data-link="false" data-link-reference="false" data-project="1" data-merge-request="955" data-project-path="ispconfig/ispconfig3" data-iid="820" data-container="body" data-placement="top" title="Various minor code cleanups" class="gfm gfm-merge_request">ispconfig/ispconfig3!820</a>https://git.ispconfig.org/ufoonline/ispconfig3/-/commit/bf7714a52ff51df57855e4b726d0cc20cb706e3eCorrect warning message2018-09-21T08:51:10+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/b73e97826715c3e7d38f531f435b0637d7c41e55Cleanup whitespace2018-09-21T08:48:04+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/f112fd1a7cb88507655f0484f128f66a6bdfa9f9correct index path2018-09-21T08:48:04+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/b0b62599527d1bcb21e3fa40e600fa4f22ad1e01fix typo2018-09-21T08:48:04+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/a8d1dd2194508ec6a5710fc9b0f50afacca19d6bSet a descriptive name for the return vanlue of mail_user_add();2018-09-21T08:48:04+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/741a08915729ee967af606a416640246e03a997fRemove old duplicate example, it is an old copy of sites_database_add.php2018-09-21T08:48:04+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/e2465bd7a2d324259c3c1dae00dfca8c2535edccFixed #5128 Bug in password strength meter2018-09-17T11:13:31+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/400986dc254227ff206d966dfeb06e6cadc51adaMerge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stab...2018-09-17T11:08:49+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ufoonline/ispconfig3/-/commit/98a32a22478a42db7a537709f01239213bcb9b27Merge branch 'stable-3.1' into 'stable-3.1'2018-09-12T17:52:45+02:00Till Brehmtbrehm@ispconfig.org
fixed sql-query for master-server for mail-backups
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/819" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!819" data-link="false" data-link-reference="false" data-project="1" data-merge-request="954" data-project-path="ispconfig/ispconfig3" data-iid="819" data-container="body" data-placement="top" title="fixed sql-query for master-server for mail-backups" class="gfm gfm-merge_request">ispconfig/ispconfig3!819</a>https://git.ispconfig.org/ufoonline/ispconfig3/-/commit/a27954c5006042c1e2a62210dd1265502d1f0f1cfixed sql-query for master-server for mail-backups2018-09-12T17:09:15+02:00florian030florian@schaal-24.de