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

Conflicts:
	htdocs/langs/en_US/errors.lang

2016-12-18 11:57:04 +01:00

..

ajaxdirpreview.php

Fix style fo ECM module

2016-12-13 01:19:33 +01:00

ajaxdirtree.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

bankconciliate.php

fix: uniformize

2016-12-10 12:06:18 +01:00

box.php

Fix: disable hook for avoid errors when object langs is disable

2015-08-22 09:24:46 +02:00

constantonoff.php

Fix: for avoid error with main context hooks, with $langs object for

2015-07-03 22:14:34 +02:00

contacts.php

FIX bad translation language loaded

2016-04-03 20:02:02 +02:00

extraparams.php

…

fileupload.php

…

index.html

…

loadinplace.php

…

objectonoff.php

Update objectonoff.php

2014-10-18 22:47:12 +02:00

price.php

…

row.php

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

2015-12-18 22:12:03 +01:00

saveinplace.php

Save the virtualhost so we can test without entering it each time.

2016-07-14 19:42:04 +02:00

security.php

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

2015-08-26 11:26:00 +02:00

selectsearchbox.php

FIX quick search boxes when nojs or when using smartphone

2016-09-03 12:56:49 +02:00

vatrates.php

…

ziptown.php

…