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

2670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
8822067311 fix search for webspace and traffic related values, also, for integer fields (like diskspace) you can now use the following operators when searching: >, < and =; fixes #772 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-09 17:24:11 +01:00
Michael Kaufmann (d00p)
a5b1065195 generate spf-entry also for 'mail'-record when no mxservers are specified, fixes #1314 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-09 13:57:03 +01:00
Michael Kaufmann (d00p)
904f412495 set correct postmaster_address (using <SERVERNAME>-variable) for dovecot config-templates 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-09 11:52:09 +01:00
Michael Kaufmann (d00p)
2fa6c5cd97 generate more secure password suggestions and respect password-min-length setting 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-09 10:57:54 +01:00
Michael Kaufmann (d00p)
7bf4cc73b6 Merge remote-tracking branch 'origin/0.9.31' 2013-12-09 09:54:44 +01:00
Michael Kaufmann (d00p)
bafcf07300 adjust gitignore file to not stage error-logs 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-09 09:23:54 +01:00
Michael Kaufmann (d00p)
dc666e96b3 outsource monster-query to new WebserverBase class and adjust query which most likely fixes #1295 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-09 09:23:21 +01:00
Michael Kaufmann (d00p)
15bb78d447 remove some special characters from directory-names when validating, fixes #1231 and pull-request 73 partly 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-09 07:49:33 +01:00
Michael Kaufmann (d00p)
0771ccc9a6 Merge remote-tracking branch 'origin/0.9.31' 2013-12-08 22:00:51 +01:00
Michael Kaufmann (d00p)
3b0387901f don't cast mysql-max to integer as for admins-usernames, it may be '' instead of 0 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-08 22:00:23 +01:00
BNoiZe
2b13ae3ad8 fixed a wrong array-index in installation language file 2013-12-08 15:40:07 +01:00
Michael Kaufmann (d00p)
2e9310daf1 set master-branch version to next dev-version, so people don't break their database too early 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-08 14:36:04 +01:00
Michael Kaufmann (d00p)
e7ce62c7ff set version, please don't use this yet, if you're on git-version, switch to '0.9.31' branch 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-08 14:00:28 +01:00
Michael Kaufmann (d00p)
bf4c16b063 first work on permission-improvements by adding webserver-user to ftp-group of customer and therefore make it possible to chown the user-docroot to 750 keeping 'others' out, refs #532 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-08 11:13:43 +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)
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