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

370 Commits

Author SHA1 Message Date
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
junkpad92
8fe3945c4c Update german.lng.php 
Removed double spaces.
 2014-04-28 20:50:59 +02:00
junkpad92
db00ef83c0 Update german.lng.php 2014-04-28 20:29:39 +02:00
Roman Schmerold (BNoiZe)
39dd832c84 Removed languages with more than 20% missing 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-03-28 15:33:34 +01:00
Michael Kaufmann (d00p)
d00cdec296 added cronjob-auto-update-feature (beware and READ), fixes #1342; remove old backup-ftp-users on update, fixes #1381 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-25 07:48:46 +01:00
Roman Schmerold (BNoiZe)
b191b67f21 Removed translations of the unlimited char 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-20 10:46:52 +01:00
Michael Kaufmann (d00p)
4f4689c4e9 also check for php.configs that are set as default on deletion; emphasize default config in overview 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-18 17:13:25 +01:00
Michael Kaufmann (d00p)
8ff2c930ee show and check whether a php-config is used by the system-hostname 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-18 17:01:02 +01:00
Michael Kaufmann (d00p)
57a9f3747b fix incorrect description text of ip/port add/edit, thx to Sephi and Thomas 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-13 12:06:07 +01:00
Florian Aders (EleRas)
e3e4dba90d Added manuel integritycheck for admins 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-11 16:40:53 +01:00
Michael Kaufmann (d00p)
019da862dd use the same cron.d-name as in the config-template as the 'default' cronjob is not needed after the first generation of the new one; generate different lockfiles for the different jobs to avoid unnecessary conflicts 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-23 13:59:09 +01:00
Michael Kaufmann (d00p)
abcdfb03d9 add cron-daemon reload command in order for new cron.d file to be applied, fixes #858 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-23 13:22:11 +01:00
Michael Kaufmann (d00p)
b7cf58e167 fix errormessage-format when used more than once, fixes #1356 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-18 07:41:56 +01:00
Michael Kaufmann (d00p)
5065f5e7e4 fix cron.d-timing 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-14 09:31:25 +01:00
Michael Kaufmann (d00p)
f4e2449822 add missing panel-text for task #8 and #99 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-14 07:35:14 +01:00
Michael Kaufmann (d00p)
17255de669 bugfix new cron.d-file generation and don't overwrite our master, refs #858 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-13 13:42:02 +01:00
Michael Kaufmann (d00p)
4be52f76eb introducing new way of controling the cronjobs by creating a cron.d-file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-13 08:55:39 +01:00
Roman Schmerold (BNoiZe)
0c2aa8de45 Add description field to FTP accounts, fixes #1340 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-02 22:45:30 +01:00
Roman Schmerold (BNoiZe)
a92cdb2926 Added cron for mailtraffic (with EleRas), fixes #69 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-20 23:12:47 +01:00
Michael Kaufmann (d00p)
14311eb8b0 Merge remote-tracking branch 'origin/0.9.31' 2013-12-15 19:45:27 +01:00
Roman Schmerold (BNoiZe)
1e87fb8d94 removed whitespace and german strings 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-15 14:55:27 +01:00
Roman Schmerold (BNoiZe)
36b6b6b857 Added logging of faulty login attempts, fixes #1321 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-14 10:28:33 +01:00
Michael Kaufmann (d00p)
810399d337 Merge remote-tracking branch 'origin/0.9.31' 2013-12-13 07:15:43 +01:00
Michael Kaufmann (d00p)
26b57e2d4d fix sql-query (thx to anonymous report) in admin-customers; fix german language-string (thx to dnano91) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-13 07:15:13 +01:00
Roman Schmerold (BNoiZe)
fcaa2f8aa9 fixed translation of 'traffic' for german 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-12 23:07:18 +01:00
Michael Kaufmann (d00p)
0f80e66a01 Merge remote-tracking branch 'origin/0.9.31' 2013-12-08 10:22:21 +01:00
Michael Kaufmann (d00p)
2035739131 added setting to enable/disable news-feed on admin-dashboard 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-06 14:37:27 +01:00
Michael Kaufmann (d00p)
a325eb921f Merge remote-tracking branch 'origin/0.9.31' 2013-12-06 10:06:54 +01:00
Michael Kaufmann (d00p)
14074d066c fix wiki urls in language files, thx to lando 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-06 07:56:54 +01:00