maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
1,900 Commits 6 Branches 188 Tags
2a36a0c22fcaeda95c1f3c7125e83f70d585519f
Commit Graph

308 Commits

Author SHA1 Message Date
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
Michael Kaufmann (d00p)
f278b42353 fix wrong parameter-name in admin-customers; check for disabled imap/pop3 when adding mail-accounts as customer, fixes #1298 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-30 16:07:23 +01:00
BNoiZe
7731d69929 Updated to reflect 1024 size calculation systemwide, refs #1277 
Fixed decimal places in customer_mysql.php
 2013-11-29 18:03:02 +01:00
BNoiZe
21f7c82a95 Updated language definitions for the new error reporting system, added templates to "Froxlor" theme 2013-11-29 13:44:57 +01:00
Florian Aders (EleRas)
b748270249 Fixed type 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-11-27 08:59:00 +01:00
Michael Kaufmann (d00p)
4381eff384 check for fcgid being enabled when switching the webserver as only apache2 can handle fcgid (prevent a possible deadlock in the panel) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-27 08:34:49 +01:00
Michael Kaufmann (d00p)
b8952259ba fix creating of ssl-redirect without ssl-ip/port, fixes #1303 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-21 08:01:43 +01:00
BNoiZe
00375949b5 improve admin_index-information part 2/2 2013-11-17 19:30:09 +01:00
Michael Kaufmann (d00p)
5d29ce2ad0 improve admin-index information part 1/2 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-17 18:35:38 +01:00
Michael Kaufmann (d00p)
e25597106e make fpm socket directory a setting, fixes #1300 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-14 09:29:55 +01:00
BNoiZe
3f793e8c18 Updated cron_usage_report in english and german 2013-11-09 18:01:18 +01:00
Michael Kaufmann (d00p)
222e304c93 add missing language strings to german language file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-04 13:09:56 +01:00
Michael Kaufmann (d00p)
9a187b8e82 removed unused htpasswd-htaccess-remover script; removed non-existing language-string-indeces from langfile 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-04 13:03:53 +01:00
BNoiZe
59c0207301 Updated translations, more information in dashboard (part 2/2), bugfixes once again 2013-10-27 18:48:46 +01:00
BNoiZe
3e73f6ccb4 First version of the new Dashboard 2013-10-24 22:07:01 +02:00
Michael Kaufmann (d00p)
6ac4b87a84 make ssl-cipher-list an option, fixes #1274 ; improve ssl-related language-strings; setting version to 0.9.30 for release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-24 19:45:13 +02:00
BNoiZe
036bd61ded Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-19 20:13:43 +02:00
BNoiZe
0e6aec2533 Added missing spanish translations 2013-10-19 16:46:54 +02:00
Michael Kaufmann (d00p)
6b93b973e2 add new directory-validator 'confdir' to check against disallowed paths (like /, /bin, /home, etc.) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-16 08:54:39 +02:00
Michael Kaufmann (d00p)
1a99a272b1 let the admin set the server-alias completely (either wildcard, www. or none), customer option follows, this fixes #1147 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-14 09:50:55 +02:00
Michael Kaufmann (d00p)
b480a0be57 a few fixes here and there, imporved autoloader, updated database-class (ugly old php4 style), removed two functions which will be included in the following updated installer 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-13 10:39:11 +02:00
Michael Kaufmann (d00p)
6a76e8a53f remove build-in logrotate feature and provide logrotate-script 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-09 16:23:59 +02:00
Michael Kaufmann (d00p)
e078d39f2d improve design for ssl-certificate descriptions, also increase size of textareas to fit a certificate-width 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-06 13:57:39 +02:00
Michael Kaufmann (d00p)
56ef9e1992 enhance customer set ssl-certificates and improve description, this should fix #1244 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-06 13:41:01 +02:00
Michael Kaufmann (d00p)
10dc017dd1 add phpinfo() in admin-panel, thx to EleRas; fixes #1270 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-02 09:48:24 +02:00
BNoiZe
180d711d9c Fixed uppercase of options 2013-10-01 18:02:45 +02:00
Michael Kaufmann (d00p)
2b8d42b418 fix minor spelling error, thx to Talisman 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-30 12:13:31 +02:00
Michael Kaufmann (d00p)
eca2df275c improve ip-address description in admin_domains, thx to datenfalke and Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-28 12:55:43 +02:00
Michael Kaufmann (d00p)
2a396ffb31 enhance master-cronjob parameter usage, you can now use --force-[cronname] to force any cronjob you like; now show mailbox sizes of emial accounts in the customers email overview, fixes #1007 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 16:58:27 +02:00
Michael Kaufmann (d00p)
30122d8bf1 just replace the german word for 'unlimited' with the corresponding sign like in the english lang-file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-21 12:48:52 +02:00
Michael Kaufmann (d00p)
9e405dafce merge tilman19-master branch (multistack support) - note: this is a very early stage, don't expect everything to work 100%, use at your own risk. Testers are very very welcome (only apache2 and nginx (even more testing) so far) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-19 19:36:06 +02:00
Michael Kaufmann (d00p)
2432b7c466 add note for customer-ssl-directory that it will be purged by the cron (just like fcgid-config-dir) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-12 18:45:36 +02:00
Michael Kaufmann (d00p)
075e18def3 add note to customer domain-add/edit to clearify trailing-slash in URLs, corrected apache-rewrite for url-redirects, fixes #1261 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-07 11:32:08 +02:00
nsb2006
427f862dac Update zh-cn.lng.php 2013-09-01 18:50:49 +08:00
Michael Kaufmann (d00p)
c97b3f3e0c add note that opendkim is currently not supported 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-08-27 11:45:21 +02:00
Michael Kaufmann (d00p)
14bd4c927b show real loginname instead of just <froxloruser> so people won't get confused, refs #1251 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-08-19 12:23:28 +02:00
Michael Kaufmann (d00p)
c11460cfcc use correct html-characters to display lower-than and greater-than signs in backup-info-text, fixes #1251 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-08-18 13:00:07 +02:00
Michael Kaufmann (d00p)
a181954864 remove duplicate, old and wrong language entry in dutch language file, fixes #1250 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-08-18 12:07:08 +02:00
Michael Kaufmann (d00p)
68fb822160 give possibility to change php.ini-values for fpm-pool configurations (only pre-defined sections are possible for now), refs #587 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-07-03 11:34:34 +02:00
Lucas
f842e69d81 Changed sentence @d00p 2013-06-20 13:54:09 +03:00
Lucas
de09d3dd5f Removed tag at the end 2013-06-19 19:48:55 +03:00
Lucas
1793873bbb Updated german grammer #2 2013-06-19 19:46:58 +03:00
Lucas
817966f4ea Changed some German sentences - grammer 2013-06-19 18:15:56 +03:00
Jiří Zapletal
d595aea7a6 corrections in czech language file 2013-06-06 00:01:09 +02:00
Jiří Zapletal
9ec659be5b fixing encoding of characters in czech language file 2013-06-06 00:00:40 +02:00
Michael Kaufmann (d00p)
8e20d5214b correct sentence's grammar, fixes #1221 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-27 09:38:40 +02:00
Michael Kaufmann (d00p)
537bad3926 improve description of apache-2.4 modification settings as people still activate it even without having >=apache-2.4 installed 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-26 11:42:17 +02:00
Michael Kaufmann (d00p)
42b201c54d prepare ssl-per-domain (customer setable), no cronjob-functionality yet (intended), refs #365 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-05-14 17:26:30 +02:00
Tilman Klaeger (tilman19)
80f19c7dfb Add multistack options to userpanel, fixes #586 2013-04-29 09:06:40 +02:00