maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,005 Commits 6 Branches 188 Tags
528082b49fc6a4d6fe69715c33d39c3066a94b5d
Commit Graph

533 Commits

Author SHA1 Message Date
BNoiZe
08e9f3ebd0 Dynamic sorting for theme Sparkle 2013-10-05 18:15:31 +02:00
BNoiZe
939c1950ea CSS tweaks 2013-10-04 19:27:37 +02:00
BNoiZe
57e0d84d69 Removed error file created by git 2013-10-04 19:02:50 +02:00
BNoiZe
9e633d6e11 Merge branch 'master' of https://github.com/BNoiZe/Froxlor 
Conflicts:
	templates/Sparkle/assets/css/main.css
 2013-10-04 18:57:25 +02:00
BNoiZe
6d12ad9986 Merge pull request #117 from BNoiZe/master 
Fixes for installtion screen
 2013-10-04 18:56:18 +02:00
BNoiZe
c649970f4d Fixes for installtion screen 2013-10-04 15:42:01 +02:00
BNoiZe
6ca09a3ca0 Replaced static links with $linker->getLink() 2013-10-03 21:51:59 +02:00
BNoiZe
0c3aa5c0be CSS & HTML cleanup 2013-10-03 21:21:54 +02:00
BNoiZe
ce403a855a Fixed heading of replaceable vars 2013-10-03 20:10:34 +02:00
BNoiZe
fda66945b5 Removed static text for testing purposes 2013-10-02 21:47:13 +02:00
BNoiZe
8c2276da64 New Default Page 2013-10-02 18:56:43 +02:00
BNoiZe
5684cd8a9f New PHPinfo table 2013-10-02 18:29:31 +02:00
Michael Kaufmann (d00p)
10dc017dd1 add phpinfo() in admin-panel, thx to EleRas; fixes #1270 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-02 09:48:24 +02:00
Michael Kaufmann (d00p)
91ed3cb128 fix has_certs == 3 which is old (it's the default which is 0) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 22:16:36 +02:00
BNoiZe
e5304d1cc1 Code cleanup 2013-10-01 22:02:44 +02:00
BNoiZe
f44395a001 Fixed css 2013-10-01 22:00:37 +02:00
BNoiZe
b56149f3f3 Added scroll to top button 2013-10-01 21:52:43 +02:00
BNoiZe
d55cccda39 Added background to options dropdown 2013-10-01 21:37:30 +02:00
BNoiZe
413b34bf34 Show type of certificate 2013-10-01 21:28:44 +02:00
BNoiZe
bc83e65a50 Replaced wrong customer-icon 2013-10-01 21:27:56 +02:00
BNoiZe
993814edd5 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-01 20:45:37 +02:00
Michael Kaufmann (d00p)
b19e226609 fix webftp template (Froxlor and Sparkle theme) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 18:44:09 +02:00
Michael Kaufmann (d00p)
c2831007e7 update sparkle theme to reflect latest changes + some minor bugfixes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 18:43:41 +02:00
BNoiZe
12bf2b779f Changed old CUST_NAME to new SALUTATION 2013-10-01 18:30:02 +02:00
BNoiZe
c4713f3ebf Replaced static text with language var 2013-10-01 18:03:04 +02:00
BNoiZe
34814e37ea Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-01 17:32:55 +02:00
BNoiZe
d179831033 better readability of green buttons 2013-10-01 17:28:21 +02:00
BNoiZe
8032e6f0d5 if/else bugfix 2013-10-01 16:22:19 +02:00
Michael Kaufmann (d00p)
81ada4c9a4 Merge branch 'master' of github.com:Froxlor/Froxlor 2013-10-01 16:11:27 +02:00
Michael Kaufmann (d00p)
2ca9420bd4 don't show form to add e-mail addresses if no domain exists 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 16:11:19 +02:00
BNoiZe
a2fb15db68 multi-stack support 2013-10-01 15:58:37 +02:00
Michael Kaufmann (d00p)
38a53e49fd welcome on board new 'Sparkle' theme and also welcome on board BNoiZe as theme maintainer (creater of Sparkle theme) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 15:21:35 +02:00
Michael Kaufmann (d00p)
a59fee305a fix php-fcgi starter script for nginx/php, thx to Witalij from Aixit GmbH 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 10:08:47 +02:00
Michael Kaufmann (d00p)
9d43e64610 domain-hascert state 3 is non-existent, it should be 0, thx EleRas 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-29 19:29:24 +02:00
Michael Kaufmann (d00p)
0b0a515124 show either if domain has a global certificate (via ip/port), a shared certificate (via parentdomain) or it's own certificate (customer-entered), thx to Nico for the artwork 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-29 18:40:25 +02:00
Michael Kaufmann (d00p)
86d3cf794c re-add ssl.png-icon as it is still used (ssleditor), thx Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-27 17:14:57 +02:00
Michael Kaufmann (d00p)
0727a6bf7b show whether ssl-certs are given for a domain by red or green icon in customer-domains, thx to nico for the icon-work 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-27 11:03:21 +02:00
Michael Kaufmann (d00p)
2a396ffb31 enhance master-cronjob parameter usage, you can now use --force-[cronname] to force any cronjob you like; now show mailbox sizes of emial accounts in the customers email overview, fixes #1007 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 16:58:27 +02:00
Robert Förster (Dessa)
bdd2ca2300 embed html5shiv.js locally instead of using a (probably) unreliable source (which also updates it to 3.6.2 final) 2013-09-22 20:35:09 +02:00
Robert Förster (Dessa)
8a5c9dd03b update css folder, use minified versions as we do not change them 2013-09-22 20:35:09 +02:00
Michael Kaufmann (d00p)
9e405dafce merge tilman19-master branch (multistack support) - note: this is a very early stage, don't expect everything to work 100%, use at your own risk. Testers are very very welcome (only apache2 and nginx (even more testing) so far) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-19 19:36:06 +02:00
Robert Förster (Dessa)
1d49bfe80e partially revert to a75dad35dd, fixes #1263 2013-09-18 15:46:23 +02:00
Michael Kaufmann (d00p)
b5a999ae6b remove mod_tls_memcache module from debian wheezy's proftpd config as it is provided without memcache-support, fixes #1258 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-18 07:38:01 +02:00
Michael Kaufmann (d00p)
dc57eb1394 remove unknown user 'froxlorftp' and use nobody/nogroup (default) for proftpd on gentoo, fixes #1249 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-08-18 12:00:28 +02:00
Michael Kaufmann (d00p)
a33b3b3fd9 remove duplicate config-entry in proftpd.conf for gentoo, fixes #1247 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-08-18 11:55:43 +02:00
Michael Kaufmann (d00p)
e4a4755ed0 add missing icon, thx to novaflash 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-07-19 12:08:45 +02:00
Robert Förster (Dessa)
fbb4c81e53 - put proper smtpd_relay_restrictions also in gentoo template, postfix 2.10 is stable for a while now (and the only available version besides masked 2.11 anyway) 
- fix 80 char "limit" per line for wheezy postfix templates (only cosmetic)
 2013-07-12 09:22:21 +02:00
Michael Kaufmann (d00p)
d02c739640 fix proftpd-config-templates for debian wheezy, thx to finnq & Spacey 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-07-09 20:54:06 +02:00
Robert Förster (Dessa)
26326937b1 (probably) fixed postfix configuration 
Signed-off-by: Robert Förster (Dessa) <Dessa@froxlor.org>
 2013-07-08 18:40:10 +02:00
Michael Kaufmann
69e2c7dee1 Merge pull request #101 from 23networks/master 
"White text on light background"-fix
 2013-07-04 10:24:01 -07:00