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

1935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
85ee0751bd Merge remote-tracking branch 'origin/removal' 2013-12-05 09:02:40 +01:00
Michael Kaufmann (d00p)
eca5265735 more removing of aps/autoresponder/backup 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-05 08:37:58 +01:00
Michael Kaufmann (d00p)
188baaf180 fix escaping of current filename, fixes #1316 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-05 08:12:53 +01:00
Robert Förster (Dessa)
29ae767c17 fix typo 2013-12-05 00:39:42 +01:00
Florian Aders
69ac6c0d73 Merge pull request #175 from BNoiZe/master 
fixed scrolling in phpinfo(), various layoutfixes
 2013-12-04 12:47:18 -08:00
BNoiZe
50bd0302b6 fixed scrolling in phpinfo(), various layoutfixes 2013-12-04 21:39:56 +01:00
Michael Kaufmann (d00p)
84ab0e5daa fix undefined index if ssl-checkbox is unchecked (still results in correct value being stored, no worries) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-04 21:10:52 +01:00
Florian Aders
d618ef2759 Merge pull request #174 from BNoiZe/master 
Fixed a typo in admin_domains, fixed <strong>-tags not being strong in s...
 2013-12-04 12:03:49 -08:00
BNoiZe
cd464ed01e Fixed a typo in admin_domains, fixed <strong>-tags not being strong in sparkle 2013-12-04 21:02:15 +01:00
Florian Aders
34dd96ec68 Merge pull request #173 from BNoiZe/master 
Newsfeed improvements
 2013-12-04 11:04:39 -08:00
BNoiZe
ab7e271f1d Moved date to top, changed date/time format 2013-12-04 19:53:55 +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
BNoiZe
0fc77dddd6 Added date to newsfeed 2013-12-04 16:55:08 +01:00
Michael Kaufmann (d00p)
47b1675dea set version to 0.9.31-rc1 for upcoming release-candidate 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.31-rc1 		2013-12-04 14:52:25 +01:00
Michael Kaufmann (d00p)
83a77acc02 fix usage of sql-server description and info in customer-mysql, thx Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-03 22:58:56 +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)
9c8ebdd1d3 fix mysqldump for backup (if db exists) on install-process 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-03 15:55:30 +01:00
Florian Aders
419fb1bb81 Create readme.md 2013-12-03 14:47:17 +01:00
Michael Kaufmann (d00p)
61c04d5e31 use better defaults for fpm-slowlog settings, refs #1051 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-03 11:21:22 +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
64137f68a8 Merge pull request #172 from seidler2547/master 
add session gc vars to configurable values for php-fpm
 2013-12-03 01:24:25 -08:00
Michael Kaufmann (d00p)
cf23980f0b minor fixes in installation-class, better error-handling 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-03 09:46:00 +01:00
seidler2547
dfeefc2e6f add session gc vars to configurable values 
session.gc_divisor and session.gc_probability are needed e.g. for Horde to work correctly
 2013-12-03 08:52:05 +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)
ede732417e remove old and usused postfix config-parameters from freebsd-postfix config-template, fixes #1255 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-02 11:06:38 +01:00
Michael Kaufmann (d00p)
31f2ececa8 loadmodule mysql in freebsd's proftpd config, fixes #1291 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-02 11:02:57 +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
de05bdc968 Merge pull request #171 from markc/markc 
Fix typo in Install-class
 2013-12-01 22:55:18 -08:00
Mark Constable
b551c931e9 Renamed exceute() to execute() in class.FroxlorInstall.php 2013-12-02 11:38:08 +10: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
Michael Kaufmann
073c5824bb Merge pull request #170 from BNoiZe/master 
Changed password reset to use a activation link, fixes #729
 2013-12-01 08:38:20 -08:00
BNoiZe
f74ed8ed93 Added preconfig hint for 0.9.31-dev4 2013-12-01 11:06:33 +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
Michael Kaufmann (d00p)
f8e7f1a975 remove not-functional method 'maildirExists' as maildirs have chmod 700, show 'remove files' on overview-delete if mail-address is an account, fixes #1275 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-30 16:40:27 +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
Michael Kaufmann (d00p)
1e87c21956 removed deprecated db-class (mysql-extension) as it is not needed anymore 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-30 15:32:57 +01:00
Michael Kaufmann (d00p)
b1ae352d88 migrated install-class to new PDO database class, needs testing, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-30 14:25:49 +01:00
Michael Kaufmann (d00p)
cf3de1c657 fix customer-mysql overview, set better email address for error-reports to send to 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-29 23:13:26 +01:00
Michael Kaufmann
380d358a54 Merge pull request #168 from BNoiZe/master 
sizes are displayed correctly, fixes #1277
 2013-11-29 13:56:28 -08:00
BNoiZe
87bc9432f3 Fixed typos, refs #1287 2013-11-29 18:22:50 +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
d1cb2625ca Made display of database errors wider 2013-11-29 14:24:16 +01:00
BNoiZe
9986c3405e Manually trigger window resize to fix circular missbehaviour on several browsers 2013-11-29 13:55:27 +01:00
Michael Kaufmann
b38479f92d Merge pull request #167 from BNoiZe/master 
Updated language definitions for the new error reporting system; added templates for Froxlor-theme
 2013-11-29 04:51:12 -08: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
Michael Kaufmann (d00p)
88ec1a15f1 make linker available in Database class 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-29 12:55:10 +01:00