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

1645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
BNoiZe
521acfbe5c Added unlock link and greyed out customer if deactivated 2013-10-05 20:06:23 +02:00
BNoiZe
08e9f3ebd0 Dynamic sorting for theme Sparkle 2013-10-05 18:15:31 +02:00
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