maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,087 Commits 6 Branches 188 Tags
3e5e4790bf78d319325d944125d7ef9183ac5895
Commit Graph

384 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
0fb0d3b2db Merge remote-tracking branch 'origin/0.9.31.2' 2013-12-27 16:46:33 +01:00
Michael Kaufmann (d00p)
01d825fc2a set version to 0.9.31.2 for bugfix release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-27 16:20:11 +01:00
Michael Kaufmann (d00p)
0c9d62977c Merge remote-tracking branch 'origin/0.9.31.2' 2013-12-24 15:41:33 +01:00
Michael Kaufmann (d00p)
d34515b9e0 also add curl check to master-branch, dunno why this was not merged automatically, git is teh shit 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-24 15:35:47 +01:00
Michael Kaufmann (d00p)
da371fa560 Merge remote-tracking branch 'origin/0.9.31.2' and fix install-SQL file 2013-12-24 15:29:57 +01:00
Michael Kaufmann (d00p)
44ae470d7e add check for optional php-curl extension 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-24 14:43:47 +01:00
Michael Kaufmann (d00p)
2dc0bf2104 use better german 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-24 14:36:11 +01:00
Michael Kaufmann (d00p)
3b9727942a we need php-5.3 not 5.2 - check is correct but text was not 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-24 14:34:27 +01:00
Michael Kaufmann (d00p)
0031e19c70 damn automatic merge...stupid thing 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-22 19:24:40 +01:00
Michael Kaufmann (d00p)
99c0bda7f2 Merge remote-tracking branch 'origin/0.9.31.1' 2013-12-22 19:21:34 +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)
05dad04384 add 0.9.31.1 to updater of 0.9.32-dev 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-19 18:30:00 +01:00
Michael Kaufmann (d00p)
261d6e7d76 backport bugfixes from current master 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-19 18:05:40 +01:00
Andreas Grundler
18d93fb07d SQL Fix 2013-12-19 17:26:04 +01:00
Michael Kaufmann (d00p)
7267c2dec9 Merge remote-tracking branch 'origin/0.9.31' 2013-12-18 09:58:38 +01:00
Michael Kaufmann (d00p)
23a1a55bf2 set version to 0.9.31 for upcoming release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-18 09:40:48 +01:00
Michael Kaufmann (d00p)
6902868e58 Merge remote-tracking branch 'origin/0.9.31' 2013-12-17 07:57:58 +01:00
Michael Kaufmann (d00p)
bdf03486d2 set better defaults (sites-enabled/* is included in apache by default on most systems) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-16 18:33:57 +01:00
Michael Kaufmann (d00p)
7f565c305c migrate more stuff to new Settings class, refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 14:38:53 +01:00
Michael Kaufmann (d00p)
18933ad118 Merge remote-tracking branch 'origin/0.9.31' 2013-12-12 11:38:32 +01:00
Michael Kaufmann (d00p)
73f5547a5e add php-config for froxlor-vhost and set it as default for froxlor's vhost when fcgid/fpm is used (and the current default is set, custom settings won't be overwritten) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-12 10:44:32 +01:00
Michael Kaufmann (d00p)
0771ccc9a6 Merge remote-tracking branch 'origin/0.9.31' 2013-12-08 22:00:51 +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)
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)
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)
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)
85ee0751bd Merge remote-tracking branch 'origin/removal' 2013-12-05 09:02:40 +01:00
Robert Förster (Dessa)
29ae767c17 fix typo 2013-12-05 00:39:42 +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)
47b1675dea set version to 0.9.31-rc1 for upcoming release-candidate 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-04 14:52:25 +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
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 (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
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
Mark Constable
b551c931e9 Renamed exceute() to execute() in class.FroxlorInstall.php 2013-12-02 11:38:08 +10: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
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)
567f789dab at this stage in the updater, it's too late to inform about pdo 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-26 10:16:19 +01:00
Michael Kaufmann (d00p)
84ed13d791 update-note about php-pdo being used now 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-26 09:41:40 +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
Michael Kaufmann (d00p)
26d9aa570c remove unused code and database-tables; set version to 0.9.31-dev1 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-07 18:49:16 +01:00
Michael Kaufmann (d00p)
3e7df9cb7a remove parameter from FroxorLogger class and migrated it to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-04 13:28:23 +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