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

1741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
e3750a2988 remove unused upgrade procedures, migrated a few minor functions and files to PDO database, fixed FROXLOR_INSTALL_DIR define for master-cronjob, fixes #1294 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-04 09:03:29 +01:00
Michael Kaufmann (d00p)
e549ab2cbb finally removed super-old syscp-update-procedures, we now require the last available syscp for upgrading; migrate some functions to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-03 10:54:43 +01:00
Michael Kaufmann (d00p)
c9d91d178b fix 'NULL' <> null problem when adding/editing a domain as customer, thx to Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-02 12:20:23 +01:00
Michael Kaufmann (d00p)
3ec08a8f48 migrate admin_message, admin_phpsettings and admin_templates to PDO, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-02 12:07:34 +01:00
Michael Kaufmann (d00p)
111804b665 migrated admin_tickets and admin_updates to PDO database, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-02 10:19:19 +01:00
Michael Kaufmann (d00p)
a05fae7b75 remove unnecessary globals from generatePassword() function 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-02 10:14:17 +01:00
Michael Kaufmann
d9903e1be2 Merge pull request #146 from BNoiZe/master 
Migrated customer_ftp to new database class refs #1287
 2013-11-01 06:08:51 -07:00
BNoiZe
36d40f8312 Migrated customer_ftp to new database class refs #1287 2013-11-01 14:04:18 +01:00
Michael Kaufmann (d00p)
08c219a291 fix blowfish hashing on php >=5.3.7, see http://php.net/manual/en/function.crypt.php, fixes #1288 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-01 09:29:13 +01:00
Michael Kaufmann
316b132ac5 Merge pull request #145 from BNoiZe/master 
Migrated customer_mysql, customer_tickets, customer_traffic to new database class
 2013-10-31 09:46:09 -07:00
BNoiZe
b4a2124d1b Migrated customer_mysql, customer_tickets, customer_traffic to new database class 2013-10-31 17:35:57 +01:00
Michael Kaufmann (d00p)
256a714d55 enhanced pdo database class; migrated admin_logger and admin_traffic 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-31 15:46:38 +01:00
Michael Kaufmann
1b03a55dae Merge pull request #144 from coacx/master 
update apache path in install/froxlor.sql to reflect apache2 conform standard paths
 2013-10-31 07:32:15 -07:00
coacx
c21bf7014e fixed apache path in install/froxlor.sql 2013-10-31 15:03:27 +01:00
Michael Kaufmann
bf0b443d4b Merge pull request #143 from BNoiZe/master 
Fixed a bug with tokens
 2013-10-31 04:27:20 -07:00
BNoiZe
e8e6471f02 Fixed a bug with tokens 2013-10-31 12:11:50 +01:00
Michael Kaufmann
77af777b89 Merge pull request #142 from BNoiZe/master 
Icon cleanup, implement new PDO database class in customer_autoresponder/customer_domains/customer_index
 2013-10-31 04:01:59 -07:00
BNoiZe
4735d92a0f Converted to new PDO database class 2013-10-31 11:51:01 +01:00
Michael Kaufmann (d00p)
2057864116 forgot one query in admin_index; converted admin_ipsandports to new pdo database class 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-31 08:01:50 +01:00
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