Commit Graph

9 Commits

Author SHA1 Message Date
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
Regis Houssin
54860ef304 Fix: upgrade tcpdf and fpdi 2012-08-29 09:55:32 +02:00
Raphaël Doursenaud
d34c4518d2 Removed BOM from UTF-8 files
Fix: convert line delimiters (regis)

Conflicts:
	htdocs/core/filemanagerdol/browser/default/js/common.js
	htdocs/core/filemanagerdol/browser/default/js/fckxml.js
2012-07-28 19:04:50 +02:00
Regis Houssin
e49df57667 Fix: compatibility with php 5.4 and E_STRICT mode 2012-04-14 15:04:46 +02:00
Regis Houssin
396fa840c8 Fix: upgrade tcpdf with some fix 2011-06-25 14:50:10 +00:00
Regis Houssin
447ce83619 New: update TCPDF 2011-03-15 13:05:31 +00:00
Laurent Destailleur
29cc8b2fdc Restore work lost by savannah backup 2010-12-01 22:14:15 +00:00
Regis Houssin
77fb85b824 Fix: savannah problem 2010-12-01 19:55:20 +00:00
Laurent Destailleur
ded3200073 Work on FPDF replacement by TCPDF 2010-08-31 23:52:19 +00:00