Commit Graph

9693 Commits

Author SHA1 Message Date
Laurent Destailleur
1e443e060c Debug v18 2023-07-22 16:17:06 +02:00
Laurent Destailleur
054cb4a6d1 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-21 14:44:22 +02:00
Laurent Destailleur
5e41023862 Debug v18 2023-07-19 22:58:11 +02:00
Laurent Destailleur
8f9ee9eb35 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/societe/class/societe.class.php
2023-07-19 02:03:34 +02:00
Laurent Destailleur
6d64026b93 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-19 01:52:19 +02:00
Laurent Destailleur
b55be51b4f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/lib/agenda.lib.php
2023-07-19 01:50:18 +02:00
atm-gauthier
88a8bcdb22 FIX : We should always be able to filter on action type no matter if we can't read actions of others (#24462) 2023-07-16 12:14:18 +02:00
atm-steve
b307ecea40 FIX display project tasks list columns (#24557)
* fix: display columns

* fix fix

* fix: IDE
2023-07-16 12:02:14 +02:00
Laurent Destailleur
c75761f780 FIX Add same security test whe nuploading files from API than from GUI 2023-07-12 22:56:27 +02:00
Laurent Destailleur
5e00137392 Doc 2023-07-12 22:34:50 +02:00
Laurent Destailleur
9b5264a4fd FIX CVE reported by BELABED Skander (Akerva) 2023-07-12 21:45:42 +02:00
Laurent Destailleur
b6d16d28d7 Debug v18 2023-07-12 17:03:15 +02:00
onhairech
e5e9f914e5 qodana fix 3 : missing returns (#25332)
* qodana fix 3 : missing returns

* removing a duplicated line
2023-07-12 16:32:50 +02:00
Laurent Destailleur
d4cda09794 Debug v18 2023-07-10 02:25:33 +02:00
Laurent Destailleur
723ec550a7 Merge pull request #25276 from BB2A-Anthony/FIX---No-spam-label-if-nbrec-is-empty
FIX - No spam label if nbrec is empty
2023-07-05 19:17:33 +02:00
Anthony Berton
7f1fad24c1 FIX - No spam label if nbrec is empty 2023-07-05 12:16:35 +02:00
Laurent Destailleur
31bd3d6045 Debug v18 2023-07-03 20:00:55 +02:00
Laurent Destailleur
af1b15eba5 Debug v18 2023-07-02 16:51:18 +02:00
Laurent Destailleur
763fcc4a67 Var not used 2023-06-30 11:07:13 +02:00
Laurent Destailleur
a3e4d8fe3a Debug v18 2023-06-29 16:30:34 +02:00
Laurent Destailleur
b4c448a420 Debug v18 2023-06-29 15:54:09 +02:00
Laurent Destailleur
b1e0b317c9 Debug v18 2023-06-29 13:16:44 +02:00
Laurent Destailleur
5fd7bcaae9 Debug v18 2023-06-29 12:10:31 +02:00
Laurent Destailleur
a09c37514b css 2023-06-29 11:27:26 +02:00
Laurent Destailleur
c2a5e834e1 Merge pull request #25216 from frederic34/20230627
use isModEnabled
2023-06-28 16:18:53 +02:00
Laurent Destailleur
b5cdb1b88c Debug v18 2023-06-28 15:15:37 +02:00
Frédéric France
81fbdacf8e use isModEnabled 2023-06-27 21:31:36 +02:00
Laurent Destailleur
a57c9d51ff Debug v18 2023-06-26 23:12:56 +02:00
Laurent Destailleur
b6a061f795 Debug v18 - warnings and pgsql migration 2023-06-26 23:02:17 +02:00
Laurent Destailleur
9329f6d369 Test CI 2023-06-26 22:16:19 +02:00
Laurent Destailleur
ec76f62548 Fix drag and drop does not show dragable zone if not a file 2023-06-26 15:27:16 +02:00
Laurent Destailleur
aec592c00e Debug v18 2023-06-24 04:04:02 +02:00
Laurent Destailleur
b5529525e3 Debug v18 2023-06-24 03:22:22 +02:00
Laurent Destailleur
e19e65c232 Merge pull request #25174 from AmazingBeu/develop
[Agenda] change date time zone for full day event
2023-06-24 02:52:59 +02:00
Laurent Destailleur
d194ba099e Doc 2023-06-23 10:37:27 +02:00
Laurent Destailleur
1eeb4a75c6 Doc 2023-06-23 02:29:14 +02:00
Laurent Destailleur
8be328cc16 Debug v18 2023-06-23 01:20:46 +02:00
Beu
3e2861695d change date time zone for full day event 2023-06-22 14:40:55 +02:00
Frédéric France
ebf83fdab6 use user hasRight 2023-06-19 23:18:13 +02:00
Frédéric France
5b3313220f use user hasRight 2023-06-19 20:54:08 +02:00
Frédéric France
6f71c5727b use user hasRight 2023-06-19 20:18:59 +02:00
Frédéric France
68855ce672 use user hasRight 2023-06-19 20:08:27 +02:00
Laurent Destailleur
41202adca8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-19 19:25:08 +02:00
Laurent Destailleur
db379ee40d Test CI 2023-06-19 15:00:15 +02:00
Laurent Destailleur
1ccd0e2e30 Test CI 2023-06-19 14:55:27 +02:00
ATM-NicolasV
552da3b0cb Merge branch '17.0' into fix_expedition 2023-06-19 14:12:30 +02:00
ATM-NicolasV
8f0e6ac3f6 Change strpos for expedition and receipt in files.lib and inversion 2023-06-19 14:10:45 +02:00
Laurent Destailleur
1c582aeb5f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-19 03:22:40 +02:00
Laurent Destailleur
bbc66299ba FIX Delete of bank of a thirdparty must need the edit thirdparty perm 2023-06-17 01:04:15 +02:00
Laurent Destailleur
0bba7e2ed8 FIX OAUth2 module for Google with scopes for people and calendar 2023-06-16 15:00:28 +02:00