Commit Graph

15 Commits

Author SHA1 Message Date
Frédéric FRANCE
24b073771e wip 2019-01-27 13:07:22 +01:00
Laurent Destailleur
3d3edb19d8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	htdocs/langs/en_US/commercial.lang
2018-09-02 15:48:26 +02:00
Laurent Destailleur
bd3647a9d7 Prepare phpunit 6.1 compatibility 2018-09-02 14:23:52 +02:00
Laurent Destailleur
02bedc49d3 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	test/phpunit/PricesTest.php
	test/phpunit/RestAPIUserTest.php
	test/phpunit/WebservicesInvoicesTest.php
2018-09-02 14:15:17 +02:00
Laurent Destailleur
a69c3caf2c Prepare compatibility with phpunit 6.1 2018-09-02 14:10:06 +02:00
Laurent Destailleur
5604f3b0c3 Merge pull request #9376 from frederic34/functionCommentMissing
function Comment Missing
2018-09-01 12:59:32 +02:00
Frédéric FRANCE
b513cf57d0 function Comment Missing 2018-08-31 21:44:54 +02:00
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
7bb781eea8 function declaration 2018-08-15 14:28:34 +02:00
Laurent Destailleur
8064659398 Fix phpunit 2017-06-19 20:49:57 +02:00
Laurent Destailleur
24cad7cfdf Fix return code REST similar for all api with POST 2016-12-23 14:57:00 +01:00
Laurent Destailleur
4ec7bcd23e Rename api class to solve conflict 2016-09-22 11:36:16 +02:00
Xebax
388839296e REST API: update the URLs in RestAPIUserTest.php. 2016-06-20 17:56:33 +02:00
Laurent Destailleur
236ecf01b6 Help debug travis 2016-05-18 10:57:03 +02:00
Laurent Destailleur
d1d1b824b4 Better coding of #5181. I removed need of external lib. 2016-05-13 20:20:48 +02:00