lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77,493 Commits 43 Branches 150 Tags 886 MiB
9bf387d43c
Commit Graph

77493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
9bf387d43c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/main.inc.php
	htdocs/user/card.php
 2019-09-18 15:12:38 +02:00
Laurent Destailleur
00d5cff00d Fix XSS injection into textarea 2019-09-18 14:44:31 +02:00
Laurent Destailleur
e52788eb75 Fix xss 2019-09-18 14:31:03 +02:00
Laurent Destailleur
771104bc68 Fix XSS 2019-09-18 14:25:53 +02:00
Laurent Destailleur
345ac28c89 Fix js injection 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/user/group/card.php
 2019-09-18 14:21:02 +02:00
Laurent Destailleur
7b512587aa FIX XSS 2019-09-18 14:15:20 +02:00
Laurent Destailleur
ad3d21578c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-18 13:13:02 +02:00
Laurent Destailleur
2da5071642 Fix VAT in New caledonia is now called TGC 2019-09-18 13:12:22 +02:00
Laurent Destailleur
214bf4375e Fix missing include 2019-09-17 13:28:36 +02:00
Laurent Destailleur
24cb1390e4 FIX Update of leave request when CSRF with token is on 
FIX Export of leave request show the number of open days
 2019-09-17 13:17:25 +02:00
Laurent Destailleur
90850c4d31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-17 12:20:23 +02:00
Laurent Destailleur
ab9dee631b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-17 12:20:05 +02:00
Laurent Destailleur
64c53e2e85 Fix "project i am contact for" filter 2019-09-17 12:19:33 +02:00
Laurent Destailleur
b53293d84d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-17 12:18:38 +02:00
Laurent Destailleur
a91f39ea3e FIX selection of project i am contact of. 2019-09-17 12:18:29 +02:00
Laurent Destailleur
d3b17f4f2d FIX form not closed. 2019-09-17 12:08:33 +02:00
Laurent Destailleur
8d79404914 Fix css for responsive 2019-09-16 18:40:58 +02:00
Laurent Destailleur
e3480780cf Fix label on "Connect" button on Simple POS module 2019-09-16 18:31:40 +02:00
Laurent Destailleur
5233e7d8ad FIX do not output return code on screen after a select of bank account 2019-09-16 18:29:04 +02:00
Laurent Destailleur
23777fd5ff Fix css 2019-09-16 11:19:02 +02:00
Laurent Destailleur
abee6dceaa Fix css demo 2019-09-16 11:16:58 +02:00
Laurent Destailleur
f5dd4f4f9e css 2019-09-16 11:08:34 +02:00
Laurent Destailleur
edbf8f0186 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-16 11:01:21 +02:00
Laurent Destailleur
eb70411ae0 Css demo 2019-09-16 11:01:09 +02:00
Laurent Destailleur
a085b79993
Merge pull request #11898 from atm-maxime/patch-1 
Remove bad copy / paste
 2019-09-15 19:58:28 +02:00
Maxime Kohlhaas
5d4f702920
Remove bas copy / paste 2019-09-15 16:38:03 +02:00
Laurent Destailleur
bb6853a635 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-15 15:53:15 +02:00
Laurent Destailleur
ab07da02c4 Fix scrutinizer 2019-09-15 15:53:04 +02:00
Laurent Destailleur
cec5666257
Merge pull request #11872 from hregis/10.0_ldap 
FIX an admin can not access his own permissions after enabling advanced permissions
 2019-09-15 15:32:50 +02:00
Laurent Destailleur
27e3a2cb1d
Update perms.php 2019-09-15 15:32:43 +02:00
Laurent Destailleur
76b3668368 FIX regression with option to hide picto on top menu 2019-09-15 15:15:59 +02:00
Laurent Destailleur
544a1237bc FIX regression with option to hide picto on top menu 2019-09-15 15:11:13 +02:00
Laurent Destailleur
f946ec0563
Merge pull request #11896 from tuxgasy/10.0_childtablesoncascade_isempty 
Check if childtablesoncascade is not empty
 2019-09-15 10:16:07 +02:00
Laurent Destailleur
7b56cbc334
Merge pull request #11892 from aspangaro/10.0_nowrap 
Fix Bank entries - nowrap on amount
 2019-09-15 10:01:06 +02:00
Laurent Destailleur
bbb62f27c7 Update doc 2019-09-14 19:25:09 +02:00
TuxGasy
e0238705cc Check if childtablesoncascade is not empty 2019-09-14 19:04:43 +02:00
Laurent Destailleur
f45abc1b2a Removed useless header 2019-09-14 18:26:38 +02:00
Laurent Destailleur
584549df11 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:25:31 +02:00
Laurent Destailleur
697b25aa82 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-14 18:24:00 +02:00
Laurent Destailleur
56e070cd7f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:23:20 +02:00
Laurent Destailleur
3caa1bd43c FIX Debug feature orderstoinvoice for suppliers 2019-09-14 18:21:37 +02:00
Laurent Destailleur
bac1e7133a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-14 17:35:19 +02:00
Laurent Destailleur
844f0903da Fix missing fields 2019-09-14 17:34:57 +02:00
Laurent Destailleur
92c6168247
Merge pull request #11858 from ptibogxiv/patch-260 
FIX new invoice with generic thirdparty in takepos
 2019-09-14 17:10:32 +02:00
Laurent Destailleur
ace9eb9b3e
Merge pull request #11870 from hregis/10.0_mc 
FIX avoid non numeric warning
 2019-09-14 16:39:40 +02:00
Laurent Destailleur
e7d01f98cf
Merge pull request #11890 from atm-florian/10.0 
fix: fill id for links (document tab)
 2019-09-14 16:33:20 +02:00
Laurent Destailleur
7aac67f79c
Merge pull request #11884 from frederic34/patch-10 
fix colspan in show_project
 2019-09-14 16:33:02 +02:00
Laurent Destailleur
935e84d985
Merge pull request #11885 from frederic34/patch-12 
Create .stickler.yml
 2019-09-14 16:32:25 +02:00
Laurent Destailleur
fbb8808f29
Merge pull request #11887 from frederic34/patch-14 
Update index.php
 2019-09-14 16:32:11 +02:00
Alexandre SPANGARO
4420af683d Fix Bank entries - nowrap on amount 2019-09-14 05:44:28 +02:00