ISPConfig 3:922b2803302b184692ee7484c31c122929fbc8ad commits
https://git.ispconfig.org/ispconfig/ispconfig3/-/commits/922b2803302b184692ee7484c31c122929fbc8ad
2018-11-28T11:47:29+01:00
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/922b2803302b184692ee7484c31c122929fbc8ad
Merge branch 'master' into 'master'
2018-11-28T11:47:29+01:00
Till Brehm
tbrehm@ispconfig.org
create bg default index.html
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/842" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!842" data-link="false" data-link-reference="false" data-project="1" data-merge-request="995" data-project-path="ispconfig/ispconfig3" data-iid="842" data-container="body" data-placement="top" title="create bg default index.html" class="gfm gfm-merge_request">ispconfig/ispconfig3!842</a>
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/af030ccf36a1722a2a180357ad1c56a5766bd596
Update standard_index.html_bg
2018-11-27T22:47:07+01:00
Paco
p.vasileff@gmail.com
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/60820b77ea9077e93e5b587605965efee64e7cd4
Add new file
2018-11-27T22:41:48+01:00
Paco
p.vasileff@gmail.com
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/397dc0ce96fa96b272a19c8efe6b78efccbe110c
Revert "Merge branch 'merge-nginx-apache-plugins' into 'master'"
2018-11-12T21:29:04+01:00
Marius Burkard
m.burkard@pixcept.de
This reverts merge request <a href="/ispconfig/ispconfig3/-/merge_requests/841" data-reference-type="merge_request" data-original="!841" data-link="false" data-link-reference="false" data-project="1" data-merge-request="986" data-project-path="ispconfig/ispconfig3" data-iid="841" data-container="body" data-placement="top" title="unified nginx and apache plugin" class="gfm gfm-merge_request">!841</a>
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/df074a80b75752d5281fbb897d2f3113761d2033
Merge branch 'merge-nginx-apache-plugins' into 'master'
2018-11-12T21:28:37+01:00
Marius Burkard
m.burkard@pixcept.de
unified nginx and apache plugin
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/841" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!841" data-link="false" data-link-reference="false" data-project="1" data-merge-request="986" data-project-path="ispconfig/ispconfig3" data-iid="841" data-container="body" data-placement="top" title="unified nginx and apache plugin" class="gfm gfm-merge_request">ispconfig/ispconfig3!841</a>
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/9070533758aa3a8af9da7efab6436fa7bdadbe46
- unified nginx and apache plugin
2018-11-12T21:27:20+01:00
Marius Burkard
m.burkard@pixcept.de
- sourced out duplicate code
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/001bac916814792907d2cce5d08df32efa6e666a
Merge branch 'remove-php-modes' into 'master'
2018-11-12T11:12:23+01:00
Marius Burkard
m.burkard@pixcept.de
Remove php modes
Closes #4893
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/840" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!840" data-link="false" data-link-reference="false" data-project="1" data-merge-request="985" data-project-path="ispconfig/ispconfig3" data-iid="840" data-container="body" data-placement="top" title="Remove php modes" class="gfm gfm-merge_request">ispconfig/ispconfig3!840</a>
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/7349f551349dac2cecddf708341fd6a40966c952
- removed all deprecated PHP handlers (hhvm, cgi, suphp)
2018-11-12T11:08:57+01:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/1966e837a7a4b7bdf2fdb2a559e975fa293644b3
Merge branch 'remove-php-modes'
2018-11-12T10:08:27+01:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/abcae111ff719259f3204cf1d52293d30aff6d5f
- fixed spare merge conflict line
2018-11-12T10:07:56+01:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d8193946b6e5d78440606b1f072e67c4dd7b4459
Merge remote-tracking branch 'ispconfig3.official/master'
2018-11-12T10:00:23+01:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ea9f8ef673ac835db11af4e4633849f3396bef93
Merge branch 'master' into 'master'
2018-11-05T15:57:26+01:00
Till Brehm
tbrehm@ispconfig.org
Add website_symlink_plugin.inc.php
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/838" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!838" data-link="false" data-link-reference="false" data-project="1" data-merge-request="980" data-project-path="ispconfig/ispconfig3" data-iid="838" data-container="body" data-placement="top" title="Add website_symlink_plugin.inc.php" class="gfm gfm-merge_request">ispconfig/ispconfig3!838</a>
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f96269735b7f9dd7f49131fda5fc4bf9d9e428cb
Update website_symlink_plugin.inc.php
2018-11-05T15:56:04+01:00
Till Brehm
tbrehm@ispconfig.org
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/2cd49f48e842b81961fbc2031b920c1835c829a8
Add website_symlink_plugin.inc.php
2018-11-05T15:32:25+01:00
Choong Wei Tjeng
choong@bixels.nl
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/0281760d8294b053df35e370209fe6908359ad03
Merge branch 'patch-4' into 'master'
2018-10-29T11:32:40+01:00
Till Brehm
tbrehm@ispconfig.org
Patch 4
See merge request ispconfig/ispconfig3!833
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c9275b2a413e3632064e5ed850f256354a7797fd
Merge branch 'patch-3' into 'master'
2018-10-29T11:32:22+01:00
Till Brehm
tbrehm@ispconfig.org
Patch 3
See merge request ispconfig/ispconfig3!832
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/dfcb732f3ab223fa75ba656969a2aeb14171db39
Merge branch 'patch-2' into 'master'
2018-10-29T11:32:09+01:00
Till Brehm
tbrehm@ispconfig.org
Patch 2
See merge request ispconfig/ispconfig3!831
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f05f7828f24bb79e3860835c8540af8498a05a94
Merge branch 'patch-1' into 'master'
2018-10-29T11:31:48+01:00
Till Brehm
tbrehm@ispconfig.org
Patch 1
See merge request ispconfig/ispconfig3!830
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b172e3f499f76eab23b8e0fe0724ae6bb24aec87
Update vhost.conf.master to support TLS v1.3 ciphers
2018-10-28T14:24:34+01:00
Hj Ahmad Rasyid Hj Ismail
ahrasis@gmail.com
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/01df7d60d68945afb7e03566fd1d486c83af335f
Update nginx_vhost.conf.master to support TLS v1.3 and its ciphers
2018-10-28T14:18:13+01:00
Hj Ahmad Rasyid Hj Ismail
ahrasis@gmail.com
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f5543ea0cbdd3515657d5d85c609316f1b6dda6e
Update apache_ispconfig.vhost.master to support TLS v1.3 ciphers
2018-10-28T14:13:57+01:00
Hj Ahmad Rasyid Hj Ismail
ahrasis@gmail.com
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/aa8da84a820c0afa210db1d4415b54cc4dcb1120
Update nginx_ispconfig.vhost.master to support TLS v1.3 and its ciphers.
2018-10-28T14:10:37+01:00
Hj Ahmad Rasyid Hj Ismail
ahrasis@gmail.com
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/939f4aa0cf4290d3aa0366232cd753bed68be69a
Merge branch 'stable-3.1'
2018-10-25T22:18:32+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6628fb3d446d8e5397ca566a2cb2f48ef3f9a3a9
- partly revert previous
2018-10-25T22:18:09+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bdb066a8fe3a8aa6c92a078a46c34c678409fab6
Merge branch 'stable-3.1'
2018-10-25T22:16:34+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d6444a324aa98d16f72629a8209b77cbeca360e7
- loosen limits for pipelines
2018-10-25T22:16:16+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/7ed154e920fa21edaeff767fe34c0b0252ad8e63
Merge branch 'stable-3.1'
2018-10-25T21:56:03+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/14b6f07c3be1adaff03cbf4ca1cbaaae7b616cae
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stab...
2018-10-25T21:55:50+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/52afa697c2c7fb0f69e51781a1671ef374dcaecf
- limit syntax pipeline to schedules
2018-10-25T21:55:29+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/0bc89b9c8983b3ce03197ed0169831031fdbfa36
Update README.md
2018-10-25T21:48:28+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/fa9840215f2da74f78ca0e737b668663f7283d7a
Update README.md
2018-10-25T21:47:35+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6d629dd72acfb8fbd8542d18c3881c2e227c4f73
Update README.md
2018-10-25T21:46:32+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c7e7e585d2a47bc9556dbda09dbe287761e62762
Update README.md
2018-10-25T21:45:21+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/48bad7b8a604d2cb0fa07ab30f46e81aaeac58ec
Merge branch 'stable-3.1'
2018-10-25T17:13:01+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c8e56a74d23f9f92cd15984c8f680612b653761f
- changed gitignore file
2018-10-25T17:12:45+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8eca44099defc185804d88b7898d4eb6b95b0424
Merge branch 'patch-ci-test' into 'master'
2018-10-25T17:11:04+02:00
Marius Burkard
m.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/ispconfig/ispconfig3/-/commit/e10bb13c983a8d7bc79bfc319d3b7854d80f5602
Merge branch 'master' into 'patch-ci-test'
2018-10-25T17:10:33+02:00
Marius Burkard
m.burkard@pixcept.de
# Conflicts:
# .gitlab-ci.yml
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/93edc7d2ef32e14b78c8c7ac6c8ea74582cc3df4
Merge branch 'stable-3.1'
2018-10-25T16:14:55+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/3121ea9f2c1af9509f4d6678a2e9fded6379ccc0
phplint config from merge request !827
2018-10-25T16:11:45+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/9a1f097fac4b0e1625389ff94243f26af4a3daa0
- taken gitlab ci config from merge request !827
2018-10-25T16:10:33+02:00
Marius Burkard
m.burkard@pixcept.de