maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,488 Commits 6 Branches 188 Tags
f7b9c32c8e02b9fb4639e8487bb462c3776b7bd1
Commit Graph

398 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
30b27b6b73 update italian.lng.php, thx to Heaven73 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-06 10:43:57 +01:00
Michael Kaufmann (d00p)
2b5c0764e3 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-06 08:44:11 +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
Michael Kaufmann (d00p)
4cc3c01dcb remove password-suggestion if a custom regex is defined; added password-complexity-settings for non-regex users to define what generated passwords should contain, thx to Marco Vogt; fixes #1216 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-11-10 10:07:32 +01:00
Michael Kaufmann (d00p)
f303bfdbfd use /etc/crontab directly when on FreeBSD because it does not use anything like /etc/cron.d/ file-inclusion, refs and possibly fixes #1437 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-10-31 09:48:38 +01:00
Michael Kaufmann (d00p)
0156c3a59d few fixes in inline-css; added mail.log php.ini option and enabled it in default ini-config 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-10-31 09:14:28 +01:00
Michael Kaufmann (d00p)
f1eb5420a7 add option to enable/disable generation of bind-configs for the system-hostname 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-06-02 12:35:45 +02:00
Michael Kaufmann (d00p)
3fe10d8d3d merge pull request #193 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-06-02 09:15:45 +02:00
Roman Schmerold (BNoiZe)
538b99055c Removing unwanted files which should be ignored by git anyway 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 18:50:55 +02:00
Roman Schmerold (BNoiZe)
3acfcd4a95 Adding a custom newsfeed to the customer-dashboard, fixes #1408 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 18:46:15 +02:00
Michael Kaufmann (d00p)
fd3ab6221c fix wrong grammar in german language file, thx to Nepstar 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-05-29 13:40:23 +02:00
Robin Kluth
2376200a73 Whoops... 2014-05-25 12:05:17 +02:00
Robin Kluth
7e1e7851cc Changed fpm-config var description... 
* start_servers not used if ondemand, same with min and max_spare_servers
[http://www.php.net/manual/de/install.fpm.configuration.php#pm]
 2014-05-25 12:04:15 +02:00
Robin Kluth
9b42200746 Changed fpm-config var description... 
* start_servers not used if ondemand, same with min and max_spare_servers
[http://www.php.net/manual/de/install.fpm.configuration.php#pm]
 2014-05-25 11:55:14 +02:00
Robin Kluth
72dd7fb138 Fixing double question mark for german language 2014-05-23 23:04:42 +02:00
André Luiz dos Santos
e053a22f1b More missing translations 2014-05-19 23:51:56 -03:00
André Luiz dos Santos
8d3046269b Missing translation, small corrections 
Two repeated vowels: AAtiva, Iinformações.
Translate message 'loginnameiswrong2'.

contem => contém
http://wp.clicrbs.com.br/sualingua/2009/05/18/tem-e-tem-contem-contem/
 2014-05-19 23:37:24 -03:00
André Luiz dos Santos
14620d9b52 Small translation corrections 
voce => você
http://michaelis.uol.com.br/moderno/ingles/index.php?lingua=portugues-ingles&palavra=voc%EA

dominio => domínio
http://michaelis.uol.com.br/moderno/ingles/index.php?lingua=portugues-ingles&palavra=dom%EDnio
 2014-05-19 22:58:26 -03:00
Michael Kaufmann (d00p)
6e4ff4705b just because people are stupid...really, there are people doing this - thanks for a wonderful afternoon fighting spam 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-05-17 19:10:28 +02:00
junkpad92
de89610011 Improved translations for customer section 2014-05-13 23:37:02 +02:00
Michael Kaufmann (d00p)
07e5385fa2 merging pull-request #187, set log format for dovecot in froxlor config and updated German translations 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-05-07 09:13:44 +02:00