Commit Graph

92703 Commits

Author SHA1 Message Date
Laurent Destailleur
736875c088 Remove useless file 2020-12-13 13:02:42 +01:00
Laurent Destailleur
4aabf0f505 We keep only english file 2020-12-13 12:44:51 +01:00
Laurent Destailleur
de2531929e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-13 12:39:16 +01:00
Laurent Destailleur
8a0d3e3f6f Fix warning 2020-12-13 12:38:47 +01:00
Laurent Destailleur
681dc88188
Merge pull request #15731 from hregis/fix_add_passwordforgotten_hook
NEW add doAction hook in passwordforgotten page
2020-12-12 19:51:38 +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
a5d2e04dea Debug v13 2020-12-12 19:09:07 +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
f56a38ab23
Merge pull request #15736 from frederic34/api_mos
Close #15683 fix mos api update
2020-12-12 18:43:07 +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
818af46b86
clean 2020-12-12 18:37:09 +01:00
Frédéric FRANCE
b8a01b4d2d
my company social networks in a separate tab 2020-12-12 18:31:26 +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
e5f213d32d
Merge remote-tracking branch 'upstream/develop' into socialnetworkslink 2020-12-12 17:27:27 +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
5f476e7e7e Compatibility of nusoap with PHP8 2020-12-12 15:37:15 +01:00
Laurent Destailleur
4013eaa239 Update security file 2020-12-12 15:28:52 +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
bfa8383bed Fix migration script 2020-12-12 12:30:13 +01:00
Laurent Destailleur
1c648947d1
Merge pull request #15734 from Hystepik/develop#3
Close #15729 : Widget scheduled jobs
2020-12-12 12:28:18 +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
Laurent Destailleur
e5dbf57f96
Merge pull request #15738 from frederic34/patch-14
fix warning
2020-12-12 12:12:20 +01:00
Frédéric FRANCE
479d709a96
fix warning 2020-12-12 09:39:54 +01:00
Frédéric FRANCE
870f2073ad
fix warning 2020-12-11 22:13:30 +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
5ac677e2ab
fix mos api update 2020-12-11 19:02:13 +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
e9288ce0da
fix translation 2020-12-11 17:58:43 +01:00
Frédéric FRANCE
8882759e7a
hide topmenu option in config/display 2020-12-11 17:55:08 +01:00
Laurent Destailleur
18efbebd02 css 2020-12-11 17:11:50 +01:00
Laurent Destailleur
4fa1248d15 Fix avoid duplicate rows after double migration 2020-12-11 16:53:03 +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
Laurent Destailleur
b3d49c4dce Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-11 15:54:31 +01:00
lmarcouiller
54228ad256 Close #15729 : fix bug with nb jobs 2020-12-11 15:49:47 +01:00