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

1956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
0f80e66a01 Merge remote-tracking branch 'origin/0.9.31' 2013-12-08 10:22:21 +01:00
Michael Kaufmann (d00p)
dde6581f9c create SuexecUserGroup-statement on apache/fpm if customer has perl enabled so perl-scripts run under the same username, fixes #1317 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-08 10:18:18 +01:00
Florian Aders
0c0c8c63a7 Merge pull request #176 from BNoiZe/master 
Various improvements
 2013-12-06 09:44:36 -08:00
BNoiZe
ecb9fe9d5c Changed id to class 2013-12-06 18:39:55 +01:00
BNoiZe
56f8ca47dc Updated config templates 2013-12-06 18:27:51 +01:00
BNoiZe
29bf2e473d Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-12-06 18:24:10 +01:00
Michael Kaufmann (d00p)
6a6c5db88d forgot the update-status 2013-12-06 14:43:01 +01:00
Michael Kaufmann (d00p)
9f8a6a6f5e set version everywhere so updater takes effect :P 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-06 14:40:59 +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)
b762cce94d custom user-agent also for simplexml_load_file-method of reading news-feed 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-06 10:31:22 +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)
ce1608ab2c set long-lasting url for news-feed (and switch to inside.froxlor.org, which will be used more often in the future to provide up-to-date content in froxlor) and prefer connection via cURL to pass a custom-useragent for possible version depended news later 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-06 09:44:57 +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)
7b1b2ce9d7 Merge remote-tracking branch 'origin/0.9.31' 2013-12-05 14:57:07 +01:00
Michael Kaufmann (d00p)
49b2cf68e9 return the generated user-/databasename after adding the database because it's needed 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-05 14:56:36 +01:00
Michael Kaufmann (d00p)
bc1b64a688 Merge remote-tracking branch 'origin/0.9.31' 2013-12-05 14:37:00 +01:00
Michael Kaufmann (d00p)
c3336b7d0f fix correctMysqlUsers() function for new pdo-class, also created new wrapper for dbms-specific queries to possibly give the freedom to use anything else but MySQL (no promises so far) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-05 13:55:01 +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
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
BNoiZe
429be9f774 changed "discard changes" to a more useful "cancel" button 
„cancel” will take you back to the last view you were in.
 2013-12-04 21:59:33 +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