Commit Graph

39551 Commits

Author SHA1 Message Date
Maxime Kohlhaas
1dc3a9796f Merge branch '20.0' of github.com:Dolibarr/dolibarr into 21.0 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
e75b72d467 Add OVER on list of reserved words 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
802562a575 Fix regression after a fix 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
b024b95948 Fix typo 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
1def03d66f Fix regression 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
1f884b84ce Debug v21 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
06914d9099 Debug v21 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
0ffd31c1a1 Restore lines commented for test 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
56710ce9b7 FIX CVE-2024-55227 and CVE-2024-55228 CSRF when
MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is
on (hidden option not on by default)
2025-01-09 19:35:01 +01:00
Maxime Kohlhaas
76c98a4666 Merge branch '21.0' of github.com:Dolibarr/dolibarr into develop 2025-01-09 18:24:41 +01:00
Maxime Kohlhaas
751e21be44 Merge branch '20.0' of github.com:Dolibarr/dolibarr into 21.0 2025-01-09 18:23:38 +01:00
Frédéric France
df23a371b7 fix phpstan 2025-01-09 18:22:53 +01:00
Maxime Kohlhaas
b754994543 Merge branch '19.0' of github.com:Dolibarr/dolibarr into 20.0 2025-01-09 18:18:36 +01:00
Frédéric France
cbefb5a2d8 fix phpstan 2025-01-09 18:18:23 +01:00
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)
8fc73e0417 Add OVER on list of reserved words 2025-01-09 13:58:06 +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
Lucas Marcouiller
1b8a9c2431 Merge branch 'develop' into New-status-for-webhook 2025-01-09 10:48:18 +01:00
Florian HENRY
0295699543 fix: avoid php8 warning/error on failed notification 2025-01-09 10:21:20 +01:00
Florian HENRY
f0449e349f fix: php warning 2025-01-09 09:59:23 +01:00
Lucas Marcouiller
b390ca52bd Merge branch '20.0' into Fix-fatal-error-no-bad-format-with-sprintf 2025-01-09 09:22:34 +01:00
Hystepik
3fcdba2bc3 better fix for performance 2025-01-09 09:21:45 +01:00
Laurent Destailleur (aka Eldy)
a7a50b39a9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-09 02:02:09 +01:00
Laurent Destailleur (aka Eldy)
de321e8f01 Fix typo 2025-01-09 02:01:49 +01:00
Laurent Destailleur
bd08efc497 Merge pull request #32575 from altairisfr/reception_picto
FIX: reception picto alignement in product menu
2025-01-09 01:48:42 +01:00
Laurent Destailleur
b9d35ff580 Merge pull request #32584 from hregis/fix_dev_avoid_warnings
FIX avoid warnings + debug
2025-01-09 01:44:28 +01:00
Laurent Destailleur (aka Eldy)
8e551100a1 Fix typo 2025-01-09 01:41:24 +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
PsyCrow
b9b58072ca Merge branch '20.0' into 20.0 2025-01-08 16:22:02 -06:00
Regis Houssin
929aa8ee91 FIX avoid warnings + debug 2025-01-08 20:32:19 +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
Amael-PE
21e997acd7 FIX Continue for eagle_proforma 2025-01-08 17:06:19 +01:00
Amael-PE
ea94370486 FIX Complete wath was started in #17243 for pdf_cannelle 2025-01-08 17:03:15 +01:00
Hystepik
0c05b8110f Fix fatal error on sprintf with translate 2025-01-08 16:19:06 +01:00
William Mead
f0c79bcb77 Merge branch 'develop' into NEW_taskClose 2025-01-08 15:04:25 +01:00
Noé Cendrier
fee2005faa FIX: reception picto alignement in product menu 2025-01-08 14:41:45 +01:00
GregM
3737f3c0cd FIX select 2 no record found 2025-01-08 12:30:46 +01:00
Laurent Destailleur
169b2ce4e8 Update functions.lib.php 2025-01-07 21:52:26 +01:00
Laurent Destailleur (aka Eldy)
8febf249ce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 21:47:22 +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
de208ace1d Merge pull request #32567 from frederic34/mod_member
fix phpstan
2025-01-07 21:28:26 +01:00
Laurent Destailleur (aka Eldy)
badb23635b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-07 21:03:59 +01:00
Laurent Destailleur (aka Eldy)
43e054d5e8 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-07 21:00:54 +01:00