Laurent Destailleur 9d10eb57f2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	dev/dolibarr_changes.txt
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/main.inc.php

2017-12-20 13:28:41 +01:00

..

blockUI

…

colorpicker

…

flot

…

jcrop

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-12-13 16:09:09 +01:00

jeditable

Fix option MAIN_USE_JQUERY_JEDITABLE

2017-12-20 13:17:21 +01:00

jnotify

…

jpicker

…

jqueryFileTree

Fix use command standard @... to mark a change in official code

2017-07-17 20:20:38 +02:00

jquerytreeview

…

jSignature

Try jSignature

2017-03-03 15:26:51 +01:00

multiselect

Debug advanced selector

2016-05-06 00:02:22 +02:00

select2

Fix migration to select2 4.0.5

2017-10-26 14:06:23 +02:00

tablednd

Check hound barking

2017-11-20 14:56:12 +01:00

timepicker

…