maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
1,355 Commits 6 Branches 188 Tags
ab410cc91e4f6bec8e19c1ff60e9206f0cf00a69
Commit Graph

1355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
ab410cc91e don't insert task if feature is disabled even though they are not run but might be irritating for the admin, thx to fuchsi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-29 20:10:37 +01:00
Michael Kaufmann (d00p)
93f320ed6d Merge branch 'master' of github.com:Froxlor/Froxlor 2013-03-29 14:54:20 +01:00
Michael Kaufmann (d00p)
8016bd4ed0 localize 'speciallogfile' and give it a better label/description, thanks to xming 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-29 14:53:54 +01:00
Michael Kaufmann
c4879519fb Merge pull request #90 from madmuffin1/language_cleanup 
Removing missed chinese string, include references-file; refs #1171
 2013-03-28 10:09:09 -07:00
madmuffin1
66e7e8323b Removing missed chinese string, include references-file (refs #1171) 2013-03-28 16:53:31 +01:00
Michael Kaufmann (d00p)
4e41fd84fe only build dialog if needed 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-27 13:05:28 +01:00
Michael Kaufmann (d00p)
a8681b1e7b put the language-string for speciallogwarning to admin_domains, not customer_domains, this fixes an undefined variable and the possibility to edit the 'special-logfile' setting; thx to oschn00r for the hint 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-27 12:30:37 +01:00
Michael Kaufmann (d00p)
a903455ee0 only show 'SSL redirect' checkbox for customers when there really is a ip/port combination for SSL; fixes #1179 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-27 08:34:59 +01:00
Michael Kaufmann (d00p)
c986c08cfb switching users if the user is deactivated lead to a redirect to the login-screen with an undefined variable, just showing a message that the user is deactivated now 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-23 08:59:20 +01:00
Michael Kaufmann (d00p)
a9941fe0a4 include future -dev version-strings in version-check 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-22 20:05:59 +01:00
Michael Kaufmann (d00p)
1fa04c668d use the version compare of version.froxlor.org also in froxlor, thx for the hint to byteworkshosting 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-22 19:59:14 +01:00
Michael Kaufmann (d00p)
cce3c0fde3 don't make documentroot include domain-name by default (forgot on update); remove possible undefined index; beautification for template-forms, thx to monumentum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-22 18:51:12 +01:00
Michael Kaufmann
d5997d5772 Merge pull request #87 from madmuffin1/language_cleanup 
Language cleanup, fixes #1171
 2013-03-22 09:55:40 -07:00
madmuffin1
f2ecf74d41 Removed error references strings from all language_files, these language files should now be suitable for translation using transifex (refs #1171) 2013-03-22 16:38:56 +01:00
madmuffin1
6a16940aa0 * Removed last real backreference ($lng['dkim']['dkim_keylength']) from language files (refs #1171) 2013-03-22 16:04:12 +01:00
madmuffin1
4675bfe2b9 * removed more backreferences in language files (refs #1171) 2013-03-21 21:50:17 +01:00
Michael Kaufmann (d00p)
3587f6d119 add parameter isRelative=true to call of redirectTo() and it magically fixes #1177 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-20 21:39:07 +01:00
Michael Kaufmann (d00p)
ed3fc0208c fix notice, meh 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-20 21:24:01 +01:00
Michael Kaufmann (d00p)
acfe8a40b7 a bit of beautification, now fixes #536 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-20 21:14:56 +01:00
Michael Kaufmann
d5fd89beb7 Merge pull request #85 from sorinpohontu/Feature#536 
use complete domain name as default path for DocumentRoot (a few changes are to be made), refs #536
 2013-03-20 12:48:44 -07:00
Sorin Pohontu (frontline)
faada48e38 Feature #536: Use complete domain name as default path for DocumentRoot 2013-03-20 21:37:37 +02:00
Michael Kaufmann (d00p)
236ba6abfb myhostname should be different from mydomain in postfix's main.cf - use mail. to avoid confusion 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-16 11:59:52 +01:00
madmuffin1
2912d0ec4c Fix sprintf/printf confusion. Thanks to @Discordier 2013-03-16 09:03:46 +01:00
madmuffin1
50327e2df6 Removed 6 back-references from language files 2013-03-15 23:05:40 +01:00
Michael Kaufmann (d00p)
d3e902ac63 when a new e-mail address is created, don't use the the customers name, as it might confuse the owner of the account, fixes #1127 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-15 17:13:50 +01:00
Michael Kaufmann (d00p)
71544ccc40 gentoo/proftpd: add use-flag for mysql before emerge and touch proftpd.conf before editing it (makes sense); mark ubuntu hardy as deprecated as it will be removed in 0.9.29 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-15 11:26:01 +01:00
Michael Kaufmann (d00p)
74c5d0718c remove php's safe_mode as it is deprecated since php-5.3 and removed since php-5.4 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-15 09:34:41 +01:00
Michael Kaufmann (d00p)
cbc745ff72 remove mod_log_sql as planned 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-15 08:38:29 +01:00
Michael Kaufmann (d00p)
eaba3c783a make the 'RANDOM'-mysql-naming case insensitive; refs #1050 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-14 09:56:30 +01:00
Michael Kaufmann
8db5e40661 Merge pull request #70 from b-bittner/Ticket1150 
Add random SQL-Prefixes to customer DBs when mysql-prefix is set to 'RANDOM', fixes #1150
 2013-03-14 01:54:11 -07:00
Michael Kaufmann (d00p)
3895c30ffa clean up language files for a better fresh start on transiflex, or similar; refs #1171 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-13 09:07:04 +01:00
Michael Kaufmann (d00p)
1a9c5f162f respect ip/port-default-vhost-config-for-every-domain and system-defaultvhost-conf setting in nginx and lighttpd, fixes #916 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-13 08:18:15 +01:00
Michael Kaufmann (d00p)
a071811dd0 respect 'access froxlor directly via hostname' and 'custom docroot in ip/port' setting in nginx, refs #920 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-13 08:16:36 +01:00
Dessa
c0322b39f1 Merge pull request #84 from byteworkshosting/master 
Providing Dovecot 2.x configuration steps on FreeBSD
 2013-03-12 20:44:32 -07:00
Charlie Root
ca7a91d4cf Merge remote-tracking branch 'Froxlor/master' 2013-03-12 20:52:20 +01:00
Michael Kaufmann (d00p)
4d0dfb1c88 allow ip:port in redirections, fixes #1173 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-12 19:26:21 +01:00
byteworkshosting
c6477f345f Providing Bind9 Nameserver configuration steps on FreeBSD 2013-03-12 15:06:14 +01:00
byteworkshosting
c7eccd6086 Providing Nginx Webserver configuration steps on FreeBSD 2013-03-12 12:03:47 +01:00
byteworkshosting
877add851b Providing Dovecot 2.x configuration steps on FreeBSD 
(fixes also the FreeBSD-Part of ticket #1015)
- configuration files can be adopted for other os i think
 2013-03-12 11:57:50 +01:00
Michael Kaufmann (d00p)
b5fb0da98f escape database name when converting to UTF-8 as it may contain a dash or similar character that needs escaping, fixes #1172 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-12 08:14:52 +01:00
Michael Kaufmann
3ed063dd5c Merge pull request #83 from anbrosius/bugfix-1058 
Bugfix when deleting customer, fixes #1058 fixes #758
 2013-03-12 00:10:39 -07:00
anbrosius
7733b1e625 Bugfix when deleting customer 2013-03-12 00:39:38 +01:00
Michael Kaufmann (d00p)
66e6a21f77 fix and cleanup polish language file, thx to imachine; fixes #1170 refs #1171 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-11 21:21:55 +01:00
Michael Kaufmann (d00p)
e8c833e16d fix idna conversion for UTF-8, thx to anbrosius (via github) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.28-rc1 		2013-03-11 11:01:30 +01:00
Michael Kaufmann (d00p)
8d7c858931 setting version to 0.9.28-rc1 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-11 10:51:36 +01:00
Michael Kaufmann (d00p)
deee18a7a1 fix awstats/webalizer alias-generation (better solution), this one goes to byteworkshosting, thanks), finally fixes #1067 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 18:09:23 +01:00
Michael Kaufmann (d00p)
69e785b5fe php-fpm + apache fixes when using ssl, refs #1048 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 15:35:08 +01:00
Michael Kaufmann (d00p)
2897b0374c fix awstats/webalizer alias issue, (hopefully) fixes #1067 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 15:18:30 +01:00
Michael Kaufmann (d00p)
9b56b0c29d fix undefined indexes when path already exists and an error is thrown 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 14:46:45 +01:00
Michael Kaufmann (d00p)
47481aab56 check if the used froxlor version has already iso-codes in the language-table for this will output undefined variables after updating the files before updating the database in the panel 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-10 10:23:24 +01:00