Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
104,562 Commits 36 Branches 191 Tags
c5f3f428672bbf27ffb51a410b58c03b664fae14
Commit Graph

25892 Commits

Author SHA1 Message Date
Laurent Destailleur
3d33d3aa3a Fix warning 2020-12-13 14:36:00 +01:00
Laurent Destailleur
427fb16256 Fix warning 2020-12-13 13:29:47 +01:00
Laurent Destailleur
16ae3b83f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-13 13:02:59 +01:00
Laurent Destailleur
ac34fce015 Merge pull request #15696 from StephaneLesage/12importexporticonslabels 
Fix & sync import/export entity icons/labels translation
 2020-12-13 12:50:30 +01:00
Laurent Destailleur
8a0d3e3f6f Fix warning 2020-12-13 12:38:47 +01:00
Frédéric FRANCE
346fe8ae85 clean 2020-12-12 22:35:51 +01:00
Frédéric FRANCE
6c3a9cbc40 clean 2020-12-12 21:27:56 +01:00
Laurent Destailleur
3521a736fc Fix warnings 2020-12-12 19:49:13 +01:00
Laurent Destailleur
75570cc984 Merge pull request #15743 from frederic34/mycompanysocialnetworks 
Mycompany social networks separate tab
 2020-12-12 19:21:29 +01:00
Laurent Destailleur
d19cdae980 Merge pull request #15727 from frederic34/patch-8 
add option hide topmenu in Config/Display
 2020-12-12 18:48:11 +01:00
Laurent Destailleur
96c1429713 Merge pull request #15741 from frederic34/socialnetworkslink 
Socialnetworkslink
 2020-12-12 18:42:00 +01:00
Laurent Destailleur
fa05982a8b Fix CSS v13 2020-12-12 18:37:51 +01:00
Frédéric FRANCE
621f246d58 my company social networks in a separate tab 2020-12-12 18:26:54 +01:00
Frédéric FRANCE
643b507a96 ucfirst 2020-12-12 17:31:10 +01:00
Frédéric FRANCE
46bf871127 target 2020-12-12 17:23:42 +01:00
Frédéric FRANCE
d523ed9f85 socialnetworks links 2020-12-12 17:01:25 +01:00
Frédéric FRANCE
4664ac1a1c socialnetworks links 2020-12-12 17:00:23 +01:00
Laurent Destailleur
b452852b30 Fix phpcs 2020-12-12 16:35:30 +01:00
Laurent Destailleur
7fdae69546 Fix warning 2020-12-12 14:11:50 +01:00
Laurent Destailleur
a3d302d91c Debug v13 2020-12-12 13:58:21 +01:00
Laurent Destailleur
0968c68cf9 Enhance widget 2020-12-12 12:45:43 +01:00
Laurent Destailleur
33bb1919f0 Merge branch 'develop' into develop#3 2020-12-12 12:23:33 +01:00
Laurent Destailleur
11eb48b60a Merge pull request #15737 from frederic34/pdfBuildThirdpartyName 
thirdparty need to be object
 2020-12-12 12:16:31 +01:00
Laurent Destailleur
2046b3d042 Merge pull request #15740 from frederic34/pdfproforma 
fix warning
 2020-12-12 12:12:43 +01:00
Frédéric FRANCE
479d709a96 fix warning 2020-12-12 09:39:54 +01:00
stickler-ci
87038f953a Fixing style errors. 2020-12-11 19:58:05 +00:00
Frédéric FRANCE
9b2c989906 thirdparty need to be object 2020-12-11 20:57:02 +01:00
Frédéric FRANCE
0b3a5dc796 fix style 2020-12-11 18:09:37 +01:00
Laurent Destailleur
9100e1410e Fix translation, add comments and clean code, fix also a small 
regression on colors for graph with lines
 2020-12-11 17:59:18 +01:00
Frédéric FRANCE
8882759e7a hide topmenu option in config/display 2020-12-11 17:55:08 +01:00
stickler-ci
5d86a5bd2a Fixing style errors. 2020-12-11 16:44:38 +00:00
Florian HENRY
79b0f08a8d Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_task_add_contact 2020-12-11 17:38:59 +01:00
Florian HENRY
0ed084d585 NEW: When add contact/user to Project, ask to also affect on project task 2020-12-11 17:38:38 +01:00
Laurent Destailleur
18efbebd02 css 2020-12-11 17:11:50 +01:00
Laurent Destailleur
91ddcf6446 Merge pull request #15724 from Hystepik/develop#1 
Close #15383 : New format for funnel of prospection
 2020-12-11 16:31:46 +01:00
Laurent Destailleur
ab0b508984 Merge pull request #15720 from zuiko/patch-1 
V13 Update html.form.class.php to complete Fix #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently
 2020-12-11 16:31:19 +01:00
Laurent Destailleur
8a0c065163 Debug v13 2020-12-11 16:30:45 +01:00
Laurent Destailleur
1f6f434a9c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/export_files.php
	test/phpunit/SecurityTest.php
 2020-12-11 15:56:19 +01:00
lmarcouiller
dea75e6158 Close #15729 : fix error on box name and format 2020-12-11 15:55:17 +01:00
lmarcouiller
54228ad256 Close #15729 : fix bug with nb jobs 2020-12-11 15:49:47 +01:00
lmarcouiller
a5cf177025 Close #15729 : first push 2020-12-11 15:22:29 +01:00
Laurent Destailleur
4fcd3fe493 Fix disallow -- string into filename for security purpose. Vulnerability 
reported by Yılmaz Değirmenci
 2020-12-11 15:12:42 +01:00
Laurent Destailleur
2353ade957 Merge pull request #15732 from frederic34/patch-14 
fix phpcs
 2020-12-11 14:36:04 +01:00
Laurent Destailleur
2adbd29b49 Debug generation of doc from modulebuilder 2020-12-11 14:22:36 +01:00
Frédéric FRANCE
54d51ec557 Update html.form.class.php 2020-12-11 13:46:47 +01:00
Frédéric FRANCE
eb2d7fa657 fix phpcs 2020-12-11 13:43:03 +01:00
Laurent Destailleur
697ca3e4f5 Fix selection of duration type 2020-12-11 02:23:43 +01:00
Laurent Destailleur
4ec598d571 Debug v11 2020-12-11 02:12:39 +01:00
Laurent Destailleur
2f8ee92c51 Fix CSS 2020-12-11 02:02:41 +01:00
Laurent Destailleur
206caec290 Debug v13 2020-12-11 01:20:40 +01:00