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

762 Commits

Author SHA1 Message Date
Florian Aders (EleRas)
41263ab031 froxlor.css: display menu and content on the same height 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 18:17:55 +01:00
Florian Aders (EleRas)
e006a69535 Removed a lot of stuff from froxlor.css, load sparkle and modify needed elements for easier maintainabiity 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 18:00:02 +01:00
Florian Aders (EleRas)
41b7724d7e Fixed edge-bug in table for froxlor.css 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 17:22:22 +01:00
Florian Aders (EleRas)
ffac6e38dc Move the froxlor - theme further to css, nearly done 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 17:06:36 +01:00
Florian Aders (EleRas)
813c76d55b Added Froxlor - theme based on sparkle in css 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-29 19:26:10 +01:00
Florian Aders (EleRas)
3d8fa8e7ea Add theme - config for Froxlor until this theme is moved to css-only 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-29 17:43:10 +01:00
Florian Aders (EleRas)
b4a345d182 Allow themes to have various variants 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-29 17:35:03 +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
Michael Kaufmann (d00p)
0fb0d3b2db Merge remote-tracking branch 'origin/0.9.31.2' 2013-12-27 16:46:33 +01:00
Michael Kaufmann (d00p)
9d5d60fa88 bugfix squeeze dovecot.conf and correct wheezy dovecot-15-lda.conf, fixes #1334 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-27 16:18:51 +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)
166d75454e Minor interface tweaks, removed unused css 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-24 23:06:29 +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)
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)
ec59d3a8e8 Merge branch 'master' of github.com:Froxlor/Froxlor 2013-12-19 07:55:48 +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
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
Michael Kaufmann (d00p)
6ed02e593c display phperror below fixed header in sparkle theme; fix wrong parameter-list and ignorance of in makePathfield 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-16 11:32:25 +01:00
Michael Kaufmann (d00p)
37a242a679 migrate webftp stuff to new settings-class, refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-16 11:03:09 +01:00
Michael Kaufmann (d00p)
164b40fef3 fix wrong language-string in settings/180.dkim.php, implemented Settings::Add() for updates later (much better than a manual query etc.), added new php-errorhandler so we can display php errors/warnings/notices (whatever is activated) in a nicer way 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-16 10:43:38 +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
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
Michael Kaufmann (d00p)
4667ccbe43 Merge remote-tracking branch 'origin/0.9.31' 2013-12-15 11:40:22 +01:00
Michael Kaufmann (d00p)
b8f963cd29 fix pagination and sorting in customer-tickets, refs #701 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 10:48:54 +01:00
Michael Kaufmann (d00p)
b18afacedb Merge remote-tracking branch 'origin/0.9.31' 2013-12-15 08:41:29 +01:00
Roman Schmerold (BNoiZe)
40dbf85f77 added a.active class to the template css 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-14 18:07:15 +01:00
Michael Kaufmann (d00p)
eb7d7d7316 Merge remote-tracking branch 'origin/0.9.31' 2013-12-14 15:44:34 +01:00
Michael Kaufmann (d00p)
7688f83134 beautify loadConfigArrayDir(); fix pagination and sorting in admin-tickets, fixes #701 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-14 15:43:51 +01:00
Michael Kaufmann (d00p)
18933ad118 Merge remote-tracking branch 'origin/0.9.31' 2013-12-12 11:38:32 +01:00
Michael Kaufmann (d00p)
8516cbb64d don't show 'there is a newer version of froxlor available' if a customzied (unknown) version is being checked 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-12 11:20:19 +01:00
Michael Kaufmann (d00p)
7bf0299d33 Merge remote-tracking branch 'origin/0.9.31' 2013-12-10 07:23:42 +01:00
Michael Kaufmann (d00p)
904f412495 set correct postmaster_address (using <SERVERNAME>-variable) for dovecot config-templates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-09 11:52:09 +01:00
Michael Kaufmann (d00p)
0f80e66a01 Merge remote-tracking branch 'origin/0.9.31' 2013-12-08 10:22:21 +01:00
BNoiZe
ecb9fe9d5c Changed id to class 2013-12-06 18:39:55 +01:00
BNoiZe
56f8ca47dc Updated config templates 2013-12-06 18:27:51 +01:00
BNoiZe
29bf2e473d Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-12-06 18:24:10 +01:00
Michael Kaufmann (d00p)
2035739131 added setting to enable/disable news-feed on admin-dashboard 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-06 14:37:27 +01:00
Michael Kaufmann (d00p)
3064477066 remove more aps/autoresponder/backup stuff 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-05 12:17:47 +01:00
Michael Kaufmann (d00p)
93d1e1f24d Merge remote-tracking branch 'origin/0.9.31' 2013-12-05 12:00:54 +01:00
Michael Kaufmann (d00p)
ab4f589816 add new template-variables (SERVER_HOSTNAME, SERVER_IP, SERVER_IP and DOMAINNAME) to create-customer-email-template, fixes #432 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-05 11:50:49 +01:00
Michael Kaufmann (d00p)
85ee0751bd Merge remote-tracking branch 'origin/removal' 2013-12-05 09:02:40 +01:00
Michael Kaufmann (d00p)
eca5265735 more removing of aps/autoresponder/backup 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-05 08:37:58 +01:00
BNoiZe
429be9f774 changed "discard changes" to a more useful "cancel" button 
„cancel” will take you back to the last view you were in.
 2013-12-04 21:59:33 +01:00