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

2119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
e671d01ff2 ugh, what happened there? 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-13 13:44:16 +01:00
Michael Kaufmann (d00p)
17255de669 bugfix new cron.d-file generation and don't overwrite our master, refs #858 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-13 13:42:02 +01:00
Michael Kaufmann (d00p)
4be52f76eb introducing new way of controling the cronjobs by creating a cron.d-file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-13 08:55:39 +01:00
Roman Schmerold (BNoiZe)
c5efe9fd7f Fixed a bug which made the function always return false, fixes #1348 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-08 16:07:13 +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
Roman Schmerold (BNoiZe)
7fc3ac587a Redirect to last URL after relogin when session timed out, fixes #443 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 22:35:26 +01:00
Roman Schmerold (BNoiZe)
fdc29ee8c2 Adding icon for touch devices 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 19:52:24 +01:00
Roman Schmerold (BNoiZe)
ba9d185eb4 Improving favicon 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 19:33:27 +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)
39b1980509 Only use header css if webfont is enabled, fixes navigation padding 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 18:41:48 +01:00
Roman Schmerold (BNoiZe)
d6d40c8e12 Fixed wrong path to IE stylesheet 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 18:18:21 +01:00
Roman Schmerold (BNoiZe)
d9a5f052a1 Fixed mailparser ignoring last day of year 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 18:16:55 +01:00
Roman Schmerold (BNoiZe)
d5df53bb60 Handle traffic which may be from last year 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 17:26:42 +01:00
Roman Schmerold (BNoiZe)
c288d31762 Fixed usage of wrong fallback fonts if webfonts are enabled 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 17:18:33 +01:00
Roman Schmerold (BNoiZe)
11adf4b196 Fixed webfonts not used if enabled 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 17:12:44 +01:00
Roman Schmerold (BNoiZe)
30add37bd6 Fixed a missing comma (thx Johannes Gilges) 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 08:04:04 +01:00
Roman Schmerold
666bc5b036 Merge pull request #179 from 23networks/master 
Override fontcolor to obtain readability
 2014-01-04 10:57:48 -08:00
Johannes Matheis
f320daa93c make color of input fields consistent to body color 2014-01-04 16:24:02 +00:00
Florian Aders (EleRas)
e20b083f0b Fix date - regex for mail-log - parser 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-01-04 15:43:02 +01:00
Johannes Matheis
2bbfd47ac2 set some more fg colors to obtain readability 2014-01-03 17:14:06 +00:00
Johannes Matheis
d596eb754a override fg color to obtain readability 2014-01-03 17:00:42 +00:00
Florian Aders (EleRas)
ba3d342e2b Fixing executing perl-scripts with apache 2.4 and prevent users to access other users docroot, fixes #532 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-01-03 11:12:33 +01:00
Michael Kaufmann (d00p)
f252f134b2 fix missing space between action and username 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-03 10:56:59 +01:00
Florian Aders (EleRas)
63d5547d1e Fixed typo in updater 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-01-03 08:22:40 +01:00
Roman Schmerold (BNoiZe)
0c2aa8de45 Add description field to FTP accounts, fixes #1340 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-02 22:45:30 +01:00
Michael Kaufmann (d00p)
15515f2840 fix typo in variable name, thx to SaneG 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-02 20:43:17 +01:00
Florian Aders (EleRas)
2d1fd0c8c5 Delete old froxlor-theme and automatically move users to CSS - version of theme 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-01-01 13:11:27 +01:00
Florian Aders (EleRas)
93d60e4305 Only show description for theme variants, not base-theme - name 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-31 10:15:31 +01:00
Florian Aders (EleRas)
e98792a6af froxlor.css: move menuitems closer together 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 19:27:50 +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
Florian Aders (EleRas)
25649c2aa9 froxlor.css: fixed formatting of formfields 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 18:34:12 +01:00
Florian Aders (EleRas)
a2f7025940 froxlor.css: fixed corners of add/edit forms 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 18:30:02 +01:00
Florian Aders (EleRas)
3e5e4790bf froxlor.css: fixed dashboard - corners 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 18:25:14 +01:00
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
Michael Kaufmann (d00p)
db5a80a7e1 fix version-check to display output text again if a newer version is available 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-30 17:14:26 +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
Michael Kaufmann (d00p)
e97e377723 fix query when admin/reseller has ips != unlimited, fixes #1345 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-30 15:00:36 +01:00
Florian Aders (EleRas)
18547929ca Fixed typo in aliasdomain - SQL, thx rubber 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 08:20:58 +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
Roman Schmerold (BNoiZe)
3621effb36 Fixed a bug where action links where highlighted even if they weren't active 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-29 19:16:22 +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
Roman Schmerold (BNoiZe)
34b4aaa828 Fixed https not used in passwort reset links, fixes #1344 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-29 15:24:42 +01:00
Roman Schmerold (BNoiZe)
5b7fe8cf88 Fixed encoding with new database class, fixes #1343 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-29 15:11:18 +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)
01d825fc2a set version to 0.9.31.2 for bugfix release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.31.2 		2013-12-27 16:20:11 +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