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

141 Commits

Author SHA1 Message Date
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)
b07d6ceeaa started UI api-key management 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-04 12:40:47 +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)
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
Robert Förster (Dessa)
51152ef026 fix lintians executable-not-elf-or-script 2016-08-02 11:40:37 +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
5165cac4e2 Hide http/ftp/mail traffic charts based on new settings 2016-07-22 09:44:20 +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
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
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 Heid
ae581c2da7 Added termination-date to domains 2016-02-10 21:22:52 +01:00
Florian Aders
cb97ff0dc7 Add icon and fixed list 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:11:58 +01:00
Janos Muzsi
13870f3ae8 APCu Info page 2016-01-17 01:17:43 +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
Michael Kaufmann (d00p)
5b8fea9378 introduce warning-progress-bar-color when using -15% of the given web/traffic max-warn level (default 90%), fixes #1567 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-11-12 08:18:28 +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)
a6473695eb Fixed width of email inputs 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-08-19 07:06:52 +02:00
Michael Kaufmann (d00p)
1d319e001c group file-relevant commands into the fieldset; enhance layout 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-16 13:29:01 +01: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
Michael Kaufmann (d00p)
4bd91a811d change admin_configfiles to handle the new XML-configs instead of the old php-arrays 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-09 13:54:55 +01:00
Roman Schmerold (BNoiZe)
d213d65a24 Fixed buttons on top of each other, fixes #1488 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-08 12:01:05 +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)
88ace5785e Fix broken custom newsfeed, newsfeed redesign 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-27 22:43:52 +01:00
Roman Schmerold (BNoiZe)
6c39ac80e6 Optimized images 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-16 21:16:50 +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)
4c50d35945 Merge branch 'master' of github.com:Froxlor/Froxlor 2015-01-15 21:30:35 +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
Roman Schmerold (BNoiZe)
1e6df86b7b Add new small info icon 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-15 20:27:11 +01:00
Michael Kaufmann (d00p)
509033e2b8 put install-css-stuff into the correct install.css file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-29 21:23:21 +01:00
Michael Kaufmann (d00p)
dd34ab8d9b fix inline-css (violation of Content Security Policy) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-29 20:48:56 +01:00
Michael Kaufmann (d00p)
925afbd03f fix design-issues when no add-link is present in overviews; fixes #1466 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-22 08:06:26 +01:00
Michael Kaufmann (d00p)
cd5e8801e4 add domain-bulk-import, fixes #1452 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-15 14:49:34 +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)
b1a9c2bf49 Disabling unsafe-inline for security again 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-11-28 09:12:14 +01:00
Roman Schmerold (BNoiZe)
a1625d1768 Removed another unused image... doh 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-11-27 21:45:42 +01:00
Roman Schmerold (BNoiZe)
1e0cc86288 Removed unneeded header image 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-11-27 21:41:10 +01:00
junkpad92
329197902e Fix Safari checkbox-bug 
If checkbox is focused (clicking in the checkbox) checkbox shifts downward. I think: Only in Safari on Yosemite. Other browsers not affected.
 2014-11-03 18:56:23 +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