Commit Graph

3850 Commits

Author SHA1 Message Date
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
Regis Houssin
616ee24683 Fix: try to use another popup jquery plugin gpl compatible 2012-09-03 11:45:01 +02:00
Regis Houssin
d6918d7a87 Fix: upgrade ckeditor 2012-08-29 16:31:48 +02:00
Regis Houssin
5f32617843 Fix: restore dolibarr parameters 2012-08-29 10:14:40 +02:00
Regis Houssin
54860ef304 Fix: upgrade tcpdf and fpdi 2012-08-29 09:55:32 +02:00
Stephen L
087cf0bb91 Add conditional substitution IF/ELSEIF/ENDIF for ODT
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2012-08-16 17:30:32 +02:00
Laurent Destailleur
0176674c9f Add info for chinese 2012-08-10 04:16:31 +02:00
Laurent Destailleur
0d346ac1c1 New: A module can add several css and several js.
New: Removed lightbox as it is not compatible with GPL.
2012-08-08 20:43:23 +02:00
Regis Houssin
f6a4277525 Fix: remove unused file and missing print 2012-08-06 20:38:03 +02:00
Regis Houssin
58878cdb6f Fix: update jquery fileupload 2012-08-06 18:43:34 +02:00
Laurent Destailleur
190f005b68 New: ECM module is full Ajax 2012-07-30 21:44:00 +02:00
Regis Houssin
9a80f0351d New: add phpmailer class 2012-07-28 19:11:05 +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
e0109c019d Fix: update jquery-cookie plugin 2012-06-11 17:26:48 +02:00
Regis Houssin
92b02a0084 Fix: add iframe transport for compatibility with all browser 2012-06-08 11:35:32 +02:00
Regis Houssin
2ad1cf0665 Fix: more clean code for new version of jQuery fileupload 2012-05-31 21:11:36 +02:00
Regis Houssin
1e77ff069a Fix: replace Bootstrap version by jQueryUI version 2012-05-30 22:13:23 +02:00
Regis Houssin
1ea7e53273 Works on jQuery fileupload upgrade (Todo: css problem) 2012-05-30 11:57:00 +02:00
Regis Houssin
ef111dda47 New: update jQuery and jQuery UI 2012-05-29 22:57:12 +02:00
Regis Houssin
e543bc1ac4 New: add Savant pure php template engine 2012-04-27 15:18:32 +02:00