maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,896 Commits 6 Branches 188 Tags
ae2bad5ab4ca7f809604534e757340c0408b1dc2
Commit Graph

104 Commits

Author SHA1 Message Date
Michael Kaufmann
a6bd323a0e Merge pull request #314 from Churro/froxlorMerge_ce6cc23 
Feature: Make the MYSQL_PASSWORD string dynamically definable
 2016-02-20 22:17:49 +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
Johannes Feichtner
46eeb65ff0 IPs and Ports: Only show attributes used by the current webserver 2016-02-20 21:13:47 +01:00
Stefan Heid
ae581c2da7 Added termination-date to domains 2016-02-10 21:22:52 +01:00
Janos Muzsi
fb6393ad8f OPCache info page 2016-01-20 22:12:43 +01:00
Janos Muzsi
13870f3ae8 APCu Info page 2016-01-17 01:17:43 +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
Michael Kaufmann (d00p)
ab9b92112d instead of env-variable, show ditro editor which is defined in the xml 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-08-13 15:37:34 +02:00
Michael Kaufmann (d00p)
3d01947f3d fix wrong tpl-variable-name 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-30 11:36:48 +02:00
Michael Kaufmann (d00p)
565bb55b13 display description of integrity-check rather then just the function-name, makes things clearer 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-29 15:58:53 +02:00
Roman Schmerold (BNoiZe)
457e378d1e Reverting HTMLform2 changes 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-06-10 14:59:38 +02:00
Michael Kaufmann (d00p)
4fd68a4153 fieldset is in subfileblock, not in file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-16 16:02:08 +01: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
junkpad92
b68861c175 Fix Bug #1488 
"discard changes" and "save" on top of each other in security options; there was missing this additional template to fix the bug definitely.
 2015-02-09 22:49:40 +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)
987caa632b Add Cancel-Button to template selection 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-08 19:00:21 +01:00
Roman Schmerold (BNoiZe)
4fccc86b03 Updated HTMLform2 with some tweaks 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-03 21:32:23 +01:00
Roman Schmerold (BNoiZe)
87fe3669a1 Migrate to new HTMLform2-class 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-02 17:43:53 +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
Michael Kaufmann (d00p)
2250b3c37a show custom-notes correctly on admin/customer index when activated + tiny fixes, refs #1471 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-15 22:19:28 +01:00
Michael Kaufmann (d00p)
e578a29058 add option to display the custom-notes to the user and actually save the custom-note 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-15 22:10:37 +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
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)
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)
28b7cd6e90 bugfixing template-variables list when editing mail-templates; refs #496 
Signed-off-by: Marco Vogt (vogti) <mail@mdvogt.de>
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-12 20:54:59 +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)
d927ede388 Merge branch 'master' of github.com:Froxlor/Froxlor 2014-12-02 17:28:38 +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
Robin Kluth
c58446359c Update templates_edit.tpl 
Replaced <i> with <em> to match the rest of the form
 2014-11-30 12:19:04 +01:00
Robin Kluth
dc5e13d13c Update templates_add_2.tpl 
Replaced <i> with <em> to match the rest of the form
 2014-11-30 12:17:14 +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
Michael Kaufmann (d00p)
e7f54503c1 fix template-variable for 'forgot password', thx to Nepstar for noticing 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-11-17 10:47:24 +01:00
Michael Kaufmann (d00p)
3fe10d8d3d merge pull request #193 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-06-02 09:15:45 +02:00
Florian Aders (EleRas)
b4b80dd0cf Add integritycheck for ssl_redirect where parentdomains have no SSL (leftovers from a bug recently fixed by d00p) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-11 19:17:25 +01:00
Florian Aders (EleRas)
e3e4dba90d Added manuel integritycheck for admins 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-11 16:40:53 +01:00
Roman Schmerold (BNoiZe)
dff26e68b9 Improving the dashboard styling, fixed missing border-radius 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-08 17:41:10 +01:00
Roman Schmerold (BNoiZe)
3f7819f6bb Optimized the Dashboard CSS/HTML 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-06 07:33:57 +01:00
Roman Schmerold (BNoiZe)
c69a05efa5 Redesigned tables to use less CSS 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-27 19:57:03 +01:00
Roman Schmerold (BNoiZe)
397c6e9c50 Various design fixes 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-24 15:14:57 +01: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
Florian Aders (EleRas)
7f1b696edd Removed double tinyform in change language/password/theme 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 19:25:46 +01:00
Roman Schmerold (BNoiZe)
675e93b99a Added resize plugin to flot, removed inline css 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-29 16:39:47 +01:00
Roman Schmerold (BNoiZe)
a92cdb2926 Added cron for mailtraffic (with EleRas), fixes #69 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-20 23:12:47 +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
Michael Kaufmann (d00p)
7267c2dec9 Merge remote-tracking branch 'origin/0.9.31' 2013-12-18 09:58:38 +01:00
Michael Kaufmann (d00p)
7a5be5456d categorize cronjob on cronjob-overview 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-17 09:59:11 +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
Roman Schmerold (BNoiZe)
cd3554eecf migrated the themes to use the nice Settings-class 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-16 10:25:25 +01:00