Laurent Destailleur 09035c1fee Merge branch 'fetchobject' of https://github.com/frederic34/dolibarr ...

into develop

Conflicts:
	htdocs/includes/tcpdi/fpdf_tpl.php
	htdocs/projet/card.php

2015-03-04 20:52:54 +01:00

..

adodbtime

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

chromephp

Fix: the syslog handler for chromphp an fiefoxphp was not visible when

2015-02-07 19:12:22 +01:00

ckeditor

Fix: Pb with focus position with ckeditor

2014-08-21 14:17:27 +02:00

evalmath

Fix permissions

2015-02-02 13:45:55 +01:00

fonts

New: Tuffy font is now useless.

2011-12-28 01:03:10 +01:00

fpdfi

Fix: Bad management of error

2015-03-02 01:05:12 +01:00

geoip

Normalized EOL

2013-07-01 12:00:42 +02:00

jquery

Start to work on new generation combo box.

2014-12-05 13:26:47 +01:00

jsgantt

Merge remote-tracking branch 'origin/3.4' into develop

2013-09-11 23:12:47 +02:00

nusoap/lib

Replaced PHP 5.5 deprecated call in external library

2013-09-11 15:00:35 +02:00

odtphp

Fix jodconverter can't work without the wrapper jodconverter.

2015-02-22 16:01:01 +01:00

php-iban

Add libs

2015-02-17 11:41:50 +01:00

phpexcel

Update PHPExcel library to 1.8.0

2015-02-20 05:50:36 +01:00

printipp

Update lib with github.com/mfly/php-ipp

2014-12-28 11:29:53 +01:00

tcpdf

Update TCPDF library to 6.2.6

2015-02-20 06:05:50 +01:00

tcpdi

Merge branch 'fetchobject' of https://github.com/frederic34/dolibarr

2015-03-04 20:52:54 +01:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00