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

1531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
7cdfdda45c allow non-standard ssl-port for ssl-redirects (actually, put the port in there if non-standard is defined in ip/port combination), fixes #201 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-25 17:08:06 +02:00
Michael Kaufmann (d00p)
a993295356 fixes when adding a user with std.subdomain (multi-stack related) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-24 17:32:40 +02:00
Michael Kaufmann (d00p)
bacf60df59 Sephi doesn't like missing B's in KB :P 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 17:38:52 +02:00
Michael Kaufmann (d00p)
1edb3c7874 also, select field 'mboxsize' in customer_email because we want to show it to the user :P, thx Sephi...again... 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 17:36:17 +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
Michael Kaufmann (d00p)
f9f4773616 properly escape custom-error strings in apache2, fixes #1009 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 14:48:02 +02:00
Michael Kaufmann (d00p)
74b48dace2 better error-message when version of files do not match version in database (update needed), thx to 'unknown75' from the Forum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 12:27:11 +02:00
Michael Kaufmann (d00p)
6b3a54995c fix enabling of 'speciallogfile' if security questions are asked when editing a domain, fixes #1213 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 09:35:33 +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)
bbab7d7298 we don't use the non-minified versions of the jqplot plugins so we don't need to keep them 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)
6a9de311c7 re-add jqery-stuff - something went wrong the last time 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-22 17:17:00 +02:00
Michael Kaufmann (d00p)
fea16cd108 register our own autoloader and add PHPMailerAutoload so we don't need to patch phpMailer on every update 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-21 13:10:04 +02:00
Michael Kaufmann (d00p)
b894e273c7 remove requirement of PHPMailerAutoloader as we have our own 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-21 13:03:04 +02:00
Michael Kaufmann (d00p)
30122d8bf1 just replace the german word for 'unlimited' with the corresponding sign like in the english lang-file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-21 12:48:52 +02:00
Michael Kaufmann (d00p)
fc802f8087 Update all JQuery related libraries to more recent versions 2013-09-21 12:47:53 +02:00
Michael Kaufmann (d00p)
5ceaede1a9 Update Smarty to current stable version 3.1.14 2013-09-21 12:23:33 +02:00
Michael Kaufmann (d00p)
2dfdd6a5f9 Update HTMLPurifier to current stable version 4.5.0 2013-09-21 12:18:55 +02:00
Michael Kaufmann (d00p)
fc8bd2b7af Update phpMailer to current stable release 5.2.7 2013-09-21 12:07:44 +02:00
Michael Kaufmann (d00p)
98f1bc49fd beautify ip-list when editing a domain as customer; correct 'sed'-command for fpm-setup for debian wheezy; add note for ftp-path validation (bug #1231) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-20 10:58:36 +02:00
Michael Kaufmann (d00p)
0475751cee fix minor issues; re-added cronjob for lighttpd-webserver (i swear i don't know what happened :P) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-19 22:13:12 +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
Michael Kaufmann (d00p)
46e260fc91 correcting variable name, now really fixes #1264 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-19 08:04:25 +02:00
Michael Kaufmann (d00p)
005dfac926 Merge branch 'master' of github.com:Froxlor/Froxlor 2013-09-18 23:30:46 +02:00
Michael Kaufmann (d00p)
a62eff0819 fix deactivating of nameserver-option in admin_domains when editing a domain, fixes #1264 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-18 23:29:41 +02:00
Robert Förster (Dessa)
1d49bfe80e partially revert to a75dad35dd, fixes #1263 2013-09-18 15:46:23 +02:00
Michael Kaufmann (d00p)
23361e64bb setting version to 0.9.29 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.29 		2013-09-18 12:50:22 +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)
2432b7c466 add note for customer-ssl-directory that it will be purged by the cron (just like fcgid-config-dir) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-12 18:45:36 +02:00
Michael Kaufmann (d00p)
075e18def3 add note to customer domain-add/edit to clearify trailing-slash in URLs, corrected apache-rewrite for url-redirects, fixes #1261 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-07 11:32:08 +02:00
Michael Kaufmann (d00p)
cce4bd36ef wrong solution by SCD in #1261. This works as intended for me. 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-07 09:53:02 +02:00
Michael Kaufmann (d00p)
d61fe9e0c0 fix mod-rewrite for redirect to URIs, fixes #1261 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-06 14:00:15 +02:00
Michael Kaufmann (d00p)
daf94c6ec9 regenerate webserver-configuration files after changing ssl-certificates as customer, fixes #1260 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-03 14:40:03 +02:00
Michael Kaufmann (d00p)
77143c7de0 use correct vmail username/groupname variable for postfix/dovecot 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-03 10:29:49 +02:00
Michael Kaufmann
ed2949bd21 Merge pull request #104 from nsb2006/patch-1 
Update zh-cn.lng.php
 2013-09-01 03:54:16 -07:00
nsb2006
427f862dac Update zh-cn.lng.php 2013-09-01 18:50:49 +08:00
Michael Kaufmann (d00p)
c97b3f3e0c add note that opendkim is currently not supported 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.29-rc1 		2013-08-27 11:45:21 +02:00
Michael Kaufmann
e50e9cbd8d Merge pull request #103 from misdoro/master 
fix regex-pattern in validateDomain to allow IDN TLDs (punycode), fixes #640
 2013-08-25 22:49:41 -07:00
misdoro
d90af956de Update function.validateDomain.php 
Fix pattern to support IDN TLDs, like .рф that becomes .xn--p1ai in punycode at this point. (inserted as .рф in domain edit page)
 2013-08-25 20:46:08 +02:00
Robert Förster (Dessa)
ef688bd0c0 add htmlpurifier Serializer dir to .gitignore. 
Signed-off-by: Robert Förster (Dessa) <Dessa@froxlor.org>
 2013-08-20 07:12:08 +02:00
Michael Kaufmann (d00p)
022b83d881 remove notice of undefined variable when adding/editing a customer as admin 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-08-20 06:55:56 +02:00
Michael Kaufmann (d00p)
14bd4c927b show real loginname instead of just <froxloruser> so people won't get confused, refs #1251 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-08-19 12:23:28 +02:00
Michael Kaufmann (d00p)
6bfec9dc40 adding cipher-order to ssl-vhosts when using apache, thx to Marcel 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-08-19 11:20:39 +02:00
Michael Kaufmann (d00p)
60ddcc221c fix undefined index 'openbasedir' when creating a subdomain 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-08-18 21:17:41 +02:00
Michael Kaufmann (d00p)
c11460cfcc use correct html-characters to display lower-than and greater-than signs in backup-info-text, fixes #1251 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-08-18 13:00:07 +02:00
Michael Kaufmann (d00p)
a181954864 remove duplicate, old and wrong language entry in dutch language file, fixes #1250 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-08-18 12:07:08 +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
Michael Kaufmann (d00p)
ab8975ccc3 Merge branch 'master' of github.com:Froxlor/Froxlor 2013-07-14 11:24:17 +02:00