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

1722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BNoiZe
122c43c18a Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-10-30 17:23:37 +01:00
BNoiZe
97cd522726 Removed unused and duplicate icons 2013-10-30 17:14:37 +01:00
Michael Kaufmann
7e5c8bd596 Merge pull request #141 from BNoiZe/master 
Moving "add"-links to top, removing unused froxlorclient
 2013-10-30 07:02:26 -07:00
BNoiZe
16989a077d Removed unused froxlor client 2013-10-30 14:58:27 +01:00
BNoiZe
2852589598 Moved links fpr adding stuff to top of table, fixed position of search 2013-10-30 14:56:41 +01:00
Michael Kaufmann (d00p)
b618dd4e00 ehance new PDO database class 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-30 14:38:04 +01:00
Michael Kaufmann (d00p)
8172cb8fc0 add possibility to use root-mysql-connection to new database class 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-29 14:24:50 +01:00
Michael Kaufmann (d00p)
5d8906f1d8 enhance new PDO Database class; converted admin_cronjobs 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-29 09:02:49 +01:00
Michael Kaufmann (d00p)
87867edfca Merge branch 'master' of github.com:Froxlor/Froxlor 2013-10-29 08:22:31 +01:00
Michael Kaufmann (d00p)
a14f04c25b Added new database-class based on PHP-PDO to use prepared-statements; implemented new Database-class in admin_index (more to follow, old DB class still in use everywhere else); secure standard_error back-link output 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-29 08:22:17 +01:00
Michael Kaufmann
8b06c897f6 Merge pull request #140 from BNoiZe/master 
Many bugfixes and usability improvements (thanks to oschn0r)
 2013-10-27 14:18:52 -07:00
BNoiZe
8f7ab2a243 Many bugfixes and usability improvements (thanks to oschn0r) 2013-10-27 22:07:47 +01:00
Michael Kaufmann
23da3259c4 Merge pull request #139 from BNoiZe/master 
Fixed bug with small traffic graph
 2013-10-27 11:22:47 -07:00
BNoiZe
5b7f68f77d Fixed bug with small traffic graph 2013-10-27 19:21:09 +01:00
Michael Kaufmann
2368267bb8 Merge pull request #138 from BNoiZe/master 
Updated translations, more information in dashboard (part 2/2), minor bugfixes...
 2013-10-27 10:50:30 -07:00
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