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 |
|
Michael Kaufmann (d00p)
|
276d6b30d1
|
first few implementations of new Setting-class, refs #1325
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-15 11:47: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)
|
e4142571d7
|
removed duplicate of overview page (settings)
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-14 19:09:45 +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 |
|
Roman Schmerold (BNoiZe)
|
491ac02c0d
|
added 'active' to class in navigation when link is active
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-14 16:30:08 +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 |
|
Roman Schmerold (BNoiZe)
|
36b6b6b857
|
Added logging of faulty login attempts, fixes #1321
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-14 10:28:33 +01:00 |
|
Michael Kaufmann (d00p)
|
296b8b36ab
|
Merge remote-tracking branch 'origin/0.9.31'
|
2013-12-13 21:33:24 +01:00 |
|
Michael Kaufmann (d00p)
|
83b615bc37
|
why easy if you could do it the hard way? :P
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-13 08:14:01 +01:00 |
|
Michael Kaufmann (d00p)
|
682defcbcf
|
fix tiny sql-query error when using APS and correct DbManager-replacers
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-13 08:07:52 +01:00 |
|
Michael Kaufmann (d00p)
|
810399d337
|
Merge remote-tracking branch 'origin/0.9.31'
|
2013-12-13 07:15:43 +01:00 |
|
Michael Kaufmann (d00p)
|
26b57e2d4d
|
fix sql-query (thx to anonymous report) in admin-customers; fix german language-string (thx to dnano91)
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-13 07:15:13 +01:00 |
|
Roman Schmerold (BNoiZe)
|
fcaa2f8aa9
|
fixed translation of 'traffic' for german
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-12 23:07:18 +01:00 |
|
Michael Kaufmann (d00p)
|
06cff22caa
|
allow custom sendmail_path value in php.ini when using php-fpm, fixes #1323
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-12 14:27:24 +01:00 |
|
Michael Kaufmann (d00p)
|
aa7d1d3f48
|
show customer name and loginname in ticket-archive if customer-exists
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-12 13:39:18 +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)
|
73f5547a5e
|
add php-config for froxlor-vhost and set it as default for froxlor's vhost when fcgid/fpm is used (and the current default is set, custom settings won't be overwritten)
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-12 10:44:32 +01:00 |
|
Michael Kaufmann (d00p)
|
0e6da344ba
|
don't use -b for 'du' command as FreeBSD does not know it, fixes #1320
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-12 09:09:57 +01:00 |
|
Michael Kaufmann (d00p)
|
ce28cb1f0e
|
Merge remote-tracking branch 'origin/0.9.31'
|
2013-12-12 08:27:10 +01:00 |
|
Roman Schmerold (BNoiZe)
|
911de0727f
|
fixed search not calculating diskspace/traffic if no operator is used
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
|
2013-12-11 17:11:49 +01:00 |
|
Michael Kaufmann (d00p)
|
e7678b8b6a
|
Merge remote-tracking branch 'origin/0.9.31'
|
2013-12-11 07:30:29 +01:00 |
|
Michael Kaufmann (d00p)
|
7eedf6e694
|
add logger to dbmanager, thx Sephi
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.31-rc2
|
2013-12-10 08:18:27 +01:00 |
|
Michael Kaufmann (d00p)
|
7bf0299d33
|
Merge remote-tracking branch 'origin/0.9.31'
|
2013-12-10 07:23:42 +01:00 |
|