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

2143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kaufmann (d00p)
ff06513115 and another variable typo, fixes #1364 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-27 17:41:27 +01:00
Michael Kaufmann (d00p)
65bab15c7f add missing quota-modules to freebsd's proftpd config-template, fixes #1361 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-27 10:56:54 +01:00
Michael Kaufmann (d00p)
fe5922c0a0 code beautification and variable-name-fix 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-26 20:53:31 +01:00
Roman Schmerold (BNoiZe)
5991c5de30 Finally really fixing dropdowns 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-24 18:34:51 +01:00
Roman Schmerold (BNoiZe)
c107652e9a fixing tables and dropdowns in froxlor theme 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-24 17:48:30 +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
Michael Kaufmann (d00p)
d2a51b4bca enhance error-display on missing php-extension in webftp.php - thx to boonkerz 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-23 14:10:42 +01:00
Michael Kaufmann (d00p)
019da862dd use the same cron.d-name as in the config-template as the 'default' cronjob is not needed after the first generation of the new one; generate different lockfiles for the different jobs to avoid unnecessary conflicts 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-23 13:59:09 +01:00
Michael Kaufmann (d00p)
6d1899d72e fix typo 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-23 13:25:03 +01:00
Michael Kaufmann (d00p)
abcdfb03d9 add cron-daemon reload command in order for new cron.d file to be applied, fixes #858 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-23 13:22:11 +01:00
Michael Kaufmann (d00p)
d66e375d8a remove connections domain<->ip when removing subdomains as customer 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-22 10:02:17 +01:00
Michael Kaufmann (d00p)
2a72ae073a fix wrong 'You cannot set less resources of X than this user already used' message when editing admins/reseller, fixes #1359 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-22 08:18:06 +01:00
Florian Aders (EleRas)
d4e856d437 Fixing permissions a better way, thx crazy4chrissi, fixes #532 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-01-18 14:22:45 +01:00
Michael Kaufmann (d00p)
b7cf58e167 fix errormessage-format when used more than once, fixes #1356 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-18 07:41:56 +01:00
Michael Kaufmann (d00p)
00a0a4337e fix nginx configs-generation when setting is 'one file', thx to pcdummy 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-17 11:12:37 +01:00
Michael Kaufmann (d00p)
52536e0e45 fix unwanted NULL value when logging a cleaned string, thx to an error-reporter 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-16 18:46:34 +01:00
Michael Kaufmann (d00p)
7d8da2c399 month starts at 1 not 0 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-14 10:25:31 +01:00
Michael Kaufmann (d00p)
f96a38f8d6 fix cron.d ... again 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-14 09:55:04 +01:00
Michael Kaufmann (d00p)
1448796fa7 traffic runs daily 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-14 09:38:26 +01:00
Michael Kaufmann (d00p)
5065f5e7e4 fix cron.d-timing 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-14 09:31:25 +01:00
Michael Kaufmann (d00p)
f4e2449822 add missing panel-text for task #8 and #99 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-14 07:35:14 +01:00
Michael Kaufmann (d00p)
4e095aaeb4 d'oh 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-13 17:33:51 +01:00
Michael Kaufmann (d00p)
84eb3c64fd fix variables etc. 2014-01-13 17:03:35 +01:00
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