Commit Graph

153 Commits

Author SHA1 Message Date
Frédéric FRANCE
23e14b7779 fix phpstan 2024-12-16 11:12:42 +01:00
Frédéric FRANCE
ae69785f4f fix phpstan 2024-12-16 10:50:04 +01:00
Laurent Destailleur (aka Eldy)
c8a7c09033 Fix logs and protection for infinit loop 2024-12-14 18:38:48 +01:00
Laurent Destailleur
427e1ec26d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-11-13 22:28:45 +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
a64f4327c7 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-11-13 16:40:21 +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
Laurent Destailleur
ce7a364d2f Add option to test fix of #31696 2024-11-06 17:16:36 +01:00
Laurent Destailleur
7166d2570b Fix Zip generation of ODT with PHPZip 2024-10-17 00:32:14 +02:00
Laurent Destailleur
0163cc6278 Debug export website 2024-05-12 20:27:03 +02:00
kkhelifa-opendsi
569e8a8577 NEW: Add support of [IF] tag other than in the core content (ex: headers who is in stylesXml) (#29357) 2024-04-18 14:56:17 +01:00
Laurent Destailleur
2c52622348 Merge pull request #27248 from a-schild/25828-odt-fix-wrong-styles
25828 odt fix wrong styles
2024-01-05 20:11:45 +01:00
Laurent Destailleur
3fe97af1ad Update odf.php
No need of a very high entropy as we already have the microsecond in string.
2024-01-05 20:11:07 +01:00
Laurent Destailleur
4ad69cb635 Update odf.php 2024-01-05 20:08:41 +01:00
André Schild
37f4053c6f Use more secure way to generate unique id (thanks to laurent) 2024-01-04 15:04:47 +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
André Schild
ca10e82436 Fix for issue #25828 wrong style numbering 2023-12-29 10:47:45 +01:00
Frédéric FRANCE
00f5a7bc4c Update PclZipProxy.php 2023-12-22 15:22:40 +01:00
atm-adrien
2ad52d9fc9 FIX : Adding the $encode parrameter to recursive _replaceHtmlWithOdtTag() utilisation 2023-12-20 14:22:37 +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
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
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
9fd651ee5c FIX warnings 2023-07-30 19:46:23 +02:00
Laurent Destailleur
7cbc8728a5 FIX warnings 2023-07-30 19:44:04 +02:00
Laurent Destailleur
46a8b5d9cb Update odf.php 2023-03-26 15:22:12 +02:00
tnegre
e1c56650eb ODF line generation : compat php < 7.4 2023-03-24 12:11:39 +01:00
tnegre
06c64eea98 Update copyright 2023-03-23 11:10:47 +01:00
tnegre
a50e74a86a Merge remote-tracking branch 'tnegre/14.0_fix_odt_generation' into develop_fix_odt_generation 2023-03-23 10:46:36 +01:00
Laurent Destailleur
0b4cacd291 Use dolChmod 2023-02-17 20:01:53 +01:00
Laurent Destailleur
04c0272d05 Doc 2023-02-09 15:58:28 +01:00
Laurent Destailleur
f86939d332 Fix php warning 2022-12-17 12:55:05 +01:00
Thomas Negre
95781e39c2 Fix HTML tags regex: headings such as <h3> are also HTML tags 2022-11-23 11:56:51 +01:00
Thomas Negre
df761ceef7 Use a constant for HTML tags regex 2022-11-23 11:56:01 +01:00
Thomas Negre
00c62bf150 Consistent management of carriage returns 2022-11-16 14:08:41 +01:00
Thomas Negre
a00331c478 Inline comment 2022-11-16 12:07:07 +01:00
Thomas Negre
b0548213b9 copyright and doc 2022-11-16 11:44:46 +01:00
Thomas Negre
a0ef602297 Fix ODT generation : htmlspecialchars() was run too many times on some strings. 2022-11-16 11:25:08 +01:00
Laurent Destailleur
9180e9a5c6 Clean code 2022-01-26 14:42:26 +01:00