Commit Graph

3869 Commits

Author SHA1 Message Date
Raphaël Doursenaud
b9ff5188b3 Normalized EOL 2013-07-01 12:00:42 +02:00
Regis Houssin
930f6e4850 Fix: avoid error with crlf 2013-06-24 18:04:06 +02:00
Regis Houssin
ae67496730 Fix: crlf to lf 2013-06-24 17:41:15 +02:00
Laurent Destailleur
570275cd76 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/opensurvey.lang
	htdocs/opensurvey/public/index.php
2013-06-21 15:37:17 +02:00
Laurent Destailleur
6779724dc0 Merge pull request #1055 from FHenry/3.4
Fix ODT to PDF exec scripts path
2013-06-19 09:30:11 -07:00
Laurent Destailleur
e92e6f7131 Fix: Icon of wrong version 2013-06-19 17:00:11 +02:00
Laurent Destailleur
9bd41e94b5 Fix: Pb in css 2013-06-19 17:00:01 +02:00
Laurent Destailleur
8dd34c194e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-19 16:51:32 +02:00
Laurent Destailleur
5ee3d67488 Fix: Icon of wrong version 2013-06-19 16:44:04 +02:00
Laurent Destailleur
51d40b94cc Fix: Pb in css 2013-06-19 15:52:06 +02:00
Florian Henry
dc5db0c137 fix ODT to PDF script path 2013-06-18 09:07:53 +02:00
Laurent Destailleur
f0c8c1805f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-17 22:11:24 +02:00
Laurent Destailleur
9becf83d70 Keep zapfdingbats. 2013-06-17 22:10:44 +02:00
Laurent Destailleur
2042fc3a21 Qual: Update jquery.tablednd plugin. Use minified version (all embedded
plugins should use minified version).
2013-06-17 13:16:25 +02:00
Florian Henry
7cc7e8392d Fix ODT to PDF exec scripts path 2013-06-17 11:58:59 +02:00
Laurent Destailleur
b4abe58237 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	htdocs/core/lib/pdf.lib.php
2013-06-08 16:49:02 +02:00
Laurent Destailleur
5d1dfdc7c1 Upgrade tcpdf to 6.0 2013-06-08 16:29:59 +02:00
Laurent Destailleur
e13974b5f3 Fix: tcpdf bug 2013-06-08 15:29:27 +02:00
Alessandro Ponzio
3666999c37 Fixed bug in jsgantt.js showing 'NaN' when start/end date were missing 2013-05-10 07:10:05 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
2013-05-03 00:15:02 +02:00
Laurent Destailleur
8f214a77c5 Fix: Fix error with linux rules 2013-04-30 21:31:35 +02:00
Grand Philippe
0661f9f1f8 fix: Assigning the return value of new by reference is deprecated 2013-04-28 10:40:25 +02:00
Laurent Destailleur
ac4c236dbc Merge pull request #874 from grandoc/develop
Develop
2013-04-24 09:02:51 -07:00
Grand Philippe
026195689b fix undefined offset 2013-04-24 15:22:37 +02:00
Grand Philippe
d2a718d0e6 fix undefined offset 2013-04-24 15:18:42 +02:00
fhenry
ee4839c92e Better management for ODT to PDF 2013-04-22 15:50:26 +02:00
fhenry
e6f9c567d9 Fix odt as PDF generation 2013-04-22 12:08:35 +02:00
fhenry
ffb97010c9 Better file name management 2013-04-20 11:03:23 +02:00
fhenry
96126d9c99 Save PDF file 2013-04-20 10:54:11 +02:00
fhenry
413ee7ec78 Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF (only if
libreoffice/jodconverter/exec shell right)
2013-04-20 10:44:01 +02:00
Laurent Destailleur
37e54b3d80 Qual: Update copyright files.
Qual: Removed not used library.
Look: Uniformize css.
2013-04-15 18:00:20 +02:00
fhenry
629ef78dc8 Add subtitution inside header and fotter document 2013-04-11 18:38:50 +02:00
fhenry
af40d27eb5 Remove require_once from odf.php because it cause regression. 2013-04-11 17:26:49 +02:00
Stephen L
6e1e41e8b5 update: Sync odtphp lib (fix a lot of bugs and add a few functionalities)
Ref: b4e02a1306

Signed-off-by: Stephen L. <lrq3000@gmail.com>
2013-04-07 17:27:35 +02:00
Regis Houssin
86b521287c Fix: upgrade all files 2013-03-24 22:05:46 +01:00
Regis Houssin
eaf914cada Fix: upgrade jQuery datatables with 1.9.4 for avoid problems 2013-03-24 21:33:35 +01:00
Laurent Destailleur
5cc6bd1343 Qual: removed not used library 2013-03-15 18:29:44 +01:00
frederic34
717ba46a5f Print IPP lib 2013-03-08 11:17:46 +01:00
Raphaël Doursenaud
a6407a3642 Removed UTF-8 BOM from included libraries 2013-03-01 14:17:36 +01:00
Laurent Destailleur
7238c5156e New: Update jquery mobile lib 2013-02-24 19:33:06 +01:00
Laurent Destailleur
2852aded3a New: Add button collapse/expand for menu, category and user views. 2013-02-20 21:16:31 +01:00
Laurent Destailleur
6db881c09d New: Add link collapse all - expand all.
Fix: Add missing images.
2013-02-20 18:34:54 +01:00
Laurent Destailleur
9ddd6215f8 Qual: Replace native code with jquery plugin treeview. 2013-02-19 20:15:30 +01:00
Laurent Destailleur
a268592b61 Qual: Clean not used library. 2013-01-28 18:01:50 +01:00
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
Laurent Destailleur
6ff9444903 Fix: temporary folder when creating ODT segments on Windows or system… 2012-12-29 01:25:56 +01:00
Laurent Destailleur
8e764e88e6 Update TCPF
Added japanese font files.
2012-12-10 01:47:39 +01:00
Laurent Destailleur
3fa7afae10 Fix: jquery upgrade has broken background compatibility with plugins.
Upgrade jquery core only if required.
2012-11-18 11:52:04 +01:00
Laurent Destailleur
8c27a3202b Qual: Removed useless files. Speed gain was not significant, has problem
with https and need a lot of work to maintain each time we update an
external lib.
2012-11-17 11:56:30 +01:00
Regis Houssin
d0dc336a85 New: jQuery and jQuery UI upgrade
New: jQuery Timepicker addon for Datepicker
2012-11-03 19:15:45 +01:00