maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
1,587 Commits 6 Branches 188 Tags
e5304d1cc17cbcb656feb55ca5a1ac76f498a08e
Commit Graph

419 Commits

Author SHA1 Message Date
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
Michael Kaufmann (d00p)
ff66f62831 Merge branch 'master' of github.com:Froxlor/Froxlor 2013-07-03 11:34:45 +02:00
Michael Kaufmann (d00p)
68fb822160 give possibility to change php.ini-values for fpm-pool configurations (only pre-defined sections are possible for now), refs #587 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-07-03 11:34:34 +02:00
Johannes Matheis
c00edd399e override fg color to obtain readability 2013-07-03 08:47:42 +00:00
Robert Förster (Dessa)
a75dad35dd massive update of the wheezy templates, but take them with a grain of salt for now, in particular: 
- dkim is broken (pending code changes, this affects *everyone* with opendkim i suppose)
- it has received *no* testing (yet)

other noteworthy stuff:
- nginx should be switched to upstream provided fcgi params file, as its essentially the same.
- dovecot should now work with exim4
- for the most part, configs were switched to the commented version if available, that requires some more reading for the admins, but this isn't a problem for you... right? :)

while i don't think any of this will break horribly, like drinking the beer in your fridge or some other nasty stuff, it will still require testing

Signed-off-by: Robert Förster (Dessa) <Dessa@froxlor.org>
 2013-07-01 15:07:28 +02:00
Evgeni Golov
44cfa99c5c allow sieve usage for all mail users 2013-06-30 21:45:58 +02:00
5nafu
3ef481763c Bug #1220: Added smtpd_relay_restrictions to all postfix configurations 2013-06-21 08:57:57 +02:00
Florian Lahr
188f189d74 fixes #1152 2013-06-07 12:54:12 +02:00
Michael Kaufmann (d00p)
435f4a189a Remove mod_log_sql model for awstats as there's no mod_log_sql anymore 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-24 13:26:52 +02:00
Michael Kaufmann (d00p)
ff218168b9 more work on wheezy configs, added fcgid- and phpfpm-commands for setup; fixed non-working call to mysqldump in backup-cronjob 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-24 10:31:26 +02:00
Michael Kaufmann (d00p)
42b201c54d prepare ssl-per-domain (customer setable), no cronjob-functionality yet (intended), refs #365 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-14 17:26:30 +02:00
Michael Kaufmann (d00p)
14e9b81995 preparation for wheezy config-templates (just copied for now); fixed missing courier-templates for precise 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-13 18:40:30 +02:00
Robert Förster (Dessa)
90ea8cfc1b phase out hardy and dovecot1 configs for gentoo 2013-05-04 10:03:44 +02:00
Tilman Klaeger (tilman19)
80f19c7dfb Add multistack options to userpanel, fixes #586 2013-04-29 09:06:40 +02:00
Michael Kaufmann (d00p)
fb4c809ba4 forgot the extra panel on admin-index 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-25 20:00:49 +02:00