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

2211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Schmerold
0d1fc17db9 Changed regex to match new logformat, fixes #1398 
Signed-off-by: Roman Schmerold <bnoize@froxlor.org>
 2014-05-07 09:34:34 +02:00
Michael Kaufmann (d00p)
32ff9840b8 Merge branch 'junkpad92-master' 2014-05-07 09:13:51 +02:00
Michael Kaufmann (d00p)
07e5385fa2 merging pull-request #187, set log format for dovecot in froxlor config and updated German translations 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-05-07 09:13:44 +02:00
Michael Kaufmann (d00p)
fb3d0269a1 when redirecting to an uri, don't use a trailing slash in order for the redirect to be correct, fixes #1411 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-05-02 08:49:27 +02:00
Michael Kaufmann (d00p)
fceffc05e7 fix double line-break in ticket-message, fixes #1413 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-05-02 08:34:14 +02:00
Florian Aders (EleRas)
4a3043e113 Ignore an empty adminid (should fix user-errorreport) 2014-05-02 08:10:53 +02:00
Michael Kaufmann
aa90a4aec8 Merge pull request #183 from hildende/master 
Added support for new/longer TLDs (up to 63 characters allowed)
 2014-05-01 10:47:19 +02:00
Roman Schmerold
2f9744fe9d Merge pull request #184 from junkpad92/patch-1 
Update german.lng.php, fixes #1406
 2014-04-28 21:12:50 +02:00
junkpad92
8fe3945c4c Update german.lng.php 
Removed double spaces.
 2014-04-28 20:50:59 +02:00
junkpad92
db00ef83c0 Update german.lng.php 2014-04-28 20:29:39 +02:00
Dennis Hildenbrand
40fd5cd41e added support for new TLDs that are longer than 6 characters like .photography 2014-04-28 19:51:33 +02:00
Michael Kaufmann (d00p)
4dc774c11c also, add french to the available language-files for install-process 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-04-28 17:22:46 +02:00
Michael Kaufmann (d00p)
f48d97e132 add french language file for installation-process, thx to hurl for translating; fixes #1415 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-04-28 14:06:10 +02:00
Michael Kaufmann (d00p)
b341228dd9 fix invalid sql in very old update-procedure (happens when you update from 0.9.7-svn1 to 0.9.7-svn2) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-04-27 09:23:36 +02:00
Michael Kaufmann (d00p)
813a534b41 fix missing user-array for output in ticket-overview, fixes #1412 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-04-26 08:32:17 +02:00
Michael Kaufmann (d00p)
086cd21cea Merge branch 'master' of github.com:Froxlor/Froxlor 2014-04-14 14:35:59 +02:00
Michael Kaufmann (d00p)
69ec85ef19 fix setting of passwords in case mysql-access-hosts list gets changed, fixes #1407 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-04-14 14:35:12 +02:00
Roman Schmerold (BNoiZe)
0336f7ccf8 Merge branch 'master' of github.com:Froxlor/Froxlor 2014-04-14 09:49:37 +02:00
Roman Schmerold (BNoiZe)
4994a90be9 Removing old languages from database, pushing version to 0.9.32-rc3 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-04-14 09:48:39 +02:00
Michael Kaufmann (d00p)
d73e5f8dc7 fix prepending of domain-name to domain.documentroot if admin has 'edit-server-settings == false' when adding a new domain 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-04-12 09:37:51 +02:00
Michael Kaufmann (d00p)
3d44d381bc correct permissions after creating cron.d-file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-04-07 09:55:04 +02:00
Roman Schmerold (BNoiZe)
39dd832c84 Removed languages with more than 20% missing 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-03-28 15:33:34 +01:00
Michael Kaufmann
1ae58837db Merge pull request #182 from mainboarder/patch-1 
Update cron_usage.inc.diskspace.php
 2014-03-23 18:37:49 +01:00
mainboarder
739c279526 Update cron_usage.inc.diskspace.php 
Line 176 another $resul(t)2_data typo
 2014-03-23 13:04:53 +01:00
Roman Schmerold (BNoiZe)
8b7dc057e1 Removed linebreak after checkboxes, fixes #1397 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-03-19 13:16:16 +01:00
Michael Kaufmann (d00p)
9c87792c63 keep known_filenames as it results in no zone-file being generated (d'oh); also use all available ip's for the froxlor-hostname config, thx a lot to vali for testing, really fixes #1090 this time 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.32-rc2 		2014-03-11 11:07:14 +01:00
Michael Kaufmann (d00p)
31fa23a388 create a dns-config for the froxlor-hostname, fixes #1090 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-03-11 10:18:23 +01:00
Michael Kaufmann (d00p)
08ce6be3ff fix 'field does not have a default value' error reported via email 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-03-05 08:11:56 +01:00
Michael Kaufmann (d00p)
2d68216699 remove old and unused setting from install-sql-file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-03-05 08:00:04 +01:00
Michael Kaufmann (d00p)
0002056e51 fix wrong variable name which causes wrong theme to be stored for new customers, fixes #1392 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-03-05 07:59:32 +01:00
Michael Kaufmann (d00p)
4636409724 Merge branch 'master' of github.com:Froxlor/Froxlor 2014-03-04 10:57:30 +01:00
Michael Kaufmann (d00p)
3b7fa93e72 set lastguid to system-lastguid in case there are no customers yet, thx to Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-03-04 10:57:16 +01:00
Roman Schmerold (BNoiZe)
d10a2764af Improving display of new ticket icon 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-03-01 16:21:13 +01:00
Florian Aders (EleRas)
718a313673 Added new (debian) way for dovecot - IMAP - traffic-report, thx devil65 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-26 08:44:23 +01:00
Michael Kaufmann (d00p)
d00cdec296 added cronjob-auto-update-feature (beware and READ), fixes #1342; remove old backup-ftp-users on update, fixes #1381 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-25 07:48:46 +01:00
Michael Kaufmann (d00p)
e650be3814 fix quota on freebsd, thanks to skotti's patch. fixes #1377 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-21 08:04:26 +01:00
Michael Kaufmann (d00p)
c59fe0e4ad fix wrong variable 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-20 11:18:46 +01:00
Roman Schmerold (BNoiZe)
b191b67f21 Removed translations of the unlimited char 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-20 10:46:52 +01:00
Roman Schmerold (BNoiZe)
9c09cb874e Updated jQuery-UI to latest version 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-20 10:42:46 +01:00
Florian Aders (EleRas)
b661547817 Correcting PDO - Constant, fixes #1382 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-20 08:29:26 +01:00
Michael Kaufmann (d00p)
2d7ca2a7db fix Call to undefined method when updating mysql-access-hosts-setting 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-19 16:13:50 +01:00
Michael Kaufmann (d00p)
d6fdf887ce don't add session-id to external redirects, thx to Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-19 11:08:43 +01:00
Michael Kaufmann (d00p)
4f4689c4e9 also check for php.configs that are set as default on deletion; emphasize default config in overview 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-18 17:13:25 +01:00
Michael Kaufmann (d00p)
8ff2c930ee show and check whether a php-config is used by the system-hostname 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-18 17:01:02 +01:00
Michael Kaufmann (d00p)
bad1183f42 set correct default php-ini for own-vhost, thx Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.32-rc1 		2014-02-14 14:08:58 +01:00
Michael Kaufmann (d00p)
20d54d5a04 put cron.d-generation task directly to froxlor.sql as there might be no userdata.inc.php after the installation (only in /tmp or plaintext for copy'n'paste) so the database action fails 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-14 11:18:02 +01:00
Michael Kaufmann (d00p)
938bb429d8 insert task to generate cron.d file after installation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-14 11:03:08 +01:00
Michael Kaufmann (d00p)
57a9f3747b fix incorrect description text of ip/port add/edit, thx to Sephi and Thomas 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-13 12:06:07 +01:00
Roman Schmerold (BNoiZe)
8d601a065e Removed unused stuff from jQuery-UI 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-12 10:33:22 +01:00
Roman Schmerold (BNoiZe)
125b648af7 Made the headers in froxlor theme a little more pleasent to view 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-12 10:01:52 +01:00