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 |
|
Michael Kaufmann (d00p)
|
3e54fd765c
|
darn, traffic_used is being calculated in the traffic cron, need to re-check what the heck is wrong there (if after all)
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-09 18:49:45 +01:00 |
|
Michael Kaufmann (d00p)
|
220fb17824
|
add traffic-used when adding a customer; fix sql-error when removing a customer
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-09 18:16:47 +01:00 |
|
Michael Kaufmann (d00p)
|
be6c8462f0
|
use default lenght of 10 characters if no password-minimum is specified
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-09 18:04:47 +01:00 |
|
Michael Kaufmann (d00p)
|
8822067311
|
fix search for webspace and traffic related values, also, for integer fields (like diskspace) you can now use the following operators when searching: >, < and =; fixes #772
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-09 17:24:11 +01:00 |
|
Michael Kaufmann (d00p)
|
a5b1065195
|
generate spf-entry also for 'mail'-record when no mxservers are specified, fixes #1314
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-09 13:57:03 +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)
|
2fa6c5cd97
|
generate more secure password suggestions and respect password-min-length setting
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-09 10:57:54 +01:00 |
|
Michael Kaufmann (d00p)
|
7bf4cc73b6
|
Merge remote-tracking branch 'origin/0.9.31'
|
2013-12-09 09:54:44 +01:00 |
|
Michael Kaufmann (d00p)
|
bafcf07300
|
adjust gitignore file to not stage error-logs
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-09 09:23:54 +01:00 |
|
Michael Kaufmann (d00p)
|
dc666e96b3
|
outsource monster-query to new WebserverBase class and adjust query which most likely fixes #1295
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-09 09:23:21 +01:00 |
|
Michael Kaufmann (d00p)
|
15bb78d447
|
remove some special characters from directory-names when validating, fixes #1231 and pull-request 73 partly
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-09 07:49:33 +01:00 |
|
Michael Kaufmann (d00p)
|
0771ccc9a6
|
Merge remote-tracking branch 'origin/0.9.31'
|
2013-12-08 22:00:51 +01:00 |
|
Michael Kaufmann (d00p)
|
3b0387901f
|
don't cast mysql-max to integer as for admins-usernames, it may be '' instead of 0
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-08 22:00:23 +01:00 |
|
BNoiZe
|
2b13ae3ad8
|
fixed a wrong array-index in installation language file
|
2013-12-08 15:40:07 +01:00 |
|
Michael Kaufmann (d00p)
|
2e9310daf1
|
set master-branch version to next dev-version, so people don't break their database too early
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-08 14:36:04 +01:00 |
|
Michael Kaufmann (d00p)
|
e7ce62c7ff
|
set version, please don't use this yet, if you're on git-version, switch to '0.9.31' branch
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-08 14:00:28 +01:00 |
|
Michael Kaufmann (d00p)
|
bf4c16b063
|
first work on permission-improvements by adding webserver-user to ftp-group of customer and therefore make it possible to chown the user-docroot to 750 keeping 'others' out, refs #532
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-08 11:13:43 +01:00 |
|
Michael Kaufmann (d00p)
|
0f80e66a01
|
Merge remote-tracking branch 'origin/0.9.31'
|
2013-12-08 10:22:21 +01:00 |
|