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

1791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BNoiZe
d15242ced7 Fixed footer cell 2013-10-24 17:10:00 +02:00
Michael Kaufmann
b81d163e1d Merge pull request #134 from RipClaw2971/#1281 
fixes #1281
 2013-10-21 09:11:31 -07:00
Andreas Grundler
d0315b7ed3 RealPath nicht DomainPath 2013-10-21 17:36:44 +02:00
Andreas Grundler
3c76594abb Fixed CleanupData to prevent recursive delete of all data 2013-10-21 16:35:32 +02:00
Andreas Grundler
db5aa1a98c Merge remote-tracking branch 'upstream/master' into apsfix 2013-10-21 07:29:50 +02:00
Andreas Grundler
4a61df8ae7 typo 2013-10-21 07:27:38 +02:00
Andreas Grundler
95da4e9eab Bufix for "chown -R [User]:[User] /" 2013-10-21 07:14:46 +02:00
Michael Kaufmann
510c429956 Merge pull request #133 from BNoiZe/master 
Language, Theme, Password - Margin fix
 2013-10-20 10:44:33 -07:00
BNoiZe
55d09ac569 Language, Theme, Password - Margin fix 2013-10-20 19:42:25 +02:00
Michael Kaufmann
d2923228da Merge pull request #132 from BNoiZe/master 
Some more design fixes
 2013-10-20 02:32:52 -07:00
BNoiZe
a86d2d2df3 Some more design fixes 2013-10-20 11:29:54 +02:00
Michael Kaufmann
67c8953a84 Merge pull request #131 from BNoiZe/master 
New ticket notification icon
 2013-10-20 00:55:41 -07:00
BNoiZe
d4c4e31804 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-20 09:52:58 +02:00
BNoiZe
78807a8ea8 Added new ticket notification icon 2013-10-20 09:52:14 +02:00
Michael Kaufmann
fa4fbdc7c4 Merge pull request #130 from BNoiZe/master 
Spanish translation fixes
 2013-10-19 11:19:21 -07:00
BNoiZe
036bd61ded Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-19 20:13:43 +02:00
Michael Kaufmann (d00p)
cb556093c1 fix undefined language indeces (add english as fallback as intented in case a string is not defined in the used language) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-19 18:48:08 +02:00
Michael Kaufmann (d00p)
729b52cf0a outsource check for open support-tickets to init.php so that themes may display the info wherever they want 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-19 18:47:02 +02:00
BNoiZe
0e6aec2533 Added missing spanish translations 2013-10-19 16:46:54 +02:00
Michael Kaufmann
993d5114e3 Merge pull request #129 from BNoiZe/master 
Img height and autofocus on login, other fixes
 2013-10-19 00:21:10 -07:00
BNoiZe
4312ed9181 Many small fixes and beautifications 2013-10-19 09:02:12 +02:00
BNoiZe
0eb8e0c55c Fixed img height on login page, set focus to username 2013-10-18 18:53:52 +02:00
Michael Kaufmann
6a47752665 Merge pull request #128 from BNoiZe/master 
Some CSS fixes and header improvements
 2013-10-18 06:46:16 -07:00
BNoiZe
5231ae2383 Some CSS fixes and header improvements 2013-10-18 15:16:55 +02:00
Michael Kaufmann (d00p)
03ba127fab use new directory-validator 'confdir'; fix if last ssl-ipport got deactivated and a security question is being asked 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-16 16:23:10 +02:00
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