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

409 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
4dc774c11c also, add french to the available language-files for install-process 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-04-28 17:22:46 +02:00
Michael Kaufmann (d00p)
f48d97e132 add french language file for installation-process, thx to hurl for translating; fixes #1415 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-04-28 14:06:10 +02:00
Michael Kaufmann (d00p)
b341228dd9 fix invalid sql in very old update-procedure (happens when you update from 0.9.7-svn1 to 0.9.7-svn2) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-04-27 09:23:36 +02:00
Roman Schmerold (BNoiZe)
4994a90be9 Removing old languages from database, pushing version to 0.9.32-rc3 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-04-14 09:48:39 +02:00
Michael Kaufmann (d00p)
08ce6be3ff fix 'field does not have a default value' error reported via email 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-03-05 08:11:56 +01:00
Michael Kaufmann (d00p)
2d68216699 remove old and unused setting from install-sql-file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-03-05 08:00:04 +01:00
Michael Kaufmann (d00p)
d00cdec296 added cronjob-auto-update-feature (beware and READ), fixes #1342; remove old backup-ftp-users on update, fixes #1381 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-25 07:48:46 +01:00
Michael Kaufmann (d00p)
bad1183f42 set correct default php-ini for own-vhost, thx Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-14 14:08:58 +01:00
Michael Kaufmann (d00p)
20d54d5a04 put cron.d-generation task directly to froxlor.sql as there might be no userdata.inc.php after the installation (only in /tmp or plaintext for copy'n'paste) so the database action fails 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-14 11:18:02 +01:00
Michael Kaufmann (d00p)
938bb429d8 insert task to generate cron.d file after installation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-14 11:03:08 +01:00
Florian Aders (EleRas)
d7c94726fd Add a basic integritychecker after every update 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-07 18:25:35 +01:00
Michael Kaufmann (d00p)
ec7d006069 forgot the 'TABLE' in the query 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-07 16:48:50 +01:00
Michael Kaufmann (d00p)
a1aa87940b fix non-default value of data-field in tasks-table (thx to an error-report), set version to 0.9.32-rc1 for upcoming release candidate 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-07 15:49:40 +01:00
Michael Kaufmann (d00p)
fe5922c0a0 code beautification and variable-name-fix 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-26 20:53:31 +01:00
Michael Kaufmann (d00p)
019da862dd use the same cron.d-name as in the config-template as the 'default' cronjob is not needed after the first generation of the new one; generate different lockfiles for the different jobs to avoid unnecessary conflicts 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-23 13:59:09 +01:00
Michael Kaufmann (d00p)
6d1899d72e fix typo 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-23 13:25:03 +01:00
Michael Kaufmann (d00p)
abcdfb03d9 add cron-daemon reload command in order for new cron.d file to be applied, fixes #858 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-23 13:22:11 +01:00
Michael Kaufmann (d00p)
17255de669 bugfix new cron.d-file generation and don't overwrite our master, refs #858 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-13 13:42:02 +01:00
Michael Kaufmann (d00p)
4be52f76eb introducing new way of controling the cronjobs by creating a cron.d-file 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-13 08:55:39 +01:00
Roman Schmerold (BNoiZe)
30add37bd6 Fixed a missing comma (thx Johannes Gilges) 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 08:04:04 +01:00
Johannes Matheis
f320daa93c make color of input fields consistent to body color 2014-01-04 16:24:02 +00:00
Johannes Matheis
d596eb754a override fg color to obtain readability 2014-01-03 17:00:42 +00:00
Florian Aders (EleRas)
63d5547d1e Fixed typo in updater 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-01-03 08:22:40 +01:00
Roman Schmerold (BNoiZe)
0c2aa8de45 Add description field to FTP accounts, fixes #1340 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-02 22:45:30 +01:00
Florian Aders (EleRas)
2d1fd0c8c5 Delete old froxlor-theme and automatically move users to CSS - version of theme 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-01-01 13:11:27 +01:00
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