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

810 Commits

Author SHA1 Message Date
Michael Kaufmann
e3d42a3f62 show current count of results besides total count in listings, fixes #869 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-07-29 08:46:50 +02:00
Ruben Barkow-Kuder
9ea32b69cb show disk-usage also on unlimited accounts 
Signed-off-by: Ruben Barkow-Kuder <github@r.z11.de>
 2020-05-25 03:14:38 +02:00
Michael Kaufmann
edc702dafa check for required min version of php every time (frontend and cron), fixes #833 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-05-08 10:03:01 +02:00
Michael Kaufmann
8807ae7dad allow private ip ranges in ips-and-ports as some configurations require that; fixes #802 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-03-02 09:51:44 +01:00
Michael Kaufmann
f11ceacf89 store ace-string of domain besides idn-converted string to have correct sorting in the frontend; fixes #809 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-02-29 09:50:29 +01:00
Michael Kaufmann
26e43077c2 make customer firstname,name,company and customer-no available for all templates; fixes #808 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-02-29 08:16:55 +01:00
Michael Kaufmann
734c02e33f update php-fpm defaults; update paths for current stable php-7.3; read froxlor default php.ini from file rather then using phpconfig with id=1; fixes #796 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2020-01-31 13:17:49 +01:00
Patrik Kernstock
09aed61dbf Merge branch 'master' into logformat-awstats 2020-01-02 12:44:35 +01:00
Patrik Kernstock
e143ba4577 Allow configuring awstats LogFormat 
Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 22:29:29 +01:00
Patrik Kernstock
c61b3b73bd Ability to add custom config to PHPFPM version 
Addresses #643

Signed-off-by: Patrik Kernstock <patrik@kernstock.net>
 2019-12-31 05:48:36 +01:00
Michael Kaufmann
4fbaacb159 fix domain listing for admin-domains 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-11-20 12:20:20 +01:00
Daniel
a97ce74cc8 enabled autofocus for 2fa_code 2019-11-14 12:31:29 +01:00
Michael Kaufmann
e5c1e8350d set default_theme value in settings-array to 'Sparkle' as it is in install/froxlor.sql; improve language strings for adding php-configurations and fpm-versions 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2019-10-17 18:40:53 +02:00
Michael Kaufmann
79056f20ee display API in the list of features the customer is allowed to use; display total diskspace used by customer (web, mail and mysql) on customers dashboard, fixes #733 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2019-10-16 12:44:23 +02:00
Michael Kaufmann
fb54b887f2 remove unneeded apihelp-page code in admin/customer_index; set explicit version to api-doc URL; check for acme.sh cronjob and uninstall it, as froxlor manages that itself 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-10 16:42:32 +02:00
Michael Kaufmann
2c23431daf show on API keys page wether api access is allowed 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-09 11:52:55 +02:00
Michael Kaufmann
75f49e2ee2 added HostingPlans ApiCommand + unit-tests 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-09-16 12:31:02 +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
8fd910a92e use correct settings-class 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-10 22:54:05 +01:00
Michael Kaufmann
2ce1a5abb5 ups, where did they go? :P 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-02-10 22:49:32 +01:00
Michael Kaufmann
c3d44b4558 Minor enhancements and starting to comply with checkstyle 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-24 09:35:05 +01:00
Michael Kaufmann
0401e6971a Revert "refactor global array" 
This reverts commit c5a58e3f36.
 2018-12-22 08:15:31 +01:00
Michael Kaufmann
7e39a7bc60 Revert "refactor global array" 
This reverts commit 370ccbdb74.
 2018-12-22 08:15:31 +01:00
Michael Kaufmann
370ccbdb74 refactor global array 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 20:51:44 +01:00
Michael Kaufmann
c5a58e3f36 refactor global array 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 20:31:17 +01:00
Michael Kaufmann
7c68fa7bd0 fixed a few functions I've missed 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 19:16:49 +01:00
Michael Kaufmann
97b5439c0d auto-format all files; add table-definitions to test-bootstrap file 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 12:24:07 +01:00
Michael Kaufmann
26510f0745 removing more ticket-stuff; update all unit-tests 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 19:42:50 +01:00
Michael Kaufmann
2c893fef25 adjustments in settings-arrays 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 14:54:46 +01:00
Michael Kaufmann
3ff20e327f removed ticketsystem; lots of work on cron stuff 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 13:09:14 +01:00
Michael Kaufmann
a25150babf use correct Settings-class in templates 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-18 15:53:08 +01:00
Michael Kaufmann
8d966aebee Show number of subdomains that use a php-config; fixes #532 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-11 10:12:37 +01:00
Michael Kaufmann
4988600881 added new indicator whether services/system has been configured (on new installations); show alternative configuration possibility via config-services.php script 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-10 20:34:43 +01:00
Michael Kaufmann
9e4ed645f7 use correct page title for php-fpm versions 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-09 10:29:19 +01:00
Michael Kaufmann
426e46a2df show registration date of domain (if given) in admin and customer domain-list, fixes #553 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-02 11:50:45 +01:00
Michael Kaufmann
212cb0140d ups minor CSS typo, refs #603 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-01 15:06:16 +01:00
Michael Kaufmann
8291c7d2ab Allow access to webserver logs via weinterface, if activated for customer; todo: view more content dynamically; fixes #603 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-01 13:33:08 +01:00
Michael Kaufmann
69495b94af add 2FA mechanism, fixes #547 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-30 13:45:17 +01:00
Michael Kaufmann
29c754e700 add new CUSTOMER_HOMEDIR replacer for php-configs, thx to rubberduck for the hint 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-29 09:37:18 +01:00
Michael Kaufmann
c269cd5c5c added unit-tests for version-check; implemented settings import/export in API; minor variable declarations 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-25 11:17:56 +01:00
Michael Rosenberger
b9e4adc634 Some minor CSS improvements 
- Removes unit if value is 0
- Uses shorthand notation where possible

Signed-off-by: Michael Rosenberger <mr@simpelwebservice.de>
 2018-11-22 23:38:54 +01:00
Max
ba124c99af Update list.tpl 2018-11-18 15:09:59 +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
fb4d379047 Merge remote-tracking branch 'origin/master' into 0.10.0 2018-10-27 19:57:55 +02:00
Max
981f5840b3 Update archive.tpl 2018-10-27 14:57:27 +02:00
Michael Kaufmann
3b31cd8432 Merge remote-tracking branch 'origin/master' into 0.10.0 2018-10-20 14:06:19 +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
9e7715430b fix editing api-keys as customer 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-06-23 09:27:56 +02:00
Michael Kaufmann
4f69571e1c do not reload current page after apikey modification to prevent unwanted actions being executed (addKey) 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-06-22 10:13:48 +02:00