Commit Graph

3333 Commits

Author SHA1 Message Date
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Laurent Destailleur
f3f3b952e9 Fix label 2022-09-19 18:57:39 +02:00
Laurent Destailleur
08aa34b8db Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-15 18:31:45 +02:00
Laurent Destailleur
e0e9701830 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-15 18:30:42 +02:00
Laurent Destailleur
4b2c4d2df3 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-15 18:13:27 +02:00
Laurent Destailleur
094c2c3027 Fix condition on a field 2022-09-15 01:02:49 +02:00
Atm-Gregr
7d4c7e0f6b stickler 2022-09-13 14:28:57 +02:00
Atm-Gregr
4f9c273c64 retours 2022-09-13 14:19:28 +02:00
Atm-Gregr
527cfadf0f nl2br like on the card 2022-09-12 16:31:00 +02:00
Atm-Gregr
3c5f3f7b85 fix 2022-09-12 16:28:06 +02:00
Laurent Destailleur
45c9e6064e FIX #yogosha12439 Remove define('NOCSRFCHECK', '1') 2022-09-12 12:47:00 +02:00
Laurent Destailleur
767897595b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-10 02:46:10 +02:00
Laurent Destailleur
860d0ebe08 FIX #22164 2022-09-10 01:16:56 +02:00
Laurent Destailleur
cf887dba16 Merge pull request #22075 from grandoc/new_branch_04_09_2022
update code
2022-09-09 18:03:43 +02:00
Laurent Destailleur
7a277d9560 Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
lmarcouiller
86d777009e fix : scrutinaizer report 2022-09-09 11:09:53 +02:00
Frédéric France
63195e0ca3 fix license 2022-09-07 20:21:01 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Philippe GRAND
94a646103d update code 2022-09-04 13:32:12 +02:00
Frédéric France
bb58f3a18f use isModEnabled 2022-08-31 22:38:53 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
lmarcouiller
db6d345e54 Fix #21810 : Broken statistics in project module 2022-08-31 15:31:00 +02:00
Laurent Destailleur
50d2f478fe Merge pull request #21985 from Hystepik/develop#6
Fix #21810 : Broken statistics in project module
2022-08-31 15:07:33 +02:00
Julien Nicolas
c666c2cb89 Bugfix project stats when user has no project
In case of no project assigned to user, stats were using all projects
2022-08-30 12:02:53 +02:00
lmarcouiller
6e31609b14 Fix #21810 : Broken statistics in project module 2022-08-30 11:31:20 +02:00
Philippe GRAND
0632855be6 update code 2022-08-29 09:29:11 +02:00
Philippe GRAND
445d160fda FIX php8 compatibility 2022-08-28 14:25:16 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
183b205c32 css 2022-08-15 09:10:42 +02:00
Laurent Destailleur
9c8319ae58 Merge pull request #21635 from atm-gauthier/NEW/conf_to_always_update_thm_of_task_time_line
NEW : conf TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check …
2022-08-14 15:57:18 +02:00
UT from dolibit
a8a107fb37 Update index.php
delete double entry:  $taskstatic = new Task($db);
2022-08-10 13:37:15 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
stickler-ci
e7242788b9 Fixing style errors. 2022-08-02 09:00:15 +00:00
Gauthier PC portable 024
da196b868c NEW : conf TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check current thm of user to update it in task time line 2022-08-02 10:49:34 +02:00
Laurent Destailleur
5d2d0384f8 Debug v16 2022-07-29 17:05:02 +02:00
Laurent Destailleur
b6a6dd91d8 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-07-28 18:52:44 +02:00
Laurent Destailleur
3da20beeb5 Fix warning 2022-07-28 18:06:37 +02:00
Laurent Destailleur
212a0f838a Merge pull request #21363 from Quatadah/dolicloud-qnasdami-dropdownmenu
adding dropdown menu in case of a lot of buttons in project
2022-07-27 10:15:39 +02:00
Laurent Destailleur
60dd3577ec Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-26 13:15:37 +02:00
Laurent Destailleur
da2641bcb2 Clean code 2022-07-26 12:54:19 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-07-26 12:24:24 +02:00
Laurent Destailleur
3eedf18344 Debug v16 2022-07-26 11:53:00 +02:00
Laurent Destailleur
d65ea8c333 Debug v16 2022-07-26 11:05:00 +02:00
Laurent Destailleur
d0e74fbbeb Sync transifex 2022-07-26 10:54:03 +02:00
Quatadah Nasdami
873745a178 I included the boolean in the $params and resolved the margin issue. 2022-07-25 20:13:54 +02:00
Laurent Destailleur
24f8e9c401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 18:09:38 +02:00
Laurent Destailleur
3761c920eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/modules/modPartnership.class.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
2022-07-22 17:43:35 +02:00