maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
734 Commits 6 Branches 188 Tags
5fde181fdca70094c43c26b93512b1235e6d3131
Commit Graph

734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
5fde181fdc don't create fpm-socket in own vhost if not enabled, fixes #613 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-03-01 07:39:29 +01:00
Michael Kaufmann (d00p)
4da7b815f3 add missing hidden-field for 'id' in emails_edit.tpl 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-28 21:54:03 +01:00
Michael Kaufmann (d00p)
84e17ab91f correct main httpd.conf path, fixes #615 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-28 21:43:27 +01:00
Michael Kaufmann (d00p)
95d0830584 setting version to 0.9.18 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.18 		2011-02-28 10:26:35 +01:00
Michael Kaufmann (d00p)
a8fa13dd3c correct dovecot-sql configuration for Gentoo, fixes #568 2011-02-28 08:23:52 +01:00
Florian Aders (EleRas)
a7a8c51c18 Merged brach redesign to master 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-27 13:06:31 +01:00
Michael Kaufmann (d00p)
50ae198164 check whether directory is executable for the webserver user, fixes #612 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-25 16:38:34 +01:00
Michael Kaufmann (d00p)
b325e50da1 add 'fastcgi_param HTTPS on' for nginx generally if ssl is enabled, refs #610 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-25 09:13:42 +01:00
Michael Kaufmann (d00p)
c6afcc57d9 - in function findDirs() just skip if a directory cannot be read instead of returning the list till this dir, fixes #611 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-25 08:00:06 +01:00
Michael Kaufmann (d00p)
ff4b03f4fa - add 'fastcgi_param HTTPS on' for nginx+fpm if domain uses SSL, fixes #610 2011-02-25 07:58:13 +01:00
Michael Kaufmann (d00p)
393a5ce570 - let makePathfield return usable values for the formfield (dynamically changing between select, text and hidden, depending on settings) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-24 10:50:59 +01:00
Michael Kaufmann (d00p)
ca9128bdbf - fix two TODO's where a second field has to be stuck next to the previous 2011-02-24 10:07:38 +01:00
Michael Kaufmann (d00p)
6837852f52 - check for field 'theme' in table 'panel_session' as it's being used before the update, fixes #607 
- add some missing css-classes for the updater

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-23 08:47:14 +01:00
Michael Kaufmann (d00p)
957a0e78a3 Merge branch 'redesign' of git.froxlor.org:froxlor into redesign 2011-02-23 08:28:11 +01:00
Florian Aders (EleRas)
656d725b58 Adding admin to customer - list 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-22 20:49:02 +01:00
Florian Aders (EleRas)
ffed226a4f Fixing typo in paging- 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-02-22 20:15:42 +01:00
Michael Kaufmann (d00p)
215abeb105 don't output templated error in cron_usage.inc.diskspace.php 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-18 13:22:48 +01:00
Michael Kaufmann (d00p)
68c8faa8cb - don't use templated errors in cron, 
- fix usage of wrong variable

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-18 07:34:26 +01:00
Michael Kaufmann (d00p)
d2e86e936b Merge branch 'master' of git.froxlor.org:froxlor 2011-02-16 14:02:48 +01:00
Michael Kaufmann (d00p)
d2fe9be860 do not generate any unnecessary webserver configuration-lines for deactivated users, fixes #599 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-16 14:01:37 +01:00
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