Laurent Destailleur (aka Eldy)
1f360ca498
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2025-01-20 12:28:49 +01:00
tnegre
7e82f70c77
add case when HTML tags contain attributes
2025-01-09 11:05:45 +01:00
tnegre
78bf506790
fix tests in error
2025-01-06 09:44:04 +01:00
tnegre
b31962f7e2
fix
2025-01-06 09:44:04 +01:00
Laurent Destailleur (aka Eldy)
757d1b2998
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2025-01-05 18:40:05 +01:00
Frédéric France
eb4e059683
fix
2025-01-05 17:29:46 +01:00
accellier-dev
c845cc337c
Fixed : #30976 ( #30979 )
...
* Fixed : #30976
* Update odf.php
---------
Co-authored-by: Pratush Raj <pratushraj0@gmail.com >
2024-11-13 22:27:31 +01:00
Laurent Destailleur
b9c628413e
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2024-11-13 16:37:31 +01:00
Laurent Destailleur
a039a00277
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-11-13 16:35:07 +01:00
Laurent Destailleur
d30a0ea066
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2024-11-13 16:32:54 +01:00
Laurent Destailleur
ab6c74ae88
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2024-11-13 16:29:18 +01:00
Laurent Destailleur
fbca98ec2a
Merge
2024-11-13 16:25:00 +01:00
thomas-Ngr
93f23fe452
ODF : fix : escape specials chars in IF ELSE ENDIF $key ( #31796 )
...
* ODF : fix : escape specials chars in IF ELSE ENDIF $key
* fix missing brackets
* add delimiter to preg_quote
---------
Co-authored-by: Brice Werry <bwerry@open-dsi.fr >
2024-11-13 16:18:08 +01:00
Florian Charlaix
4479b1e662
FIX Conflict with autoload ( #30399 )
...
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2024-07-17 19:43:18 +02:00
Laurent Destailleur
0dcc75318b
FIX Conflict with autoload
2024-04-23 17:12:50 +02:00
John BOTELLA
715ce8b745
Backport #23972
2024-03-18 15:22:00 +01:00
MDW
412f8406dd
Fix: Change TCPDF::_out to public because of pdf.lib.php ( #27333 )
...
# Fix: Change TCPDF::_out to public because of pdf.lib.php
TCPDF::_out is used 2 times as ->_out(...) in htdocs/core/lib/pdf.lib.php.
Changing php.lib.php requires more analysis. Making TCPDF::_out public is
the quick solution.
2024-01-10 22:10:13 +01:00
Laurent Destailleur
c13228efe8
Fix #yogosha19828
2024-01-09 20:50:30 +01:00
Laurent Destailleur
5a169c5932
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2024-01-02 14:55:14 +01:00
Laurent Destailleur
5f8651fe87
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-01-02 14:43:54 +01:00
Laurent Destailleur
f5a123212b
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2024-01-02 14:43:31 +01:00
Laurent Destailleur
29667900f6
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2024-01-02 14:40:58 +01:00
Laurent Destailleur
0329bbc0cb
Merge
2024-01-02 14:37:25 +01:00
Laurent Destailleur
086da9f73f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2024-01-02 14:34:34 +01:00
Laurent Destailleur
ef312e960c
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-12-29 16:53:09 +01:00
Laurent Destailleur
d2b3920684
Merge
2023-12-29 16:51:05 +01:00
Laurent Destailleur
f6acd6dfe1
Update tcpdf.php
2023-12-28 19:04:23 +01:00
iznomip
459f6eb529
fix(tcpdf): implicit conversion from float
2023-12-28 16:51:58 +01:00
Frédéric FRANCE
00f5a7bc4c
Update PclZipProxy.php
2023-12-22 15:22:40 +01:00
Laurent Destailleur
63c38da901
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-12-21 19:44:25 +01:00
Eric Seigne
40329db2b2
next fix for #17665 : autoloader collision
2023-12-21 18:20:05 +01:00
atm-adrien
2ad52d9fc9
FIX : Adding the $encode parrameter to recursive _replaceHtmlWithOdtTag() utilisation
2023-12-20 14:22:37 +01:00
Laurent Destailleur
d4f61dcf59
Fix nusoap bug
2023-12-17 13:23:06 +01:00
Laurent Destailleur
78d5e71a8f
FIX #yogosha19506
2023-12-16 19:24:41 +01:00
Laurent Destailleur
6201c15d91
Update odf.php
2023-12-11 14:25:20 +01:00
Charlène Benke
486bb3bc65
php V8 Warning
2023-12-11 12:36:54 +01:00
MDW
b0414dd078
Fix utf8_encoding/decoding (rather than creating new function replacements)
2023-12-07 03:37:05 +01:00
Laurent Destailleur
c920428d84
Fix bug in ckeditor when used in mode readonly
2023-11-14 01:48:44 +01:00
Laurent Destailleur
fb65ad919e
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-10-31 13:03:04 +01:00
Laurent Destailleur
70640428dd
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2023-10-31 13:02:23 +01:00
atm-adrien
eeca89c75b
FIX : HTML in ODT templates ( #26181 )
...
* FIX : HTML does not work on ODT template
* FIX : add replace
* FIX : Backport V18
* FIX : Modif regexp
* FIX : Add encode parameter
* FIX : PR returns
2023-10-31 12:20:43 +01:00
ATM-Nicolas
9ef5d4ae2c
NEW : Library including math and financial functions ( #25035 )
2023-10-12 18:01:16 +02:00
Laurent Destailleur
f1330e5998
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-10-12 15:01:26 +02:00
Laurent Destailleur
422be6a026
Code comment
2023-10-12 11:30:43 +02:00
Laurent Destailleur
2e431468a0
FIX #25996 FIX #25997
2023-10-01 17:24:25 +02:00
Laurent Destailleur
5ce6b1850f
Fix warning
2023-09-10 16:52:43 +02:00
Laurent Destailleur
23876058a1
Update doc for tcpdf patch to do
2023-09-10 14:49:39 +02:00
Laurent Destailleur
329473c3cb
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
2023-08-21 14:14:44 +02:00
Laurent Destailleur
126634229f
Fix debian package
2023-08-18 00:41:54 +02:00
Laurent Destailleur
21559be84d
Upgrade ckeditor 4.22.1
2023-07-31 15:36:55 +02:00
