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

1814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann
fc0a069a74 Merge pull request #118 from BNoiZe/master 
CSS tweaks
 2013-10-04 10:47:24 -07:00
BNoiZe
1acf7d852d Merge branch 'master' of https://github.com/BNoiZe/Froxlor 2013-10-04 19:40:13 +02:00
BNoiZe
015e688a0e Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-04 19:39:06 +02:00
BNoiZe
939c1950ea CSS tweaks 2013-10-04 19:27:37 +02:00
BNoiZe
57e0d84d69 Removed error file created by git 2013-10-04 19:02:50 +02:00
BNoiZe
9e633d6e11 Merge branch 'master' of https://github.com/BNoiZe/Froxlor 
Conflicts:
	templates/Sparkle/assets/css/main.css
 2013-10-04 18:57:25 +02:00
BNoiZe
6d12ad9986 Merge pull request #117 from BNoiZe/master 
Fixes for installtion screen
 2013-10-04 18:56:18 +02:00
Michael Kaufmann (d00p)
205f80ff8d Merge branch 'master' of github.com:Froxlor/Froxlor 2013-10-04 18:54:24 +02:00
Michael Kaufmann (d00p)
30e664e8ea remove unecessary sed-command on debian wheezy (fpm), fixes #1269 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-04 18:53:31 +02:00
Michael Kaufmann
21020fecc4 Merge pull request #117 from BNoiZe/master 
Fixes for installtion screen
 2013-10-04 06:50:07 -07:00
BNoiZe
c649970f4d Fixes for installtion screen 2013-10-04 15:42:01 +02:00
Michael Kaufmann
c5dc953071 Merge pull request #116 from BNoiZe/master 
CSS & HTML cleanup, usage of $linker->getLink() in header.tpl (sparkle theme)
 2013-10-03 13:19:41 -07:00
BNoiZe
6ca09a3ca0 Replaced static links with $linker->getLink() 2013-10-03 21:51:59 +02:00
BNoiZe
0c3aa5c0be CSS & HTML cleanup 2013-10-03 21:21:54 +02:00
Michael Kaufmann
ee38a99b19 Merge pull request #115 from BNoiZe/master 
Fixed heading of replaceable vars
 2013-10-03 11:17:26 -07:00
BNoiZe
ce403a855a Fixed heading of replaceable vars 2013-10-03 20:10:34 +02:00
Michael Kaufmann (d00p)
c2b35d81c6 Merge branch 'master' of github.com:Froxlor/Froxlor 2013-10-03 16:11:01 +02:00
Michael Kaufmann (d00p)
0ca935b553 fix incorrect strings for AXFR in updater, thx to Max 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-03 16:09:59 +02:00
Michael Kaufmann
b985e6c0f2 Merge pull request #113 from BNoiZe/master 
New PHPinfo template and Default Page (Sparkle theme)
 2013-10-02 13:42:03 -07:00
BNoiZe
fda66945b5 Removed static text for testing purposes 2013-10-02 21:47:13 +02:00
BNoiZe
8c2276da64 New Default Page 2013-10-02 18:56:43 +02:00
BNoiZe
5684cd8a9f New PHPinfo table 2013-10-02 18:29:31 +02:00
Michael Kaufmann (d00p)
b43a55b9b8 fix incorrect path to awstats_buildstaticpages.pl on Ubuntu Precise, thx to get 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-02 17:14:14 +02:00
Michael Kaufmann (d00p)
47d595edda fix checklastguid, thx oschni 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-02 10:23:58 +02:00
Michael Kaufmann (d00p)
10dc017dd1 add phpinfo() in admin-panel, thx to EleRas; fixes #1270 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-02 09:48:24 +02:00
Michael Kaufmann (d00p)
91ed3cb128 fix has_certs == 3 which is old (it's the default which is 0) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 22:16:36 +02:00
Michael Kaufmann
83743eef8c Merge pull request #112 from BNoiZe/master 
Fixes and cleanup
 2013-10-01 13:16:44 -07:00
BNoiZe
e5304d1cc1 Code cleanup 2013-10-01 22:02:44 +02:00
BNoiZe
f44395a001 Fixed css 2013-10-01 22:00:37 +02:00
BNoiZe
b56149f3f3 Added scroll to top button 2013-10-01 21:52:43 +02:00
BNoiZe
d55cccda39 Added background to options dropdown 2013-10-01 21:37:30 +02:00
BNoiZe
63bfea75a5 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-01 21:28:59 +02:00
BNoiZe
413b34bf34 Show type of certificate 2013-10-01 21:28:44 +02:00
BNoiZe
bc83e65a50 Replaced wrong customer-icon 2013-10-01 21:27:56 +02:00
Michael Kaufmann
2e503302a8 Merge pull request #111 from BNoiZe/master 
Sparkle fixes/updates and lng/english.lng.php update
 2013-10-01 12:17:09 -07:00
BNoiZe
993814edd5 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-01 20:45:37 +02:00
Michael Kaufmann (d00p)
b19e226609 fix webftp template (Froxlor and Sparkle theme) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 18:44:09 +02:00
Michael Kaufmann (d00p)
c2831007e7 update sparkle theme to reflect latest changes + some minor bugfixes 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 18:43:41 +02:00
BNoiZe
12bf2b779f Changed old CUST_NAME to new SALUTATION 2013-10-01 18:30:02 +02:00
BNoiZe
c4713f3ebf Replaced static text with language var 2013-10-01 18:03:04 +02:00
BNoiZe
180d711d9c Fixed uppercase of options 2013-10-01 18:02:45 +02:00
BNoiZe
34814e37ea Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-01 17:32:55 +02:00
BNoiZe
d179831033 better readability of green buttons 2013-10-01 17:28:21 +02:00
BNoiZe
8032e6f0d5 if/else bugfix 2013-10-01 16:22:19 +02:00
Michael Kaufmann (d00p)
81ada4c9a4 Merge branch 'master' of github.com:Froxlor/Froxlor 2013-10-01 16:11:27 +02:00
Michael Kaufmann (d00p)
2ca9420bd4 don't show form to add e-mail addresses if no domain exists 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 16:11:19 +02:00
Michael Kaufmann
d76e52cfde Merge pull request #110 from BNoiZe/master 
multi-stack support for Sparkle-Theme
 2013-10-01 07:03:13 -07:00
BNoiZe
a2fb15db68 multi-stack support 2013-10-01 15:58:37 +02:00
Michael Kaufmann (d00p)
38a53e49fd welcome on board new 'Sparkle' theme and also welcome on board BNoiZe as theme maintainer (creater of Sparkle theme) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 15:21:35 +02:00
Michael Kaufmann (d00p)
ecdb9ddbdc fix missing file-extension for AddHandler directive 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 10:16:13 +02:00