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 |
|
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 |
|
Michael Kaufmann (d00p)
|
3064477066
|
remove more aps/autoresponder/backup stuff
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-05 12:17:47 +01:00 |
|
Michael Kaufmann (d00p)
|
93d1e1f24d
|
Merge remote-tracking branch 'origin/0.9.31'
|
2013-12-05 12:00:54 +01:00 |
|
Michael Kaufmann (d00p)
|
ab4f589816
|
add new template-variables (SERVER_HOSTNAME, SERVER_IP, SERVER_IP and DOMAINNAME) to create-customer-email-template, fixes #432
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-05 11:50:49 +01:00 |
|
Florian Aders (EleRas)
|
f855bb7f4e
|
Removed APS from lng - files
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
|
2013-12-04 18:56:00 +01:00 |
|
Michael Kaufmann (d00p)
|
2800ca05a1
|
began to 'clean up' for future releases (APS, Autoresponder and Backup)
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-04 18:32:46 +01:00 |
|
Michael Kaufmann (d00p)
|
6c424dff6a
|
fix wrong error message if customer-loginname has invalid characters when unix-names == 1, thx to Sephi
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-03 18:57:17 +01:00 |
|
Michael Kaufmann (d00p)
|
2853d6e1a4
|
added possibility to enable slowlog for fpm-users in the php-config (domain based logs), fixes #1051
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-03 11:14:32 +01:00 |
|
Michael Kaufmann (d00p)
|
84f973ce26
|
fix html-tag in preconfig, fix missing global in database-class, change description of password-reset-setting accordingly to new activation-link-procedure
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-02 20:39:15 +01:00 |
|
Michael Kaufmann (d00p)
|
30f7d0a070
|
make send-report an option for admin and customer (section: security)
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-02 20:26:39 +01:00 |
|
Michael Kaufmann (d00p)
|
96bcb34d81
|
show correct error-message when loginname has too many characters, fixes #811
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-02 10:57:12 +01:00 |
|
Michael Kaufmann (d00p)
|
f50268c806
|
update lng-files (thx oschn0r) and fixed dropdown of default-php-config in fcgid/fpm settings (thx Sephi)
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
|
2013-12-01 18:37:17 +01:00 |
|
BNoiZe
|
e5e0ae7527
|
Fixed some bugs, made activationcode more secure, added update script, merged missing commit
|
2013-12-01 10:34:31 +01:00 |
|
BNoiZe
|
2a36a0c22f
|
Merge branch 'master' of git://github.com/Froxlor/Froxlor
|
2013-12-01 09:59:16 +01:00 |
|
BNoiZe
|
cd342691ca
|
Updating method to reset password to use a activation link, fixes #729
|
2013-11-30 21:30:24 +01:00 |
|