Commit Graph

11708 Commits

Author SHA1 Message Date
Laurent Destailleur (aka Eldy)
429f5db55a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-09 14:09:33 +01:00
Laurent Destailleur (aka Eldy)
58e42656c0 Fix regression after a fix 2025-01-09 13:54:25 +01:00
Laurent Destailleur (aka Eldy)
7b4946b146 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-09 13:03:44 +01:00
Laurent Destailleur (aka Eldy)
3b45a24c07 Fix regression 2025-01-09 01:30:13 +01:00
Laurent Destailleur (aka Eldy)
d75e02fd43 Debug v21 2025-01-08 23:52:35 +01:00
Laurent Destailleur (aka Eldy)
08b77d174d Debug v21 2025-01-08 23:29:32 +01:00
Laurent Destailleur (aka Eldy)
0c58529d2d Debug v21 2025-01-08 23:29:04 +01:00
Laurent Destailleur (aka Eldy)
599d891284 Restore lines commented for test 2025-01-08 18:24:46 +01:00
Laurent Destailleur (aka Eldy)
79ae59ee2a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-08 17:54:13 +01:00
Laurent Destailleur (aka Eldy)
c0250e4c91 FIX CVE-2024-55227 CSRF when MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is
on (hidden option not on by default)
2025-01-08 17:41:45 +01:00
Laurent Destailleur (aka Eldy)
710ed35a22 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 21:47:12 +01:00
Laurent Destailleur (aka Eldy)
a1003a1a90 Fix regression 2025-01-07 21:46:32 +01:00
Laurent Destailleur (aka Eldy)
c3f06059cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 19:12:54 +01:00
Laurent Destailleur (aka Eldy)
e5bb7e48db Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 17:20:06 +01:00
Laurent Destailleur (aka Eldy)
6b94a458c0 Fix warning 2025-01-07 13:34:33 +01:00
Frédéric France
86e1625793 fix phpstan 2025-01-06 18:27:30 +01:00
Frédéric France
62a230b047 Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05_01 2025-01-06 18:09:12 +01:00
Laurent Destailleur
1cba827ceb Merge pull request #32290 from Hystepik/new-regroup-2-tabs-bank
New regroup report bank tabs
2025-01-05 19:17:13 +01:00
Frédéric France
57b440677a Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05_01 2025-01-05 19:02:46 +01:00
Laurent Destailleur
5ae9d1bd13 Merge pull request #32335 from Hystepik/New-add-replace-for-memcached-module
NEW add replace for memecached and filecache
2025-01-05 18:58:59 +01:00
Laurent Destailleur
6312b646b5 Merge pull request #32337 from Hystepik/Fix-#32193
Fix #32193 Add verification on extension file for upload
2025-01-05 18:52:16 +01:00
Frédéric France
4187e87dc4 fix phpstan 2025-01-05 18:44:12 +01:00
Laurent Destailleur (aka Eldy)
2c2ac2a48f Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-05 18:38:48 +01:00
Laurent Destailleur (aka Eldy)
1cfa3b5803 Fix warning 2025-01-05 18:34:01 +01:00
Laurent Destailleur
88f75f9c76 Merge pull request #32420 from aspangaro/22tabthirdacc
NEW Accountancy - Show subsidiary ledger in thirdparty card
2025-01-05 18:06:23 +01:00
Laurent Destailleur (aka Eldy)
862ddc45bc Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-03 16:43:31 +01:00
Laurent Destailleur (aka Eldy)
0f198186e7 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-03 16:38:50 +01:00
Laurent Destailleur (aka Eldy)
86a6322287 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-01-03 16:34:36 +01:00
Laurent Destailleur (aka Eldy)
4267f5f010 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-12-31 17:18:15 +01:00
Laurent Destailleur (aka Eldy)
4d02eca12a Debug v21 2024-12-31 16:56:59 +01:00
Laurent Destailleur (aka Eldy)
3cad54e4d1 Add option to restore backward compatibility 2024-12-31 16:14:51 +01:00
Laurent Destailleur (aka Eldy)
f67fad1105 Debug v21 2024-12-31 14:04:14 +01:00
Laurent Destailleur
e65ee097a5 Merge pull request #30915 from MaximilienR-easya/18.0_Backport_yogosha
Backport #yogosha18281
2024-12-30 04:58:37 +01:00
Laurent Destailleur (aka Eldy)
4954e84d56 Debug v21 2024-12-30 04:53:07 +01:00
Laurent Destailleur (aka Eldy)
152050d1a8 Debug v21 2024-12-30 03:14:20 +01:00
Laurent Destailleur (aka Eldy)
938e0380f4 Doc 2024-12-30 01:26:53 +01:00
Laurent Destailleur (aka Eldy)
90c2c18ce0 Debug v21 2024-12-29 20:14:21 +01:00
Laurent Destailleur (aka Eldy)
86d41a8a23 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-12-28 18:07:00 +01:00
Laurent Destailleur (aka Eldy)
754ffee0e9 Better fix for quote injection into URL or js popup title. To report
into PR #30915 too.
2024-12-28 17:43:41 +01:00
Laurent Destailleur (aka Eldy)
f8ed88213c fix warning 2024-12-26 15:43:29 +01:00
Laurent Destailleur (aka Eldy)
af6fc96d77 Copy code manually code to close #32423 without the syntax error. 2024-12-26 15:43:29 +01:00
Laurent Destailleur (aka Eldy)
124af5bd93 Fix warning 2024-12-26 15:43:29 +01:00
Laurent Destailleur (aka Eldy)
8733e9d57e Fix security test blocking $_SESSION... 2024-12-26 15:43:29 +01:00
Laurent Destailleur (aka Eldy)
fcc344f9da Security - More robust dol_eval function after vulnerability report by
Muhammad Zeeshan (Xib3rR4dAr)
2024-12-26 15:43:29 +01:00
Laurent Destailleur (aka Eldy)
3cefab32d5 Debug for shipment 2024-12-20 15:57:51 +01:00
Laurent Destailleur (aka Eldy)
f81cdfbcf0 debug rebuild_merge_pdf 2024-12-20 15:38:59 +01:00
Laurent Destailleur (aka Eldy)
35e935f4be debug rebuild_merge_pdf 2024-12-20 15:21:38 +01:00
Laurent Destailleur (aka Eldy)
3fc800b1b2 Fix nomerge mode 2024-12-20 15:01:55 +01:00
Laurent Destailleur (aka Eldy)
07a2c1ff0a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-12-20 14:17:15 +01:00
Laurent Destailleur (aka Eldy)
895c16090b Disable the mege when not required 2024-12-20 13:54:59 +01:00