Commit Graph

92733 Commits

Author SHA1 Message Date
Laurent Destailleur
cce0b2f31b Fix code 2020-12-14 10:44:51 +01:00
Laurent Destailleur
ae5da8d55c Fix label 2020-12-14 10:25:31 +01:00
Laurent Destailleur
eef218aa6b Fix message 2020-12-13 19:33:48 +01:00
Laurent Destailleur
d739fa1951 Fix log 2020-12-13 18:32:55 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
56c32e3c81 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-13 15:07:33 +01:00
Laurent Destailleur
4f79fdb4ab Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-13 15:07:25 +01:00
Laurent Destailleur
7886a6e838 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-13 15:06:54 +01:00
Laurent Destailleur
04c233c229
Merge pull request #15747 from aspangaro/10_p57
FIX: Export FEC - Force Carriage Return Line Feed
2020-12-13 15:06:19 +01:00
Laurent Destailleur
3d33d3aa3a Fix warning 2020-12-13 14:36:00 +01:00
Alexandre SPANGARO
35b3d4f40a FIX: Export FEC - Force Carriage Return Line Feed 2020-12-13 14:11:04 +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
736875c088 Remove useless file 2020-12-13 13:02:42 +01:00
Laurent Destailleur
5778b1f022
Merge pull request #15744 from frederic34/mycompanysocialnetworks
my company social networks
2020-12-13 12:54:22 +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
401dc5cfb3
Merge pull request #15745 from frederic34/intracomm
Intracomm
2020-12-13 12:46:18 +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
Frédéric FRANCE
2a9d38575d
add work 2020-12-13 10:51:12 +01:00
Frédéric FRANCE
203fc77e9f
clean 2020-12-13 10:33:59 +01:00
Frédéric FRANCE
4c09e14c49
fix sql error 2020-12-13 10:32:23 +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
Frédéric FRANCE
1b75ac9ffe
add github 2020-12-12 21:17:18 +01:00
Frédéric FRANCE
8aaa1905a0
create url from socialid 2020-12-12 21:03:27 +01:00
Frédéric FRANCE
cd87ee8f92
Merge remote-tracking branch 'upstream/develop' into mycompanysocialnetworks 2020-12-12 20:43:33 +01:00
Juanjo Menent
4fc57d096e Fix #15556 2020-12-12 20:37:00 +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
Frédéric FRANCE
758763f489
Merge remote-tracking branch 'upstream/develop' into mycompanysocialnetworks 2020-12-12 19:25:15 +01:00
Frédéric FRANCE
6a4990d5bd
clean 2020-12-12 19:21:40 +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
57b3b3db3a Prepare 12.0.4 2020-12-12 19:18:45 +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
Laurent Destailleur
2592344601 Fix missing price2num 2020-12-12 17:27:27 +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