maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
764 Commits 6 Branches 188 Tags
f02a8d73c717a6ed7e05c4b88e7afa8cbb4be81c
Commit Graph

764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
357614992e add missing image in 'change theme' on admin-side 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-15 21:49:18 +01:00
Florian Aders (EleRas)
134250d1c1 Added icon for changetheme made by scarya 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-15 21:14:02 +01:00
Florian Aders (EleRas)
8a8d485c39 Merge branch 'master' into redesign 2011-02-13 22:29:42 +01:00
Florian Aders (EleRas)
d06b08f020 Added configuration for gentoo / dovecot2 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-13 22:28:45 +01:00
Florian Aders (EleRas)
7a70257b95 Forgot one file in the last commit 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-13 18:40:34 +01:00
Florian Aders (EleRas)
4400125c7e Fixed icon naming 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-13 18:36:56 +01:00
Florian Aders (EleRas)
88d0fe5752 Fixing customer ticket reply - view 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-13 18:01:41 +01:00
Florian Aders (EleRas)
cc1b45ac6e Readded files which were deleted during broken merge 7b01cb47de 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-13 13:10:11 +01:00
Florian Aders (EleRas)
61d5d4a150 Fixed naming of icon in MySQL edit 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-13 12:52:12 +01:00
Florian Aders (EleRas)
107c84fdbc Fixed typo in customer -> add ticket form 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-13 12:48:21 +01:00
Florian Aders (EleRas)
f85d983c84 Fixed naming of icon in FTP edit 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-13 12:45:19 +01:00
Florian Aders (EleRas)
a0406c9749 Fixed naming of icon in add domain 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-13 12:41:50 +01:00
Michael Kaufmann (d00p)
840d9f5915 fix unmerged templates to use actual $lng-values 2011-02-13 12:33:10 +01:00
Michael Kaufmann (d00p)
59f8002a5d fix undefined index in templates_edit template 2011-02-13 12:30:56 +01:00
Florian Aders (EleRas)
0b38e192d4 Now with the auto-date-setter 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-12 20:03:08 +01:00
Florian Aders (EleRas)
014e350a9e It's 2011 :P 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-12 19:54:31 +01:00
Florian Aders (EleRas)
382cf45e08 Changing customer -> ticket to new formfield - stuff 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-12 18:54:44 +01:00
Florian Aders (EleRas)
abe8446736 Merge branch 'redesign' of git.froxlor.org:froxlor into redesign 2011-02-12 18:38:09 +01:00
Florian Aders (EleRas)
ed4acb0118 Fixing forms in customer -> mysql classic template 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-12 18:37:11 +01:00
Andreas Burchert (scarya)
8032addc0a Finished template for Classic: extras 2011-02-12 18:36:00 +01:00
Florian Aders (EleRas)
0cfc75976f Fixing customer -> ftp in classic layout 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-12 18:33:59 +01:00
Michael Kaufmann (d00p)
8e83c5f788 bugfix domain-formfields (again) 2011-02-12 18:27:32 +01:00
Andreas Burchert (scarya)
7b01cb47de Merge branch 'redesign' of git.froxlor.org:froxlor into redesign 
Conflicts:
	templates/Froxlor/customer/email/emails_add.tpl
	templates/Froxlor/customer/email/emails_edit.tpl
	templates/Froxlor/customer/email/forwarder_add.tpl
 2011-02-12 18:25:19 +01:00
Andreas Burchert (scarya)
b13d20d44c Fixed email templates in design: Classic, Froxlor 2011-02-12 18:20:22 +01:00
Michael Kaufmann (d00p)
b8ab1edc56 fix domain-formfields 2011-02-12 18:16:54 +01:00
Michael Kaufmann (d00p)
cc96aef50f fix integration of formfields in customer-domains 2011-02-12 17:48:54 +01:00
Michael Kaufmann (d00p)
9ddd3a2a58 fix typo 2011-02-12 17:42:02 +01:00
Michael Kaufmann (d00p)
fea75e2c2f fix even more templates 2011-02-12 17:34:20 +01:00
Michael Kaufmann (d00p)
87b15ce57d fix more templates for fieldform usage 2011-02-12 17:32:36 +01:00
Michael Kaufmann (d00p)
a807ffd918 fix more customer_email formfiled usage 2011-02-12 17:24:07 +01:00
Michael Kaufmann (d00p)
f3d505170a bugfix customer_email formfield integration 2011-02-12 17:17:13 +01:00
Michael Kaufmann (d00p)
13904cfd7b Merge branch 'redesign' of git.froxlor.org:froxlor into redesign 2011-02-12 16:48:27 +01:00
Michael Kaufmann (d00p)
3e83ae8a6e use htpasswd-formfields 2011-02-12 16:47:07 +01:00
Michael Kaufmann (d00p)
44febee357 use htaccess-formfields 2011-02-12 16:42:25 +01:00
unknown
0b20a154f5 Finished email stuff. 2011-02-12 16:18:24 +01:00
Michael Kaufmann (d00p)
b9101b2041 Merge branch 'redesign' of git.froxlor.org:froxlor into redesign 2011-02-12 16:14:33 +01:00
Michael Kaufmann (d00p)
9e798c6362 add formfields for customer_extras 2011-02-12 16:13:57 +01:00
Florian Aders (EleRas)
9e1bd811a5 Merge branch 'redesign' of git.froxlor.org:froxlor into redesign 2011-02-12 16:08:10 +01:00
Florian Aders (EleRas)
26aed64bf8 Converted customer -> ftp to new formbuilder 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-12 16:08:05 +01:00
Michael Kaufmann (d00p)
3f93044121 add formields for email stuff 2011-02-12 15:47:37 +01:00
Florian Aders (EleRas)
8cb615df5f Converted customer -> mysql to new formbuilder 2011-02-12 15:15:55 +01:00
Andreas Burchert
885bf7e88c Added customer/domain formfields. 2011-02-11 22:08:22 +01:00
Florian Aders (EleRas)
efabfd7183 Merge branch 'master' into redesign 2011-02-11 13:39:07 +01:00
Florian Aders (EleRas)
d8b43f60b8 Added missing smtpd_sasl_type = dovecot for gentoo-postfix-config 2011-02-11 13:32:22 +01:00
Michael Kaufmann (d00p)
0a2fed06cb test 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-09 10:56:12 +01:00
Michael Kaufmann (d00p)
e13d588c07 Merge branch 'master' into redesign 2011-02-09 10:54:31 +01:00
Michael Kaufmann (d00p)
460e153c6f FreeBSD's dovecot uses ssl=yes as default value (even if commented out), so we have to set it to 'no' if no ssl is used, fixes #572 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-09 09:55:33 +01:00
Michael Kaufmann (d00p)
cb36615228 check database-connection after each customer in traffic-cron (sometimes analyzing big access-logs takes too long), fixes #544 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-09 09:53:05 +01:00
Michael Kaufmann (d00p)
6dca567827 added parameter '-k' to the 'du' command in traffic-cron, -k displays block counts in 1024-byte (1-Kbyte) blocks (lead to wrong filesize-calculations on FreeBSD), fixes #578 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-09 09:47:44 +01:00
Florian Aders (EleRas)
80379232a9 Remove IDs from settings, makes merging easier 2011-02-08 15:35:08 +01:00