Commit Graph

636 Commits

Author SHA1 Message Date
Braito
ab53b28c1b Simplify lines substitution logic
Removed unnecessary check for structured HTML in default lines.
2025-12-15 16:30:16 +01:00
Braito
cf0642e53c Remove unused variable 'linesisstructuredhtml' 2025-12-15 16:28:51 +01:00
Braito
97043d0ce0 Fix HTML check for __LINES__ substitution 2025-12-13 12:34:09 +01:00
Braito
88760d71c3 Fix line formatting for HTML content handling 2025-12-13 12:29:16 +01:00
Braito
48bebca965 Check if lines are structured HTML before processing 2025-12-13 12:12:39 +01:00
Laurent Destailleur
b0d08278f0 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-10-02 15:53:12 +02:00
Laurent Destailleur
b2fce5052f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-10-02 15:52:05 +02:00
Regis Houssin
b1d57a6bd1 FIX sql syntax error (#35588) 2025-10-02 15:45:30 +02:00
ldestailleur
57930b3abd Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-10-01 19:51:29 +02:00
ldestailleur
1dd2cc36e4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-10-01 19:51:11 +02:00
Thomas C.
e1b919366e FIX : To have only the sender's entity when sending mail (#31053)
* fix

* Update html.formmail.class.php

* Update html.formmail.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: lvessiller-opendsi <lvessiller@open-dsi.fr>
2025-10-01 19:18:31 +02:00
Laurent Destailleur
e9e1175134 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-11-19 04:04:10 +01:00
Laurent Destailleur
93b11038d5 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-11-19 03:44:50 +01:00
Laurent Destailleur
99774022a5 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-11-19 03:36:44 +01:00
Laurent Destailleur
c5ebc9b7bd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-11-19 03:33:15 +01:00
Mathieu Moulin
348981a419 Fix show payment URL in massaction context when not one email per recipient (#31927) 2024-11-16 00:06:15 +01:00
Laurent Destailleur
4d23ea1229 Try to fix phan 2024-07-24 20:36:02 +02:00
Laurent Destailleur
db7dbfb9d3 Fix phan 2024-07-24 18:37:44 +02:00
Laurent Destailleur
deee0ab320 Fix bad param of constructor 2024-07-23 09:25:23 +02:00
Laurent Destailleur
12f85b7501 Fix missing param in constructor 2024-07-23 09:23:12 +02:00
Laurent Destailleur
8a257ac93f Fix permission to edit email template - Debug v20 2024-07-23 02:12:46 +02:00
Laurent Destailleur
403fcd234e Debug v20 2024-07-22 21:49:47 +02:00
Laurent Destailleur
896bfeb050 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-06-30 14:57:01 +02:00
Laurent Destailleur
bde5687890 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-06-30 11:59:25 +02:00
Laurent Destailleur
d7c2e78239 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/tpl/card_presend.tpl.php
2024-06-30 03:50:02 +02:00
Regis Houssin
fdf5fe0f26 FIX broken pdf preview when multicompany sharing (#30188)
* FIX broken pdf preview when multicompany sharing

* Update html.formmail.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-29 19:28:30 +02:00
Laurent Destailleur
a618bf2ae6 Debug v20 2024-06-18 09:54:11 +02:00
Laurent Destailleur
534606ed96 Prepare 20.0 2024-06-16 01:33:35 +02:00
Laurent Destailleur
78421f4607 Debug v20 2024-06-06 11:09:43 +02:00
Laurent Destailleur
18242bc0a0 Debug v20 2024-06-06 02:33:16 +02:00
Frédéric FRANCE
933e87ca81 Update codespell-dict.txt (#29644)
* Update codespell-dict.txt

* WYSIWYG

* phan
2024-05-10 12:34:08 +02:00
Laurent Destailleur
7a8afd0185 Debug v20 2024-04-24 14:05:25 +02:00
Laurent Destailleur
82fd5a8ac3 Debug v20 2024-04-24 13:07:47 +02:00
Laurent Destailleur
68c81e5311 Debug v20 2024-04-24 11:26:08 +02:00
MDW
8b960280d9 PHPdoc Allow empty array for + PHPdoc improvements 2024-03-24 14:09:32 +01:00
Laurent Destailleur
150845cd02 Debug v20 2024-03-24 05:23:06 +01:00
Laurent Destailleur
e3c76ca86a Clean translation files 2024-03-20 15:25:47 +01:00
MDW
0cd2b3f069 Fix PhanTypeSuspiciousStringExpression 2024-03-19 02:43:20 +01:00
Laurent Destailleur
87388d7dab Debug v20 2024-03-16 21:33:55 +01:00
Laurent Destailleur
d686ce02d9 Merge pull request #28884 from lamrani002/addDelay
NEW animation for display spinner when waiting response
2024-03-16 12:12:33 +01:00
Laurent Destailleur
e9c4be9856 Merge pull request #28883 from lamrani002/getMsgInEditor
FIX problem for display content in editor
2024-03-16 11:49:00 +01:00
Lamrani Abdel
5422cbdfc2 remove variables withaiprompt 2024-03-16 01:07:17 +01:00
Lamrani Abdel
28e10cb999 Change icon spinner 2024-03-16 01:02:32 +01:00
MDW
c9135d0c33 Fix: Main email configuration was not added to list 2024-03-16 00:00:19 +01:00
Lamrani Abdel
7d49d0e20b NEW annimation for display spinner when waiting response 2024-03-15 18:05:32 +01:00
Lamrani Abdel
13e1209c01 FIX problem for display content in editor 2024-03-15 17:15:24 +01:00
Laurent Destailleur
6d71b4f9c5 Update html.formmail.class.php 2024-03-15 00:08:42 +01:00
Lamrani Abdel
a504207ed1 New msg for prompt ai before display result 2024-03-14 01:28:30 +01:00
MDW
60359aa418 Fix PhanPluginRedundantAssignment 2024-03-13 00:40:49 +01:00
Laurent Destailleur
03798025b9 FIX #28787 2024-03-12 20:44:02 +01:00