Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-16 14:31:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
126,677 Commits 36 Branches 190 Tags
fca403b49bbee1ac7af7f99d34706d44eb8d3afc
Commit Graph

33082 Commits

Author SHA1 Message Date
Laurent Destailleur
f9f3f1135d Fix warning 2023-09-10 16:50:52 +02:00
Laurent Destailleur
b2ae9ea888 Fix warnings 2023-09-10 15:23:32 +02:00
Laurent Destailleur
6f3310da75 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-09 21:43:10 +02:00
Laurent Destailleur
91c416b98b FIX #24908 #25824 2023-09-09 21:42:52 +02:00
Laurent Destailleur
97dde30c16 Fix warning 2023-09-09 15:52:52 +02:00
Frédéric France
13f16ad13f phpstan 2023-09-09 13:42:54 +02:00
Laurent Destailleur
2d61f37208 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2023-09-09 12:02:13 +02:00
Laurent Destailleur
c6dbb3d434 Merge branch 'develop' into dev_sign_soeciete_rib 2023-09-09 11:55:30 +02:00
Laurent Destailleur
ae077925f1 NEW Menu editor is reponsive 2023-09-09 11:52:14 +02:00
Laurent Destailleur
32f6008425 Code comment 2023-09-08 22:26:23 +02:00
Laurent Destailleur
60dfea8a6b Merge pull request #25846 from lamrani002/AddPageDict 
NEW functionnality by add page for create dictionary
 2023-09-08 21:31:00 +02:00
Laurent Destailleur
d7aa1455e6 Merge pull request #25848 from frederic34/patch-6 
clean code
 2023-09-08 19:14:04 +02:00
Laurent Destailleur
79ab8ce709 Merge branch 'develop' into AddPageDict 2023-09-08 19:13:19 +02:00
Laurent Destailleur
33288ee66a Try to fix phpunit on dol_eval 2023-09-08 19:10:44 +02:00
Frédéric FRANCE
266ea0a34d clean code 2023-09-08 16:06:36 +02:00
Laurent Destailleur
aab30d7638 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 15:33:04 +02:00
Laurent Destailleur
57b894eb43 Merge 2023-09-08 15:28:26 +02:00
Laurent Destailleur
99406caa3a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-08 15:26:21 +02:00
Laurent Destailleur
803aca262e Fix edit colors with html5 component 2023-09-08 15:25:50 +02:00
Laurent Destailleur
6dbd7e35f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 14:17:17 +02:00
Laurent Destailleur
c379420d86 Fix regression in dol_eval 2023-09-08 14:12:12 +02:00
Lamrani Abdel
5adf2ccf5b fix problem 2023-09-08 12:11:52 +02:00
Frédéric FRANCE
01232b721d do not trunc label but only use css overflowmax 2023-09-08 11:25:54 +02:00
Laurent Destailleur
6676494baf Merge pull request #25826 from yledoare/18.0 
Fix #25613
 2023-09-08 11:21:40 +02:00
Frédéric FRANCE
198e7bf795 Merge remote-tracking branch 'upstream/develop' into loadlangs 2023-09-08 09:28:48 +02:00
Laurent Destailleur
e9787451a8 Disallow more use of parenthesis into dol_eval 2023-09-08 05:51:06 +02:00
Laurent Destailleur
7819b9586d Exclude more exec functions 2023-09-08 04:28:09 +02:00
Laurent Destailleur
c2f8c4f47c Sec: param onlysimplestring is always 1 or 2 2023-09-08 02:29:20 +02:00
Laurent Destailleur
32837761b5 Sec: Increase list of not allowed function in dol_eval 2023-09-08 01:59:57 +02:00
Laurent Destailleur
0c588ccd60 Sec: Increase list of not allowed function in dol_eval 2023-09-08 01:59:09 +02:00
Laurent Destailleur
684c0b88b5 Sec: More robust call for dol_eval (with param '2') for computed fields 2023-09-08 01:57:47 +02:00
Laurent Destailleur
9ed7bb77cd Sec: Increase list of not allowed function in dol_eval 2023-09-08 01:36:26 +02:00
Laurent Destailleur
3073a98563 Fix creation of subdir for website 2023-09-08 01:28:11 +02:00
Yann Le Doaré
5b4eac734b Fix #25613 2023-09-07 09:28:20 +00:00
Laurent Destailleur
0a853fe794 Removed files links.lang 2023-09-07 03:30:41 +02:00
Laurent Destailleur
20162a6d11 Fix support of xlink:href links in website module. 2023-09-06 17:11:30 +02:00
Frédéric FRANCE
9f53892fbe fix loadlangs 2023-09-06 16:57:50 +02:00
Laurent Destailleur
f8e5bcdb62 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-06 15:12:21 +02:00
Laurent Destailleur
b65b8d7bcb FIX Navigation to/from a project from page of projects of a thirdparty 2023-09-06 15:08:54 +02:00
Florian HENRY
37b43f97ce fix getDol 2023-09-06 08:32:13 +02:00
Florian HENRY
16f00adb8c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_sign_soeciete_rib 2023-09-06 08:22:00 +02:00
Laurent Destailleur
94950bee7d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-06 01:42:48 +02:00
Laurent Destailleur
e2bf0315c3 Fix fatal error on mod_contrat_olive. Missing getExample() 2023-09-06 01:42:35 +02:00
Laurent Destailleur
c795d6df0b Merge pull request #25806 from frederic34/patch-6 
phpstan
 2023-09-05 23:40:16 +02:00
Laurent Destailleur
0e7703f0ce Merge pull request #25805 from lamrani002/checkBeforereWrite 
NEW functionality for Checkin comments begin and end before each actions
 2023-09-05 23:39:58 +02:00
Laurent Destailleur
e280bc0b11 Merge pull request #25804 from lamrani002/addBadgeInMB 
NEW functionnality for add badge for each tabs
 2023-09-05 23:37:58 +02:00
Laurent Destailleur
46919d1ac6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 21:39:15 +02:00
Laurent Destailleur
150de687bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 20:13:38 +02:00
Laurent Destailleur
0e11cd1ee3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-05 19:39:00 +02:00
Laurent Destailleur
f43ef55b26 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
	htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/modulebuilder/template/myobject_agenda.php
	htdocs/modulebuilder/template/myobject_list.php
 2023-09-05 19:38:45 +02:00