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

811 Commits

Author SHA1 Message Date
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
Michael Kaufmann
d4312fc481 update jquery/jquery-ui; fininshed api_key editing (needs a bit more validating); added PhpSettings-Unit-test 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-06-22 10:05:04 +02:00
Michael Kaufmann
f1d91dfef8 interface adjustments for apikey interaction 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-06-21 08:21:27 +02:00
Michael Kaufmann
f198833f8c Merge remote-tracking branch 'origin/master' into 0.10.0 2018-06-21 08:12:00 +02:00
Michael Kaufmann
06ef81cc5b adjust year in copyright in std-customer-index file, thx to demlak 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-06-17 09:41:31 +02:00
Michael Kaufmann (d00p)
66ebfaf21b Merge remote-tracking branch 'origin/master' into 0.10.0 2018-03-12 10:23:53 +01:00
Michael Kaufmann (d00p)
349fa7a761 avoid possible undefined index if no issuer-organisation is set in a certificate 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-12 10:22:50 +01:00
Michael Kaufmann (d00p)
b12392f0a9 Merge remote-tracking branch 'origin/master' into 0.10.0 2018-03-04 12:40:55 +01:00
Michael Kaufmann (d00p)
b07d6ceeaa started UI api-key management 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-04 12:40:47 +01:00
Kai Neuwerth
91cecf8c1e Link domains to HTTPS in certificate list 
As an admin I want to check if the certificate of a website is working.
Therefore I click on the domain in the SSL certificate list and have to prepend "https" to the URL later.
In this case I'd link the domain to HTTPS initially.
 2018-03-04 11:43:50 +01:00
Michael Kaufmann (d00p)
81d6a856d9 forgot to hit save :P 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-23 19:51:06 +01:00
Michael Kaufmann (d00p)
344ca827e4 beautify api-help in webinterface 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-23 19:46:57 +01:00
Michael Kaufmann (d00p)
b42a7b1b26 show basic api doc in webinterface (top-menu - options - API help) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-22 13:41:28 +01:00
Michael Kaufmann (d00p)
f8fe4be3ef fix parameters for checkboxes when passed via webinterface 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-21 14:52:23 +01:00
Michael Kaufmann (d00p)
27f8c8b438 show domains of disabled customers also as disabled 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-13 11:49:15 +01:00
Michael Kaufmann (d00p)
fc0c796b68 avoid undefined variables/indexes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-13 10:58:06 +01:00
Michael Kaufmann (d00p)
de70dbb888 fix checked-property when applying hosting-plan for allowed-phpconfigs 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-12 14:58:17 +01:00
Michael Kaufmann (d00p)
bb792f228f add new hosting-plans feature 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-12 13:28:13 +01:00
Michael Kaufmann (d00p)
5612720342 only let admin select php-configs that the customer is allowed to use to avoid unwanted php-config changes when customer edits domain, refs #514 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-09 13:57:23 +01:00
Michael Kaufmann (d00p)
840b5ea229 add new feature: import/export of settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-28 14:33:00 +01:00
Michael Kaufmann (d00p)
29968e6026 add stretch config-templates, testers/feedback welcome 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-11 10:44:42 +01:00
Michael Kaufmann (d00p)
af55fe5b82 add possibility to add multiple php-fpm instances 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-07 14:55:25 +01:00
Michael Kaufmann (d00p)
1753d2895b add simple smtp-settings test-page, fixes #464 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-08-25 10:34:59 +02:00
Michael Kaufmann (d00p)
c2c5178831 remove superfluous character in froxlor.sql file, fixes #471 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-08-23 14:03:39 +02:00
Michael Kaufmann (d00p)
9aa2cc269b rename MYSQL_PASSWORD replacer to FROXLOR_MYSQL_PASSWORD in config-templates to avoid false replacement of couriers authmysqlrc, fixes #438 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-05-12 12:23:14 +02:00
Michael Kaufmann (d00p)
192e00c717 do not show NameVirtualHost in IP/Port overview when using apache-2.4 (as NameVirtualHost does not exist there anymore) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-22 08:04:11 +01:00
Michael Kaufmann (d00p)
979b1b0ad8 forgot to add template for subjectAlternativeName stuff in ssl-overview 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-18 13:23:35 +02:00
Michael Kaufmann (d00p)
ed0ede645a added ssl-certificate overview for admins and customers to show CN, Issuer, ValidFrom and ValidTo dates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-26 11:48:36 +02:00
Michael Kaufmann (d00p)
a1e4374ada show detailed information about diskspace-usage (web-, mail-, mysql-usage separated) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-19 11:42:08 +02:00
Daniel Reichelt
56c8e90700 display system hostname and some memory info on dashboard 
hostname may be useful in situations where several froxlors are
reverse-proxied on a single webserver
 2016-09-16 09:16:19 +02:00
Michael Kaufmann (d00p)
3b157a8c66 do not hide unavailable options, just disable them so people can see what is actually possible but just not available due to webserver-usage or other settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-12 11:23:29 +02:00
Michael Kaufmann (d00p)
45b6d8d571 add possibility to allow customers to select a shell for their ftp-users, with great thanks to KAPPER NETWORK-COMMUNICATIONS GmbH - kapper.net 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-08-26 10:46:15 +02:00
Robert Förster (Dessa)
51152ef026 fix lintians executable-not-elf-or-script 2016-08-02 11:40:37 +02:00
Michael Kaufmann (d00p)
cc372ba89b show DNS editor only if nameserver is activated at all 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-08-02 07:58:23 +02:00
Michael Kaufmann (d00p)
e5c649aba3 Add dns-editor icon/link to domain-overview list 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-07-27 07:48:25 +02:00
Michael Wyraz
54e2f83b17 function Settings::IsInList that tests if an option of a multi-select setting is set 2016-07-22 10:30:13 +02:00
Michael Wyraz
5165cac4e2 Hide http/ftp/mail traffic charts based on new settings 2016-07-22 09:44:20 +02:00
Daniel Reichelt
6df08f6b9a don't split .gitignore 
they would end up in .deb packages
 2016-06-19 23:09:04 +02:00
Michael Kaufmann (d00p)
151d8f8c5c Merge remote-tracking branch 'origin/master' into dns-editor 2016-05-23 15:55:24 +02:00
Michael Kaufmann (d00p)
b51f0821cb show scheduled backup and give customer the possiblity to abort the job 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-22 11:08:44 +02:00
Michael Kaufmann (d00p)
fa60c17dbc fix sql-query when editing a customer; check for dnsenabled flag in customer-domain-view template 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-18 13:32:44 +02:00
Michael Kaufmann (d00p)
e0e748a0bc outsource record-generation and zone-generation to classes for better handling 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-15 08:46:23 +02:00
Michael Kaufmann (d00p)
11eb08e031 add enabled-flag; enable dns-editor for customers; add german translations; few more fixes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-13 13:27:33 +02:00
Michael Kaufmann (d00p)
407a7c01aa add createDomainZone function for new dns-editor; dump zone below the editor for testing purposes; all required entries that are not custom entered will be auto-generated like the bind-cron does this for now 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-10 14:11:01 +02:00
Michael Kaufmann (d00p)
64d068659f more validation for NS and SRV records; fix display of long records 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-10 10:54:59 +02:00
Michael Kaufmann (d00p)
e33d7b756f add missing error-language-string; check whether domain is bind-domain 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-10 07:37:42 +02:00
Michael Kaufmann (d00p)
5acd51fdd3 add first part of new dns-editor 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-05-10 07:37:42 +02:00
Michael Kaufmann (d00p)
c8bbefb2bb add simple backup-function for customers (testing state) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-29 10:27:18 +02:00
Michael Kaufmann
e8f5fc1a8a Merge pull request #347 from floreno/patch-3 
min-height against height fix for ajax-changing-content
 2016-04-12 07:36:37 +02:00
Michael Kaufmann (d00p)
a014b5cc2b minor preparations for system-hostname as 'normal' domain (to use ssl/LE/etc.) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-04-11 09:19:43 +02:00