Commit Graph

4446 Commits

Author SHA1 Message Date
atm-florian
df992477be Apply suggestion by @mdeweerd to ensure pre-commit will pass. 2025-01-14 14:34:09 +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
John BOTELLA
715ce8b745 Backport #23972 2024-03-18 15:22:00 +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
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
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
5a752493fb Revert "Fix tcpdi"
This reverts commit 7f866cb65f.
2023-07-03 15:40:48 +02:00
Laurent Destailleur
7f866cb65f Fix tcpdi 2023-07-03 15:37:24 +02:00
Laurent Destailleur
4e3cf0548f Fix phpunit 2023-06-22 21:25:00 +02:00
Laurent Destailleur
0bba7e2ed8 FIX OAUth2 module for Google with scopes for people and calendar 2023-06-16 15:00:28 +02:00
Laurent Destailleur
e411807331 FIX OAUth2 module for Google with scopes for people and calendar 2023-06-16 14:31:37 +02:00
Florian HENRY
27cc40fd07 fix: php warning on sabre lib with same as sabre 4.2.2 2023-05-26 10:27:58 +02:00
Florian HENRY
c66a8d6bc1 fix: php warning on sabre lib 2023-05-26 10:16:56 +02:00
Laurent Destailleur
66923ccf8c Code comment 2023-04-11 18:47:54 +02:00
Laurent Destailleur
a1e6fe7f50 Revert "Try fix MS OAuth2 Imap (from feedback at dolibarr.org/forum/t/emailcollectors-with-microsoft-365-oauth2)"
This reverts commit 976c2d76f2.
2023-04-11 10:34:03 +02:00
Laurent Destailleur
976c2d76f2 Try fix MS OAuth2 Imap (from feedback at
dolibarr.org/forum/t/emailcollectors-with-microsoft-365-oauth2)
2023-04-09 22:10:56 +02:00
Laurent Destailleur
b2722e79dc Doc 2023-03-29 14:27:28 +02:00
Laurent Destailleur
6992fec6c5 Fix php 7.0 compatibility 2023-03-03 16:38:34 +01:00
Laurent Destailleur
14a59483f5 Debug v17 2023-03-01 23:50:02 +01:00
Anthony Berton
076ffaa15b FIX - error datamatrix 2023-02-21 09:43:35 +01:00
Laurent Destailleur
04c0272d05 Doc 2023-02-09 15:58:28 +01:00
Laurent Destailleur
47128f2ccc Debug v17 2023-02-08 04:40:13 +01:00
Laurent Destailleur
310fd4e369 Debug IMAP-PHP for MS 2023-02-08 01:28:14 +01:00
Laurent Destailleur
411fbc1a04 FIX Bug in php-imap library. Fatal error if imap connet fails 2023-02-08 00:13:42 +01:00
Laurent Destailleur
e71ad2e23b Maxi debug of OAuth module 2023-02-07 20:12:53 +01:00
Philippe GRAND
6c61b80778 fix : Warning: Trying to access array offset on value of type bool in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/includes/tcpdi/tcpdi_parser.php on line 1376 2023-02-05 14:57:36 +01:00
Laurent Destailleur
89ce31b840 Debug IMAP with PHP_IMAP 2023-01-31 04:14:39 +01:00
Laurent Destailleur
685a7dbd59 Clean code. Add a phpunit test to avoid duplicate jquery. 2022-12-24 15:06:32 +01:00
Laurent Destailleur
f86939d332 Fix php warning 2022-12-17 12:55:05 +01:00
hystepik
9d566c41df Fix : api warning php 8.1 2022-11-24 22:52:05 +01:00
Laurent Destailleur
0117e65651 Clean no more used files 2022-11-19 10:26:56 +01:00
Laurent Destailleur
0a9381f2d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-11-16 20:35:29 +01:00
Laurent Destailleur
5b49021bb4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-16 20:20:34 +01:00
Laurent Destailleur
23feae3ee2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-16 20:07:51 +01:00
Laurent Destailleur
45e3f19bd7 Fix remove files not expected 2022-11-16 20:05:52 +01:00
Laurent Destailleur
f4dc43914d Remove php8.1 warnings 2022-10-10 14:46:29 +02:00
Laurent Destailleur
b6dbdd6757 Work on php 8.1 compatibility and adodb removal 2022-10-10 14:23:02 +02:00
Frédéric France
cf0213e3e1 update php-iban lib to v4.1.1 2022-09-17 09:11:09 +02:00
Faustin
2ebba79735 Aborting changes on autoload because the problem have already been solved 2022-08-24 15:30:50 +02:00
Faustin
3e8b37cf21 Merge branch 'imap-by-oauth2-attachments' into imap-by-oauth2-attachment 2022-08-24 15:22:39 +02:00
Faustin
24925d0a0c Attachments management and cleaning php-imap lib 2022-08-24 13:04:12 +02:00
Laurent Destailleur
03d086f741 NEW Encrypt all sensitive constants in llx_const 2022-08-24 12:22:11 +02:00
Laurent Destailleur
b15a4e504e Merge IMAP with phpimap 2022-08-23 22:34:24 +02:00