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

578 Commits

Author SHA1 Message Date
Stefan Weil
722aed5148 Fix some issues in the German translation 
This patch fixes some typos, grammar and wrong words in the first half
of the German translation.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-02-14 08:06:44 +01:00
Stefan Heid
ae581c2da7 Added termination-date to domains 2016-02-10 21:22:52 +01:00
Daniel Reichelt
dd0689c13f language: add message/spelling 
- add missing message for let's encrypt integrity check
- small spellfixes
 2016-02-09 00:33:01 +01:00
Michael Kaufmann (d00p)
aac9ee3ba7 added auto-update from within the panel; re-organized menu-entries (meaningful) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-08 13:34:24 +01:00
Michael Kaufmann (d00p)
7bf8b74693 Merge branch 'master' of github.com:Froxlor/Froxlor 2016-02-05 15:54:27 +01:00
Michael Kaufmann (d00p)
c7f4dc9045 fix superfluous dollar-sign 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-05 15:54:07 +01:00
Florian Aders
94f34aada6 Fixed typo 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-03 17:26:10 +01:00
Florian Aders
2472a52fed Make some Let's encrypt settings configurable 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-03 17:21:48 +01:00
Florian Aders
ae115216f6 Clearify description regading wildcars 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-03 13:38:40 +01:00
Florian Aders
c9815be0c7 German translation and hint that let's enrypt is still beta 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-02 22:15:41 +01:00
Florian Aders
eff978e5f6 Using different texts in admin and customer interface 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-01 11:36:20 +01:00
Florian Aders
7814499b87 Added cronjob to database and added a hint to the README 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-31 12:09:54 +01:00
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