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

1707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BNoiZe
09b50b2b48 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-27 18:49:00 +01:00
BNoiZe
59c0207301 Updated translations, more information in dashboard (part 2/2), bugfixes once again 2013-10-27 18:48:46 +01:00
Michael Kaufmann (d00p)
b618e86512 collect more info for the customer-dashboard (part 1/2); check for existance of cronjob (just in case) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-27 18:42:40 +01:00
Michael Kaufmann (d00p)
5d4448b659 Merge branch 'master' of github.com:Froxlor/Froxlor 2013-10-27 16:54:54 +01:00
Michael Kaufmann (d00p)
89877f7ff2 fix wrong error-message of non-existing ip/port combo when a ssl-ip/port exists but not checked when adding a domain 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-27 16:53:14 +01:00
Michael Kaufmann
32636359e1 Merge pull request #137 from BNoiZe/master 
Some more bugfixes, soft animation when resizing window
 2013-10-27 05:22:15 -07:00
BNoiZe
9d3f2deef1 Removed useless text 2013-10-27 12:14:57 +01:00
BNoiZe
fc69afcffc Some more bugfixes, soft animation when resizing window 
No more oh! (Hopefully)
 2013-10-27 11:52:53 +01:00
Michael Kaufmann
af17373afa Merge pull request #136 from BNoiZe/master 
Dashboard bugfixes
 2013-10-27 02:47:03 -07:00
BNoiZe
c233fbfffb Dashboard bugfixes 2013-10-27 10:44:31 +01:00
Michael Kaufmann
2c08bfcfd1 Merge pull request #135 from BNoiZe/master 
First version of the new dashboard, various language- and bugfixes + design improvements
 2013-10-27 01:49:32 -07:00
BNoiZe
be9bf3fd34 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-27 09:45:00 +01:00
Michael Kaufmann (d00p)
9d5851e9be deny possible direct call of cronjobs 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-27 06:18:09 +01:00
BNoiZe
3e73f6ccb4 First version of the new Dashboard 2013-10-24 22:07:01 +02:00
BNoiZe
33414f4c68 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-24 20:39:53 +02:00
Michael Kaufmann (d00p)
6ac4b87a84 make ssl-cipher-list an option, fixes #1274 ; improve ssl-related language-strings; setting version to 0.9.30 for release 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
0.9.30 		2013-10-24 19:45:13 +02:00
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