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

62 Commits

Author SHA1 Message Date
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
75f49e2ee2 added HostingPlans ApiCommand + unit-tests 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-09-16 12:31:02 +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
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 (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)
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 Wyraz
5165cac4e2 Hide http/ftp/mail traffic charts based on new settings 2016-07-22 09:44:20 +02:00
floreno
d474f2ec8f min-height against height fix for ajax-changing-content 2016-04-11 06:55:48 +02:00
Johannes Feichtner
06f4907053 Added autoresize to shell commands 2016-02-27 13:17:39 +01:00
Johannes Feichtner
9c7092292b Feature: Make the MYSQL_PASSWORD string definable once in order to be able to copy the fragments without further change 2016-02-20 21:36:30 +01:00
Stefan Weil
6fe0f56e41 templates: Code cleanup 
* Remove unneeded semicolon.
* Add missing semicolon.
* Add linefeed at end of file

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2015-11-14 19:09:39 +01:00
Roman Schmerold (BNoiZe)
62559dd2b4 Fixed undefined error in admin_customers.php 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-08-19 07:16:05 +02:00
Roman Schmerold (BNoiZe)
bc80fb71df Restyling configfiles with textareas instead of pre 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-11 19:35:18 +01:00
Roman Schmerold (BNoiZe)
a45712198b Update configfiles templates 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-11 13:01:48 +01:00
Robert Förster (Dessa)
36780d53c2 remove some useless executable bits spotted by lintian 2015-02-08 05:12:37 +01:00
Roman Schmerold (BNoiZe)
00e74a05cb Disable input if unlimited is checked 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-28 04:54:00 +01:00
Roman Schmerold (BNoiZe)
979c5e7c0c Tidied up the code 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-16 21:11:17 +01:00
Michael Kaufmann (d00p)
7b8885c05e add custom-notes field to admins and customers, fixes #1471 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-15 21:30:15 +01:00
Marco Vogt (vogti)
6bfa95f8a8 Import default subject/body for e-mails templates; fixes #496 
Signed-off-by: Marco Vogt (vogti) <mail@mdvogt.de>
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-12 19:26:06 +01:00
Roman Schmerold (BNoiZe)
6f5f69db2b Made tablesorter work without inline-js 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-12-02 17:27:41 +01:00
Roman Schmerold (BNoiZe)
9b0cc70542 Fix height of #maincontent if newsfeed is shown 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 22:02:48 +02:00
Roman Schmerold (BNoiZe)
38599ec4b9 Read the custom RSS directly from the settings 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 21:55:10 +02:00
Roman Schmerold (BNoiZe)
3acfcd4a95 Adding a custom newsfeed to the customer-dashboard, fixes #1408 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 18:46:15 +02:00
Roman Schmerold (BNoiZe)
7101655ed7 Cleaning up unnessesary js code, removing inline js 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-07 13:39:29 +01:00
Roman Schmerold (BNoiZe)
ec69af7938 Added a reset button to searchfields, improved js code 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 19:16:56 +01:00
Roman Schmerold (BNoiZe)
f3b61ce87c Removed unused plugins, added axis labels 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-27 15:00:38 +01:00
Roman Schmerold (BNoiZe)
5cb0256a58 Improvements to traffic graphs 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-27 14:13:38 +01:00
Roman Schmerold (BNoiZe)
429f748ad8 Fixing mailtraffic cron, fixes traffic graph sorting 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-22 10:57:56 +01:00
Roman Schmerold (BNoiZe)
82f3d8d18c Fixes various traffic graph issues 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-20 23:56:48 +01:00
Roman Schmerold (BNoiZe)
308cc0cfb9 Fixed a bug which prevented mailtraffic from being shown 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-20 23:36:09 +01:00
Roman Schmerold (BNoiZe)
7969edf1b4 Added title-tags to buttons, fixes 1328 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-20 19:14:24 +01:00
Roman Schmerold (BNoiZe)
c7d00d4d11 Switched traffic charts from jqPlot to flot 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-18 18:30:57 +01:00
Roman Schmerold (BNoiZe)
dc886c9fc5 added tooltips to webspace/traffic bars 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-16 11:47:25 +01:00
Michael Kaufmann (d00p)
14311eb8b0 Merge remote-tracking branch 'origin/0.9.31' 2013-12-15 19:45:27 +01:00
Roman Schmerold (BNoiZe)
fd0a2bea2f tweaking the traffic-graphs 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-15 14:21:23 +01:00
BNoiZe
ecb9fe9d5c Changed id to class 2013-12-06 18:39:55 +01:00
BNoiZe
50bd0302b6 fixed scrolling in phpinfo(), various layoutfixes 2013-12-04 21:39:56 +01:00
BNoiZe
9986c3405e Manually trigger window resize to fix circular missbehaviour on several browsers 2013-11-29 13:55:27 +01:00
BNoiZe
00375949b5 improve admin_index-information part 2/2 2013-11-17 19:30:09 +01:00
BNoiZe
c2bae1f25a Initial version of newsfeed in admin dashboard 2013-11-15 22:11:25 +01:00
BNoiZe
abadb69443 Restyling of several components, small bugfixes 2013-11-09 20:46:34 +01:00
BNoiZe
7f0a70a070 Pushed jcanvas to version 13.11.07 2013-11-09 17:56:09 +01:00
BNoiZe
8f7ab2a243 Many bugfixes and usability improvements (thanks to oschn0r) 2013-10-27 22:07:47 +01:00