Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
132,560 Commits 36 Branches 189 Tags
4768243bf44cb15b322769712a55b8ea2b0977d0
Commit Graph

137 Commits

Author SHA1 Message Date
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
Laurent Destailleur
6d04bac740 phpcs 2022-01-26 13:50:49 +01:00
Laurent Destailleur
bd9d3bb4ab Clean code 2021-11-08 18:10:35 +01:00
Laurent Destailleur
6b1fc48bd0 Fix var not initialized 2021-08-08 18:22:09 +02:00
Laurent Destailleur
671baa261d Fix var not defined 2021-08-08 12:57:00 +02:00
Laurent Destailleur
0b7b9aae79 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 23:07:56 +02:00
Laurent Destailleur
2a5699a9a2 Merge 2021-07-05 23:07:40 +02:00
Laurent Destailleur
185ed5ceeb Code comment 2021-07-05 22:52:37 +02:00
Laurent Destailleur
ebc3210308 FIX #16343 2021-03-02 01:58:36 +01:00
Laurent Destailleur
52ee530e70 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 22:03:38 +01:00
Laurent Destailleur
3a9cf8eb7a FIX: ODT generation very slow 2021-02-09 22:02:48 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/list.php
 2021-01-27 21:09:01 +01:00
Laurent Destailleur
0de06b7ef4 Fix odttopdf generation 2021-01-26 16:49:54 +01:00
Laurent Destailleur
23c0a30263 Use a better temp directory 2021-01-26 16:40:57 +01:00
Laurent Destailleur
69344a7170 Fix create temp dir 2021-01-26 16:33:47 +01:00
Laurent Destailleur
8bc639fe02 Fix too many logs 2021-01-26 16:10:27 +01:00
Laurent Destailleur
c10072ccef Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 13:07:31 +01:00