2
0
forked from Wavyzz/dolibarr
Commit Graph

12065 Commits

Author SHA1 Message Date
Laurent Destailleur (aka Eldy)
d33e2748f1 Debug v21 - Fix for pb with different encoding rules 2025-01-10 18:24:50 +01:00
atm-florian
762e4ec8d1 updated local pre-commit hook -> fix typo 2025-01-10 17:01:59 +01:00
atm-florian
77f982d1a8 FIX 17.0 - collisions in cache for dol_getIdFromCode 2025-01-10 16:25:27 +01:00
Laurent Destailleur (aka Eldy)
e37b6fac4d Fix pb in output of label of email 2025-01-09 20:26:22 +01:00
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)
802562a575 Fix regression after a fix 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
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
PsyCrow
b9b58072ca Merge branch '20.0' into 20.0 2025-01-08 16:22:02 -06: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
William Mead
f0c79bcb77 Merge branch 'develop' into NEW_taskClose 2025-01-08 15:04:25 +01:00
Laurent Destailleur
169b2ce4e8 Update functions.lib.php 2025-01-07 21:52:26 +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
Frédéric FRANCE
af9efd8608 Merge branch 'develop' into loan_schedule 2025-01-07 18:02:05 +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
Joachim Kueter
259088c280 Update functions.lib.php
fixed typo...
2025-01-07 09:35:37 +01:00
Joachim Kueter
7689e0b210 Update functions.lib.php
solve indentation
2025-01-07 09:28:17 +01:00
Joachim Kueter
dd41f3f47d Update functions.lib.php
trying to solve whitespace/indentation issues
2025-01-07 09:25:00 +01:00
Joachim Kueter
48a3393264 Update functions.lib.php
trying to solve indentation
2025-01-07 09:21:46 +01:00
Joachim Kueter
0158b2b832 Update functions.lib.php
trying to solve indentation issue
2025-01-07 09:17:00 +01:00
Joachim Kueter
21607b4f28 Update functions.lib.php 2025-01-07 09:11:01 +01:00
Joachim Kueter
886abc96d1 handle property for delivery date (named differently in different objects)) 2025-01-07 09:03:17 +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
fde52c9ae7 FIX #32113 2025-01-06 01:28:01 +01:00
Frédéric FRANCE
c0f4ad3729 Merge branch 'develop' into loan_schedule 2025-01-05 20:30:23 +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