maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
3,777 Commits 6 Branches 188 Tags
18aa8eb5d271ce1f3b3c3501c3c6d398425e3588
Commit Graph

3777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann
18aa8eb5d2 added Traffic.listing ApiCommand; added first Unit-Tests for Traffic-Api; SQL IN-clause cannot be prepared, replaced all occurances accordingly; added --no-fork parameter to traffic-cron 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-11 21:51:39 +01:00
Michael Kaufmann
41acbc745c Merge remote-tracking branch 'origin/0.10.0' 2018-11-10 12:03:23 +01:00
Michael Kaufmann
ab81004bf2 Merge branch 'master' into 0.10.0 2018-11-10 11:58:17 +01:00
Michael Kaufmann
d80cf6525c Merge remote-tracking branch 'origin/master' into 0.10.0 2018-11-10 11:55:39 +01:00
Michael Kaufmann
247efb1c0a set version to 0.9.40 for upcoming release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
0.9.40 		2018-11-10 11:34:50 +01:00
Michael Kaufmann
e1b62d3af4 outsource apihelp to api.froxlor.org 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-10 07:17:13 +01:00
Michael Kaufmann
b340221055 update Traffic Api-Command 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-10-29 08:56:23 +01:00
Michael Kaufmann
e16ea186dc add some more unit-tests for Cronjobs and PhpSettings 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-10-28 13:47:19 +01:00
Michael Kaufmann
ce2722d429 forgot to tell phpunit which files is being covered, stupid copy'n'paste 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-10-28 09:00:04 +01:00
Michael Kaufmann
e0a195e3bc forgot to add tests/Cronjobs to the unit-test directories 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-10-28 08:57:43 +01:00
Michael Kaufmann
899a7ac189 add Cronjobs API command ad unit-tests 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-10-28 08:53:25 +01:00
Michael Kaufmann
fb4d379047 Merge remote-tracking branch 'origin/master' into 0.10.0 2018-10-27 19:57:55 +02:00
Michael Kaufmann
98c55435ae Merge pull request #583 from heavygale/patch-1 
Update archive.tpl
 2018-10-27 17:14:28 +02:00
Max
981f5840b3 Update archive.tpl 2018-10-27 14:57:27 +02:00
Michael Kaufmann
4efdb0cd66 add example of API usage 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-10-27 10:56:42 +02:00
Michael Kaufmann
3b31cd8432 Merge remote-tracking branch 'origin/master' into 0.10.0 2018-10-20 14:06:19 +02:00
Michael Kaufmann
c1809fc084 Merge pull request #579 from quthla/patch-1 
Add TLSv1.3
 2018-10-20 14:02:17 +02:00
quthla
090bdaaea8 Add TLSv1.3 2018-10-20 13:29:25 +02:00
Michael Kaufmann
611bec6849 Merge pull request #578 from stweil/lgtm 
Fix warnings from LGTM
 2018-10-17 11:55:36 +02:00
Stefan Weil
8cf797374d Add missing variable declarations 
This fixes warnings from LGTM:

    Variable i is used like a local variable,
    but is missing a declaration.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-10-17 11:49:59 +02:00
Stefan Weil
20177e06fc Add missing semicolons 
This fixes warnings from LGTM:

    Avoid automated semicolon insertion (91% of all statements
    in the enclosing function have an explicit semicolon).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2018-10-17 11:45:25 +02:00
Michael Kaufmann
95b305b865 Merge remote-tracking branch 'origin/master' into 0.10.0 2018-10-11 14:57:53 +02:00
Michael Kaufmann
aa6f3d33eb clearify description and enhance validation for path-field in backup-job-planning 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-10-11 14:52:45 +02:00
Michael Kaufmann
b6e4dbd70a fix saving of apikey allowed-from setting 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-10-09 10:37:27 +02:00
Michael Kaufmann
854986abcb add some more function-doc; add setting to enable/disable api in system-settings; added last three api-command classes (empty so far) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-10-08 09:35:15 +02:00
Michael Kaufmann
c35407bc94 fix undefined debug-flag if not present 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-09-30 10:18:19 +02:00
Michael Kaufmann
5752f7b64e Merge remote-tracking branch 'origin/master' into 0.10.0 2018-09-30 10:04:15 +02:00
Michael Kaufmann
23d4bee184 add override-required info to php-config edit formfields like in add formfields, refs #573 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-09-28 11:00:56 +02:00
Michael Kaufmann
37988fa645 forgot to add override_fpmconfig flag to panel_phpconfigs, refs #573 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-09-28 10:57:43 +02:00
Michael Kaufmann
6c7ee0c222 add possibility to specify pm-related settings per php-config (if override of fpm-daemon settings is set to yes), fixes #573 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-09-28 10:55:08 +02:00
Michael Kaufmann
108c4c25b3 move 'enable http/2' setting from froxlor-vhost-settings to webserver-settings, fixes #575 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-09-26 13:29:30 +02:00
Michael Kaufmann
095e54d88d fix missing update in version.inc.php 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-09-25 08:17:31 +02:00
Michael Kaufmann
70cb760862 fix missing update in version.inc.php 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-09-25 08:16:54 +02:00
Michael Kaufmann
738e629eec Merge remote-tracking branch 'origin/master' into 0.10.0 2018-09-25 08:14:16 +02:00
Michael Kaufmann
bd036a0fde remove unnecessary string-break; use standardlanguage-variable as fallback language for installer 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-09-25 08:12:21 +02:00
Michael Kaufmann
f766c6f920 Merge pull request #572 from markuspetermann/master 
Fixed class.lescript_v2.php to work with ACMEv2
 2018-09-25 08:09:16 +02:00
Markus Petermann
4588bc7f5c Merge branch 'master' of github.com:markuspetermann/Froxlor 2018-09-19 15:14:46 +02:00
Markus Petermann
9e289a2380 Fixed class.lescript_v2.php to work with ACMEv2 
Account(kid) needs to be saved for future requests.
Install/Update part is untested.
 2018-09-19 15:11:27 +02:00
Michael Kaufmann
f0edf97ac7 do not follow url location/redirect when using LE selfcheck 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-09-19 11:15:42 +02:00
Michael Kaufmann
91195fda89 check for all needed php extensions and mysqldump tool in setup process, fixes #569 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-09-19 11:15:03 +02:00
Michael Kaufmann
6161ad1bd3 make CURLOPT_FOLLOWLOCATION optional in HttpClient::urlGet 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-09-19 11:09:27 +02:00
Michael Kaufmann
f72d87228b restrict sending of emails when user is locked 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-09-19 11:07:54 +02:00
Markus Petermann
4f0acd176a Fixed class.lescript_v2.php to work with ACMEv2 
Account(kid) needs to be saved for future requests.
Install/Update part is untested.
 2018-09-18 02:20:17 +02:00
Markus Petermann
5f29b2cc4a Fixed class.lescript_v2.php to work with ACMEv2 
When requesting a certificate for multiple Domains/SANs, the request must be done in a single order.
 2018-09-18 00:53:51 +02:00
Michael Kaufmann
164f1a921e Merge pull request #570 from markuspetermann/patch-1 
Fixed class.lescript_v2.php to work with ACMEv2
 2018-09-15 13:25:01 +02:00
markuspetermann
94c4d52476 Fixed class.lescript_v2.php to work with ACMEv2 
As GET /document never returns any Reply-Nonce Header, getLastNonce() caused an infinite loop.
The Content-Type for v2 must be application/jose+json.
 2018-09-15 12:41:27 +02:00
Michael Kaufmann
174739bc0c Merge remote-tracking branch 'origin/master' into 0.10.0 2018-08-15 10:59:36 +02:00
Michael Kaufmann
b777053133 allow a higher amount of diskspace and traffic to be entered in the forms, fixes #560 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-08-15 10:59:16 +02:00
Michael Kaufmann
d0c2888508 Merge pull request #494 from xelaz/master 
extend nginx letsencrypt (.well-known) redirect regex to https
 2018-08-15 08:03:45 +02:00
Michael Kaufmann
ff8afef614 Merge pull request #563 from Froxlor/revert-561-patch-1 
Revert "acme challenges can include hyphens (-)"
 2018-08-12 18:11:45 +02:00