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)
|
9acaa94895
|
Fixed mailtraffic not using lastrun time
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-20 23:19:50 +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 |
|
Roman Schmerold (BNoiZe)
|
7af7842fe9
|
Merge branch 'master' of github.com:Froxlor/Froxlor
|
2013-12-20 18:28:44 +01:00 |
|
Roman Schmerold (BNoiZe)
|
70dc53db6e
|
Fixed missing template vars
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-20 18:28:36 +01:00 |
|
Michael Kaufmann (d00p)
|
05dad04384
|
add 0.9.31.1 to updater of 0.9.32-dev
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-19 18:30:00 +01:00 |
|
Michael Kaufmann (d00p)
|
261d6e7d76
|
backport bugfixes from current master
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.31.1
|
2013-12-19 18:05:40 +01:00 |
|
Michael Kaufmann
|
119eb5a4b8
|
Merge pull request #178 from RipClaw2971/sql_fix
SQL fix in install/froxlor.sql
|
2013-12-19 08:47:47 -08:00 |
|
Andreas Grundler
|
18d93fb07d
|
SQL Fix
|
2013-12-19 17:26:04 +01:00 |
|
Michael Kaufmann (d00p)
|
984624bdc4
|
fix initial value of function parameter as it leads to the first condition to be always true, fixes #1330
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-19 12:35:07 +01:00 |
|
Michael Kaufmann (d00p)
|
d1211bdb1a
|
make cronjob category stuff php-5.3 compatible, damn i'm way ahead the current stable versions of php :P
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-19 12:17:56 +01:00 |
|
Florian Aders (EleRas)
|
996f53786f
|
Fixed bug in webftp regarding email as ftp-login, fixes #1252
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-19 08:29:22 +01:00 |
|
Michael Kaufmann (d00p)
|
0fee9a3480
|
complete migration to new Settings class, fixes #1325
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-19 07:56:58 +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)
|
23a1a55bf2
|
set version to 0.9.31 for upcoming release
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.31
|
2013-12-18 09:40:48 +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 |
|
Michael Kaufmann (d00p)
|
6902868e58
|
Merge remote-tracking branch 'origin/0.9.31'
|
2013-12-17 07:57:58 +01:00 |
|
Michael Kaufmann (d00p)
|
7256d4ff91
|
fix possible xss-target
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-17 07:57:38 +01:00 |
|
Michael Kaufmann (d00p)
|
bdf03486d2
|
set better defaults (sites-enabled/* is included in apache by default on most systems)
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-16 18:33:57 +01:00 |
|
Michael Kaufmann (d00p)
|
baac572666
|
fix missing ::Get when using new Settings-class
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-16 13:37:28 +01:00 |
|
Michael Kaufmann (d00p)
|
6a8cd15456
|
Merge remote-tracking branch 'origin/0.9.31'
|
2013-12-16 13:37:01 +01:00 |
|
Michael Kaufmann (d00p)
|
41d33ae538
|
use correct quoting-character in sql-query
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-16 13:34:08 +01:00 |
|
Michael Kaufmann (d00p)
|
5be5787afd
|
fix wrong Database method-usage when toggling catchall for e-mail address
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-16 13:28:03 +01:00 |
|
Michael Kaufmann (d00p)
|
8ad3c79589
|
add actually a www-alias if set, fixes #1326
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-16 12:26:10 +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)
|
7c0ab217ee
|
Merge remote-tracking branch 'origin/0.9.31'
|
2013-12-16 11:34:25 +01:00 |
|
Michael Kaufmann (d00p)
|
28fbd2487e
|
backport important changes of makePathfield for 0.9.31
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-16 11:33:13 +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 |
|
Michael Kaufmann (d00p)
|
f12428f80d
|
don't rely on defined settings, just read in what's in the database, refs #1325
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-15 19:43:15 +01:00 |
|
Michael Kaufmann (d00p)
|
2f707974e2
|
fix missing variable in logger, tmp-fix dkim settings
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-15 16:46:15 +01:00 |
|
Michael Kaufmann (d00p)
|
1af06b2413
|
fix typo, refs #1325
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-15 16:26:47 +01:00 |
|
Roman Schmerold (BNoiZe)
|
121669ee69
|
migrating more files to new Settings-class makes me dance, refs #1325
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-15 15:51:25 +01:00 |
|
Michael Kaufmann (d00p)
|
e7c53e4abb
|
some more migrating to new settings class, refs #1325
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-15 15:37:07 +01:00 |
|
Michael Kaufmann (d00p)
|
352749c798
|
cant stop migrating to new Settings class, refs #1325
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-15 15:21:30 +01:00 |
|
Roman Schmerold (BNoiZe)
|
1e87fb8d94
|
removed whitespace and german strings
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-15 14:55:27 +01:00 |
|
Michael Kaufmann (d00p)
|
7f565c305c
|
migrate more stuff to new Settings class, refs #1325
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-15 14:38:53 +01:00 |
|
Roman Schmerold (BNoiZe)
|
bcf187761c
|
still implementing the new Settings-class, refs #1325
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-15 14:35:07 +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 |
|
Roman Schmerold (BNoiZe)
|
528082b49f
|
Merge branch 'master' of github.com:Froxlor/Froxlor
|
2013-12-15 13:16:08 +01:00 |
|
Roman Schmerold (BNoiZe)
|
d5e0484de3
|
even moar implementations of new Settings-class, refs #1325
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-15 13:15:34 +01:00 |
|
Michael Kaufmann (d00p)
|
52aaedd33a
|
migrated a few functions to new Settings class and removed unused function createAWStatsVhost(), refs #1325
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-15 13:05:19 +01:00 |
|
Michael Kaufmann (d00p)
|
558108008a
|
more implementing of new Settings class, refs #1325
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-15 12:40:24 +01:00 |
|
Roman Schmerold (BNoiZe)
|
eb33493c79
|
implemented new Setting-class, refs #1325
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-15 12:24:32 +01:00 |
|