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

1666 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
6b93b973e2 add new directory-validator 'confdir' to check against disallowed paths (like /, /bin, /home, etc.) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-16 08:54:39 +02:00
Michael Kaufmann
64e646b526 Merge pull request #127 from BNoiZe/master 
history.go(-1) fix
 2013-10-15 06:13:45 -07:00
BNoiZe
9d66507050 history.go(-1) fix 2013-10-15 15:10:10 +02:00
Michael Kaufmann (d00p)
b10b8df791 output nicer error's also in webftp-script 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-15 15:02:14 +02:00
Michael Kaufmann (d00p)
e40c7289c4 change default path of custom-ssl-certificates as too many people can't read. Also, don't let updaters specify '/' (result of an empty value) as custom-ssl path and let the cron only clean the custom-ssl-path of ssl is enabled (just in case), refs #1279 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-15 14:49:53 +02:00
Michael Kaufmann (d00p)
e38e4532b3 fix update procedure for users who upgraded from syscp (the database field which is to be dropped does not exist for them, just in fresh installs), fixes #1278 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-15 08:50:38 +02:00
Michael Kaufmann
7bd0fdfa6a Merge pull request #126 from BNoiZe/master 
WebFTP fixes (sparkle theme related)
 2013-10-14 11:13:32 -07:00
BNoiZe
0b6518a751 Fixed linebreaks and icons 2013-10-14 20:05:37 +02:00
BNoiZe
96faf31618 Sparkle as WebFTP default, fixes for WebFTP-Templates 2013-10-14 20:00:35 +02:00
Michael Kaufmann (d00p)
b2d873fe31 set version to 0.9.30-rc1 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.30-rc1 		2013-10-14 16:12:34 +02:00
Michael Kaufmann (d00p)
e0a4c9b8d1 add note for apache2 + php-fpm users that they need to change the fastcgi.conf when updating to 0.9.30; minor improvements of Sparkle-Theme (update templates) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-14 15:47:08 +02:00
Michael Kaufmann (d00p)
207f5c69d4 select correct value for serveralias-option when editing domain; customer now has same options as admin; refs #1147 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-14 10:08:15 +02:00
Michael Kaufmann (d00p)
1a99a272b1 let the admin set the server-alias completely (either wildcard, www. or none), customer option follows, this fixes #1147 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-14 09:50:55 +02:00
Michael Kaufmann (d00p)
e1fa5f6f0a don't link to index.php on sql-error but rather to the page before the error 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-14 09:49:47 +02:00
Michael Kaufmann (d00p)
8c8cb5a0d7 remove sort-by-path as it does not work anyway (and makes not much sense), fixes #692 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-13 16:43:46 +02:00
Michael Kaufmann (d00p)
ff19d7209d fix lighttpd cronjob for multi-stack; add ssl-cipher for nginx; set version to 0.9.30-dev1; fixes #583 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-13 16:08:14 +02:00
Michael Kaufmann (d00p)
92243991bc finally output a nice error-message on mysql-errors 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-13 12:59:43 +02:00
Michael Kaufmann (d00p)
4b5b2db6db check for FQDN before creating db, etc. 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-13 12:59:20 +02:00
Michael Kaufmann (d00p)
26885b0f35 improved error-message on incorrect ownership of lib/userdata.inc.php; set correct copyright in hint-templates; beautify code in lib/init.php 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-13 11:51:26 +02:00
Michael Kaufmann
4785c19b62 Merge pull request #125 from BNoiZe/master 
Styling for new install, CSS fixes & tweaks, corrected icons
 2013-10-13 02:33:34 -07:00
BNoiZe
b744447714 Styling for new install 2013-10-13 11:29:01 +02:00
BNoiZe
e0184e2b40 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-13 10:55:50 +02:00
BNoiZe
82b109d170 CSS fixes and tweaks 2013-10-13 10:49:31 +02:00
Michael Kaufmann (d00p)
d055c1ca72 re-work the whole install-process, now templates- and class-based; set Sparkle as default theme; set version to 0.9.29.1-dev4 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-13 10:45:09 +02:00
Michael Kaufmann (d00p)
b480a0be57 a few fixes here and there, imporved autoloader, updated database-class (ugly old php4 style), removed two functions which will be included in the following updated installer 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-13 10:39:11 +02:00
BNoiZe
2ba1c1eb42 Fixed wrong icons 2013-10-12 15:09:33 +02:00
BNoiZe
e7871cb5b4 Small design improvements 2013-10-11 20:44:31 +02:00
Michael Kaufmann (d00p)
72fcad5007 remove unnecessary removal of fcgid-configs (done in ConfigIO) and remove old logs from customer if file-deletion is wanted 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-11 18:27:26 +02:00
Michael Kaufmann
0b0126ed68 Merge pull request #122 from BNoiZe/master 
Removed dataTables
 2013-10-11 09:27:09 -07:00
BNoiZe
0651238e41 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-10 17:01:01 +02:00
Michael Kaufmann (d00p)
6a76e8a53f remove build-in logrotate feature and provide logrotate-script 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-09 16:23:59 +02:00
Michael Kaufmann (d00p)
da0ae9040a fixes for php-5.4 (strict standard) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-09 16:12:54 +02:00
Michael Kaufmann (d00p)
b779a67e60 create sql-error.log file for database errors so support/debugging will be easier 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-09 15:58:05 +02:00
Michael Kaufmann (d00p)
e670065a0f clean phpfpm-aliasconfig-directory so old data is being removed, fixes #1273 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-09 10:43:04 +02:00
Robert Förster (Dessa)
d74d61826f bump Smarty to 3.1.15 2013-10-07 23:43:52 +02:00
Robert Förster (Dessa)
ed08303ec6 bump html5shiv to 3.7.0 2013-10-07 14:04:35 +02:00
Robert Förster (Dessa)
af136cf1f0 - add mod_quotatab_sql to wheezy proftpd fixes #1268 
- replace a stray tab with a space
 2013-10-07 13:42:44 +02:00
Michael Kaufmann (d00p)
cbe7792929 clean-up for fpm (remove unecessary stuff), thx to tomreyn & Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-06 18:59:10 +02:00
Michael Kaufmann (d00p)
b8960149ff really fix deletion of ip/port combo (typo && wrong field-name) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-06 18:22:59 +02:00
BNoiZe
553eca9b29 Removed dataTables 2013-10-06 15:14:58 +02:00
Michael Kaufmann (d00p)
16917505af fix domain-cross-check when deleting a IP/port combo, thx to datenfalke 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-06 14:13:36 +02:00
Michael Kaufmann (d00p)
e078d39f2d improve design for ssl-certificate descriptions, also increase size of textareas to fit a certificate-width 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-06 13:57:39 +02:00
Michael Kaufmann (d00p)
56ef9e1992 enhance customer set ssl-certificates and improve description, this should fix #1244 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-06 13:41:01 +02:00
Michael Kaufmann (d00p)
455aa33d14 Merge branch 'master' of github.com:Froxlor/Froxlor 2013-10-06 11:36:51 +02:00
Michael Kaufmann (d00p)
475e2bf735 provide full path to 'nice'-executable in cron-configuration-templates, fixes #1272 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-06 11:36:34 +02:00
Michael Kaufmann
4584afe5fd Merge pull request #120 from BNoiZe/master 
Fixed natural sorting
 2013-10-06 01:24:01 -07:00
BNoiZe
6af5608f0f Added natural dynamic sorting 
New attributes for sortable tables: sort-column (0 ... x) for default
sort col in template and sort-direction (asc, desc) for default sort
order on load
 2013-10-06 09:43:01 +02:00
BNoiZe
718c19f230 Fixed a bug which made the edit link unclickable 2013-10-05 23:30:48 +02:00
Michael Kaufmann
11380a9819 Merge pull request #119 from BNoiZe/master 
Sorting, unlock link, greyed out customer
 2013-10-05 11:14:01 -07:00
BNoiZe
933a47cf7f Merge branch 'master' of https://github.com/BNoiZe/Froxlor 2013-10-05 20:09:05 +02:00