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

748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Burchert (scarya)
dc1f33f494 Added fallback solution in getTemplate() for 3rd party modules. 
Thanks to atari.
 2011-03-02 10:15:46 +01:00
Michael Kaufmann (d00p)
e04ae041ab add save/reset button to the end of each form, fixes #631 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-03-02 07:54:57 +01:00
Michael Kaufmann (d00p)
236377c28e many fixes in Classic and Froxlor templates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-03-02 07:46:32 +01:00
Michael Kaufmann (d00p)
687b28016e Merge branch 'master' of git.froxlor.org:froxlor 2011-03-02 07:27:24 +01:00
Florian Aders (EleRas)
00edba1d0d Fixing dynamic selection of themes in settings, fixes #628 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-03-01 20:38:09 +01:00
Florian Aders (EleRas)
207e9e1b43 Fixed adding of email-forwarding in classic template, too, fixes #626 again 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-03-01 20:15:07 +01:00
Florian Aders (EleRas)
0afbad5ff1 Fixed adding of email-forwarding, fixes #626 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-03-01 20:07:48 +01:00
Florian Aders (EleRas)
357e60c054 Reworked admin -> customerslist, fixes #619 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-03-01 19:52:34 +01:00
Florian Aders (EleRas)
9d45759613 Fixing paths in CSS, now relative instead of absolute 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-03-01 19:28:34 +01:00
Florian Aders (EleRas)
9503ae0ac5 Fixed syntax error in configfiles_index 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-03-01 19:12:04 +01:00
Florian Aders (EleRas)
97d20199fe Fixed missing nginx in installer 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-03-01 19:10:46 +01:00
Michael Kaufmann (d00p)
d66d32066d fix php-syntax error in configfiles_index.inc.php, fixes #622 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-03-01 14:34:27 +01:00
Michael Kaufmann (d00p)
13bde22344 - updated outdated domains_add & domains_edit templates in Classic-theme 
- fixed formfield when path-mode is 'Manual'
fixes #620

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-03-01 10:31:38 +01:00
Michael Kaufmann (d00p)
fb430e55d2 don't show input-fields for editing ftp@domain users as it should not be done, fixes #617 2011-03-01 07:46:42 +01:00
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