maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,570 Commits 6 Branches 188 Tags
8ef60325701c384c72c7f9acc253ec8389e69252
Commit Graph

677 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
4fd68a4153 fieldset is in subfileblock, not in file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-16 16:02:08 +01:00
Michael Kaufmann (d00p)
1d319e001c group file-relevant commands into the fieldset; enhance layout 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-16 13:29:01 +01:00
Roman Schmerold (BNoiZe)
bc80fb71df Restyling configfiles with textareas instead of pre 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-11 19:35:18 +01:00
Roman Schmerold (BNoiZe)
a45712198b Update configfiles templates 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-11 13:01:48 +01:00
junkpad92
b68861c175 Fix Bug #1488 
"discard changes" and "save" on top of each other in security options; there was missing this additional template to fix the bug definitely.
 2015-02-09 22:49:40 +01:00
Michael Kaufmann (d00p)
4bd91a811d change admin_configfiles to handle the new XML-configs instead of the old php-arrays 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-09 13:54:55 +01:00
Roman Schmerold (BNoiZe)
677ed371a9 Remove another template we only used for webftp 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-08 19:01:03 +01:00
Roman Schmerold (BNoiZe)
987caa632b Add Cancel-Button to template selection 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-08 19:00:21 +01:00
Michael Kaufmann (d00p)
3df581152d remove webftp.php as it: pulls smarty-tplengine we don't use anywhere else, is unknown to most of our users, a possible security-issue, etc. etc. etc.; just don't use webftp stuff 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-08 18:56:31 +01:00
Stefan Weil
0fc73b2bbb Fix typos found by codespell 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2015-02-08 17:52:45 +01:00
Roman Schmerold (BNoiZe)
d213d65a24 Fixed buttons on top of each other, fixes #1488 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-08 12:01:05 +01:00
Robert Förster (Dessa)
36780d53c2 remove some useless executable bits spotted by lintian 2015-02-08 05:12:37 +01:00
Michael Kaufmann
bad427bfba Merge pull request #228 from HolySephi/master 
fixed some rhel/centos 7 config issues, thx to Sephi
 2015-02-06 10:56:23 +01:00
HolySephi
67fb2e1f59 removed DebugLevel, changed umask 2015-02-06 10:42:46 +01:00
HolySephi
2f80477f7d Update etc_postfix_master.cf 
spamassassin-line is not needed by default froxlor installation
 2015-02-06 10:34:41 +01:00
Michael Kaufmann (d00p)
71bb3ccc40 update italian.lng.php, thx to Heaven73 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-06 10:34:35 +01:00
Roman Schmerold (BNoiZe)
56b619b777 Update generation of unlimited fields 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-05 09:40:23 +01:00
Roman Schmerold (BNoiZe)
4fccc86b03 Updated HTMLform2 with some tweaks 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-03 21:32:23 +01:00
Florian Aders (EleRas)
a5d041926a Converted customer_mysql to HTMLform2 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2015-02-03 20:57:54 +01:00
Roman Schmerold (BNoiZe)
87fe3669a1 Migrate to new HTMLform2-class 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-02 17:43:53 +01:00
Michael Kaufmann (d00p)
6534dbf47b doc-fixes; fix hardcoded installation-path in centos-cron-configtemplate 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-01 20:09:24 +01:00
Robert Förster (Dessa)
23b091ea82 add virtual_transport parameter which i somehow missed in my last commit, refs #1465 2015-02-01 03:08:18 +01:00
Roman Schmerold (BNoiZe)
00e74a05cb Disable input if unlimited is checked 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-28 04:54:00 +01:00
Roman Schmerold (BNoiZe)
88ace5785e Fix broken custom newsfeed, newsfeed redesign 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-27 22:43:52 +01:00
Robert Förster (Dessa)
614d9c127b fix mail delivery for dovecot, closes #1465 2015-01-27 17:55:46 +01:00
Dessa
f0551ac122 Merge pull request #212 from junkpad92/master 
Fixing deprecated Postfix templates & Providing Dovecot2 Sieve-Configs
 2015-01-27 17:52:36 +01:00
Chris Energia Positiva
533279ec25 Create usr_local_etc_pureftpd-mysql.conf 2015-01-26 22:07:39 +01:00
Chris Energia Positiva
68d678aff8 Create usr_local_etc_pure-ftpd.conf 2015-01-26 22:06:12 +01:00
Roman Schmerold (BNoiZe)
6767edfaff Merge branch 'master' of github.com:Froxlor/Froxlor 2015-01-26 17:20:05 +01:00
Roman Schmerold (BNoiZe)
b1acc9a8ef Make the side navigation more styleable 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-26 17:19:40 +01:00
Dessa
4c60b40c64 Merge pull request #220 from Lednerb/master 
Ubuntu 14.04 Integration
 2015-01-22 07:51:12 +01:00
Dessa
90bcaee2c9 Merge pull request #202 from antedaxara/rhel7 
Added RHEL 7 configfiles
 2015-01-22 07:50:56 +01:00
Roman Schmerold (BNoiZe)
6c39ac80e6 Optimized images 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-16 21:16:50 +01:00
Roman Schmerold (BNoiZe)
979c5e7c0c Tidied up the code 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-16 21:11:17 +01:00
Michael Kaufmann (d00p)
2250b3c37a show custom-notes correctly on admin/customer index when activated + tiny fixes, refs #1471 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-15 22:19:28 +01:00
Michael Kaufmann (d00p)
e578a29058 add option to display the custom-notes to the user and actually save the custom-note 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-15 22:10:37 +01:00
Michael Kaufmann (d00p)
4c50d35945 Merge branch 'master' of github.com:Froxlor/Froxlor 2015-01-15 21:30:35 +01:00
Michael Kaufmann (d00p)
7b8885c05e add custom-notes field to admins and customers, fixes #1471 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-15 21:30:15 +01:00
Roman Schmerold (BNoiZe)
1e6df86b7b Add new small info icon 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-15 20:27:11 +01:00
Lednerb
e7d07c7924 Deleted unnecessary config template 2015-01-12 14:32:00 +01:00
Lednerb
e21b923194 Added Ubuntu 14.04 Trusty, didn't check if the configfiles are working 2015-01-10 23:46:37 +01:00
Michael Kaufmann (d00p)
5d5062c262 make ownership-hint a bit larger like the db-error-page; add theme-fallback to database-error-function to avoid this stupid 'we are sorry, but a MySQL - error occurred'-message 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-29 21:42:28 +01:00
Michael Kaufmann (d00p)
509033e2b8 put install-css-stuff into the correct install.css file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-29 21:23:21 +01:00
Michael Kaufmann (d00p)
7584b0acc4 remove google-webfont-stuff (just create your own theme or overwrite Sparkle to use another font); remove more inline css and remove unnecessary JS in hints-templates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-29 21:08:01 +01:00
Michael Kaufmann (d00p)
dd34ab8d9b fix inline-css (violation of Content Security Policy) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-29 20:48:56 +01:00
Michael Kaufmann (d00p)
925afbd03f fix design-issues when no add-link is present in overviews; fixes #1466 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-22 08:06:26 +01:00
Michael Kaufmann (d00p)
19f5f2a7a4 remove static copyright-year in templates; fix possible undefined theme-variable in phpErrHandler by specifying a fallback-default 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-19 09:49:33 +01:00
junkpad92
56b652d185 Fixing deprecated Postfix templates & Providing Dovecot2 Sieve-Configs 2014-12-17 17:21:28 +01:00
Michael Kaufmann (d00p)
cd5e8801e4 add domain-bulk-import, fixes #1452 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-15 14:49:34 +01:00
Marco Vogt (vogti)
28b7cd6e90 bugfixing template-variables list when editing mail-templates; refs #496 
Signed-off-by: Marco Vogt (vogti) <mail@mdvogt.de>
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-12 20:54:59 +01:00