maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
3,042 Commits 6 Branches 188 Tags
e33d7b756f953681cb652538a74072ac1f9ae597
Commit Graph

466 Commits

Author SHA1 Message Date
Florian Aders
b32c2bb994 Just a small lng - change 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-31 11:42:16 +01:00
Florian Aders
272ba3f74e Display warning about wildcard - domains with let's encrypt 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:54:20 +01:00
Florian Aders
44d08d6aa9 Add let's encrypt to customer domain - GUI 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 13:59:34 +01:00
Janos Muzsi
fb6393ad8f OPCache info page 2016-01-20 22:12:43 +01:00
Manuel Munz
9d78ad70e6 German Translations: Fix typo 2016-01-20 13:10:48 +01:00
Janos Muzsi
13870f3ae8 APCu Info page 2016-01-17 01:17:43 +01:00
Michael Kaufmann (d00p)
4429c5e8b2 allow customization of umask in php-fcgi-starter scripts, refs #1486 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-31 13:20:31 +02:00
Chris Vigelius
19d94471d9 Merge branch 'master' into vhost_config_variables, and replace IS_SSL with SCHEME 
Conflicts (resolved):
	lng/english.lng.php
	lng/german.lng.php
 2015-07-30 11:35:26 +02:00
Michael Kaufmann (d00p)
744d85ec4c display description of integrity-check rather then just the function-name, makes things clearer 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-29 15:58:27 +02:00
Michael Kaufmann (d00p)
c3da264cfe change default ssl-cipher-list; minor changes in config-xmls, fixes #1541 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-07-08 16:04:18 +02:00
Chris Vigelius
c2d75c7030 add description and normalize {IS_SSL} value 2015-07-06 15:09:13 +02:00
André Luiz dos Santos
db8e643c62 Update english.lng.php 2015-06-23 16:22:34 -03:00
Robert Förster (Dessa)
b7bc347323 fix language string 2015-03-10 20:35:33 +01:00
Michael Kaufmann (d00p)
03e48927a3 add optional support for apache-itk-mpm (mod_php only) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-18 16:01:38 +01:00
Michael Kaufmann (d00p)
74b73c6446 rename 'MySQL User' to 'Froxlor Customer' as username for users read from db via libnss; fix language strings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-11 21:21:09 +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
Stefan Weil
4ee200e9f6 english: Fix typos found by codespell 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2015-02-08 17:52:53 +01:00
Michael Kaufmann (d00p)
38b7d44e3a remove unuused lang-indeces 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-07 10:56:22 +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
Michael Kaufmann (d00p)
a0a2977b7f allow to disable fcgid also with lighttpd because we allow it to be enabled with lighttpd 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-03 19:55:46 +01:00
Michael Kaufmann (d00p)
f4dff676d6 do not allow to enable fcgid/fpm at the same time when both are set to 'yes' simultaneously in settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-01 18:02:29 +01:00
Michael Kaufmann (d00p)
c6c950596a use better error-message for misuse of froxlor.hostname 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-28 22:01:16 +01:00
Michael Kaufmann (d00p)
7904946862 push some upcoming changes (still holding back db changes b/c of version jump to rc2) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-27 23:04:46 +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)
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
Sascha Brendel
797db9aa8b Merge pull request #5 from Lednerb/patch-8 
Update swedish.lng.php
 2015-01-10 18:15:04 +01:00
Sascha Brendel
982421b9b3 Merge pull request #4 from Lednerb/patch-7 
Update portugues.lng.php
 2015-01-10 18:14:44 +01:00
Sascha Brendel
d0d7e7f369 Merge pull request #3 from Lednerb/patch-4 
Update french.lng.php
 2015-01-10 18:14:25 +01:00
Sascha Brendel
0b35c833f3 Merge pull request #2 from Lednerb/patch-5 
Update italian.lng.php
 2015-01-10 18:14:03 +01:00
Sascha Brendel
b681d9ba90 Update swedish.lng.php 2015-01-10 18:11:26 +01:00
Sascha Brendel
caedb34d00 Update portugues.lng.php 
removed duplicated entry
 2015-01-10 18:09:37 +01:00
Sascha Brendel
251fa70228 Update english.lng.php 2015-01-10 18:06:12 +01:00
Sascha Brendel
ced2f0c3d4 Update italian.lng.php 
Removed duplicated entries
 2015-01-10 17:58:04 +01:00
Michael Kaufmann
25514e1030 Merge pull request #217 from Lednerb/patch-2 
Update english.lng.php
 2015-01-10 17:28:31 +01:00
Sascha Brendel
331b65e384 Update french.lng.php 
Commented & Removed doubled entries.
The uncommented versions were the newer ones.
 2015-01-10 17:20:49 +01:00
Sascha Brendel
794140f3c1 Update english.lng.php 
Removed multiple definitions.
If in doubt, more recent entries have been used.
 2015-01-10 16:52:40 +01:00
Sascha Brendel
22eeeaf231 Update german.lng.php 
Doppelte Einträge entfernt, im Zweifelsfall aktuellere Einträge übernommen.
 2015-01-10 15:48:14 +01:00
junkpad92
21adfeed89 Update german.lng.php 2015-01-06 15:31:51 +01:00
junkpad92
791f12401f Fixing spelling mistake 2015-01-06 15:31:08 +01:00
Stefan Weil
fd26beb941 Improve German translation 
* Grammar fix dass -> das.
* Consistent spelling Email -> E-Mail.
* Typo Addresse -> Adresse.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2014-12-30 16:56: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)
c6f3b03891 do some sql-minor-fixing, refs #1486 - set version to 0.9.33-rc1 for possible upcoming release-candidate 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-29 14:59:58 +01:00
Michael Kaufmann (d00p)
bfa9478649 password-reset fix 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-19 14:11:17 +01:00
Michael Kaufmann (d00p)
b0c0918580 let the documentation-link for domain-import open in a new window 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-17 18:28:03 +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)
6bfa95f8a8 Import default subject/body for e-mails templates; fixes #496 
Signed-off-by: Marco Vogt (vogti) <mail@mdvogt.de>
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-12 19:26:06 +01:00
Michael Kaufmann (d00p)
b4a8418e10 add possibility to move customers to another admin/reseller, fixes #1166 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-11-25 12:23:30 +01:00
Michael Kaufmann (d00p)
4794c21fb4 show message on display-failure of phpinfo()-page, thx to papa-smurf for the hint 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-11-18 10:56:25 +01:00
Michael Kaufmann (d00p)
5499388777 add possibility to use php-fpm over mod_proxy_fcgi with apache >=2.4.9 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-11-10 11:47:27 +01:00