maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
4,087 Commits 6 Branches 188 Tags
c43915c09d662803ea14cf5280f69174053512f4
Commit Graph

4087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann
c43915c09d show task 12 in admin dashboard overview if active 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-07-03 12:00:47 +02:00
Michael Kaufmann
01bf814496 remove domain ssl information from acme.sh and filesystem on deletion to avoid trying to renew certificates 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-07-01 20:32:13 +02:00
Michael Kaufmann
2ce517e84a use Fts.add when adding new Customers to reduce duplicate code 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-28 15:15:17 +02:00
Michael Kaufmann
e209989f2a use EmailAccounts.delete API call in Emails.delete instead of repeating the code 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-28 11:07:29 +02:00
Michael Kaufmann
5dfb74701c improve error message display on missing vendor-folder 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-25 11:10:32 +02:00
Michael Kaufmann
bdd583d251 Merge branch 'drexlma-patch-2' 2019-06-25 10:59:06 +02:00
Michael Kaufmann
fd8a1d8dc2 Merge branch 'patch-2' of https://github.com/drexlma/Froxlor into drexlma-patch-2 2019-06-25 10:58:57 +02:00
Michael Kaufmann
d2818f8020 Merge branch 'drexlma-patch-3' 2019-06-25 10:58:20 +02:00
Michael Kaufmann
80a0a34b46 Merge branch 'patch-3' of https://github.com/drexlma/Froxlor into drexlma-patch-3 2019-06-25 10:57:45 +02:00
Michael Kaufmann
6e41c0ad2c add codecov.io to travis build for code-coverage stats - yay 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-17 14:11:40 +02:00
Michael Kaufmann
a07a9e6a88 more unit-testing, enhancements in Store-functions 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-11 12:10:56 +02:00
Michael Kaufmann
7a94a43053 started \Settings\Store unit tests 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-10 13:37:22 +02:00
Michael Kaufmann
028524291e test improvements and preparation for more tests later 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-10 11:38:47 +02:00
Michael Kaufmann
1ac304e5ac fix missing domainname parameter when manually adding ssl-certificates for a domain, fixes #700 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-10 11:36:05 +02:00
Michael Kaufmann
f266bb05c9 testing \Froxlor\Settings\FroxlorVhostSettings 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-06 13:04:43 +02:00
Michael Kaufmann
d8a8f76dc9 update dev-environment to use more recent versions, requries php-7.3 now (dev-only) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-06 10:18:03 +02:00
Michael Kaufmann
0afbe3d13b add validation tests 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-05 20:52:37 +02:00
Michael Kaufmann
4917b9c057 added first validation tests 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-05 09:07:21 +02:00
Michael Kaufmann
13bfd62ac5 move validateUrl function to correct file 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-05 06:50:06 +02:00
Michael Kaufmann
97703e7a0c add a few tests for Settings 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-05 06:39:44 +02:00
Michael Kaufmann
13086d91d8 only validate and process ip-list if given at all 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-04 15:14:51 +02:00
Michael Kaufmann
b7a10fdeda fix vhost(parts)-merging in nginx cron, fixes #669 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-06-03 11:59:56 +02:00
Michael Kaufmann
6806f896d6 fix proftp path of rhel/centos config template, fixes #636 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-05-31 08:02:03 +02:00
Michael Kaufmann
87a2f86365 do not set default ssl-ips if the frontend values are left empty; if default ssl-ips are specified, preset them in the form when adding a domain, fixes #697 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-05-30 17:44:08 +02:00
Michael Kaufmann
a647d48fbe fix up testing/production switch and challengepath for lets encrypt, fixes #696 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-05-27 17:48:33 +02:00
Daniel Drexlmaier
6ea91f55e5 Update install.php 2019-05-27 15:47:30 +02:00
Daniel Drexlmaier
fb87129e29 Update init.php 2019-05-27 15:46:39 +02:00
Daniel Drexlmaier
79e5113e12 Update init.php 2019-05-27 15:28:08 +02:00
Daniel Drexlmaier
b75c9ddff6 Update install.php 2019-05-27 15:27:28 +02:00
Michael Kaufmann
35e14fde14 set version to 0.10.0-rc2 for second release candidate 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
0.10.0-rc2 		2019-05-27 11:47:58 +02:00
Michael Kaufmann
68f55f9596 dont allow bootstrap.php file from tests/ to be called via browser 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-05-27 08:33:36 +02:00
Michael Kaufmann
3fec579f85 Merge pull request #683 from discordier/hotfix/pcre-maillog 
Fixes #682 - mail log parsing regex character group
 2019-05-13 20:03:49 +02:00
Christian Schiffler
e2d69c664a Fixes #682 - mail log parsing regex character group 
The mail log parsing regex was incorrectly using a character group of `\A`
 2019-05-13 19:53:55 +02:00
Michael Kaufmann
72016a5735 fix integrity-check language-file entries 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-05-07 14:03:37 +02:00
Michael Kaufmann
eba163fc4a Merge pull request #677 from pquerner/#646 
allow auth basic in URL, fixes #646
 2019-04-30 07:14:48 +02:00
Michael Kaufmann
8df6654ad0 Merge pull request #676 from pquerner/#675 
use correct validate-ip function in \Froxlor\Validate\Validate::validateUrl, fixes #675
 2019-04-30 07:09:20 +02:00
Pascal
1a5e43b6f7 fixes #646 
change regex by using well tested regex from here:
https://mathiasbynens.be/demo/url-regex

by @diegoperini
https://gist.github.com/dperini/729294
 2019-04-30 00:08:32 +02:00
Pascal
c4c7f4b636 fixes #675 
fix call to static method
 2019-04-29 23:39:10 +02:00
Michael Kaufmann
9aa0de16be Merge branch 'foliengriller-annotationsAPI' 2019-04-26 12:24:15 +02:00
Michael Kaufmann
cb636fe2c9 Merge branch 'annotationsAPI' of https://github.com/foliengriller/Froxlor into foliengriller-annotationsAPI 2019-04-26 12:23:58 +02:00
Michael Kaufmann
f93dc5643f fix error that wildcard-domains and lets-encrypt are not possible when using ACMEv2; fixes #674 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-04-25 14:20:02 +02:00
Michael Kaufmann
974b151d02 add Debian 10 (Buster) and Ubuntu 18.04 (Bionic) config-templates for TESTING 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-04-25 14:04:15 +02:00
Michael Kaufmann
8835dd0b65 remove deprecated config-templates for Ubuntu 12.04 (Precise); mark Debian 7 (Jessie) and Ubuntu 14.04 (Trusty) as deprecated 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-04-25 14:03:39 +02:00
Michael Kaufmann
626b791c67 remove recursor options in powerdns config template for gentoo, as recursion has been removed in pdns >=4.1.0; fixes #673 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-04-25 13:56:42 +02:00
Michael Kaufmann
82508587b3 update mysql-table engines to InnoDB; fixes #671 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-04-25 13:31:18 +02:00
Michael Kaufmann
0d7fa5728c fix auto-delete of cetificates when no domain exists anylonger, thx to an error-report 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-04-14 08:13:34 +02:00
Michael Kaufmann
29365838b3 set version to 0.10.0-rc1 for upcoming release candidate 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
0.10.0-rc1 		2019-04-10 08:24:04 +02:00
Michael Kaufmann
13ac7ef66c Merge pull request #666 from sokai/sokai-patch-1 
logrotate snipet: (more) GDPR ‚compliant‘; fixes #665
 2019-03-16 18:10:19 +01:00
Michael Kaufmann
6764747fa9 use system.defaultttl setting also for SOA record; fixes #667 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-03-16 18:09:21 +01:00
sokai
91df02916c logrotate snipet: GDPR ‚compliance‘ 
see: https://github.com/Froxlor/Froxlor/issues/665
 2019-03-16 13:08:44 +01:00