Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
84,048 Commits 36 Branches 189 Tags
50b5226d10547030c0a2cb151935251bb6ec6937
Commit Graph

922 Commits

Author SHA1 Message Date
Laurent Destailleur
529c2f4992 Fix phpcs 2019-08-27 17:54:51 +02:00
Laurent Destailleur
31e99414b5 Prepare for php 8 2019-08-27 12:34:46 +02:00
Laurent Destailleur
69688a22e0 Merge 2019-08-27 12:33:42 +02:00
Laurent Destailleur
36c936357c Add phpunit testDolStringIsGoodIso 2019-08-27 12:25:24 +02:00
Laurent Destailleur
48d6583f1d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 03:42:52 +02:00
Laurent Destailleur
505a06ca3e Fix phpunit 2019-08-27 03:42:34 +02:00
Laurent Destailleur
669301669d Add phpunit for FormTest 2019-08-26 22:48:45 +02:00
Laurent Destailleur
4b5d9e44b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-26 22:47:33 +02:00
Laurent Destailleur
45ff873064 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/html.form.class.php
 2019-08-26 22:44:49 +02:00
Laurent Destailleur
76bd9a09a6 FIX #11570 2019-08-26 22:34:41 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
Laurent Destailleur
5a719769bc Fix phpcs 2019-08-01 16:29:18 +02:00
Laurent Destailleur
a7390e7e47 Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop 
NEW Management of retained warranty on situation invoices
 2019-07-30 21:53:09 +02:00
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
Laurent Destailleur
0ab16b739a Add more log and phpunit 2019-07-30 20:37:07 +02:00
Laurent Destailleur
3af4ad7fc3 Compatibility with phpunit v6 2019-07-05 21:28:27 +02:00
Laurent Destailleur
ac9282667d Try new phpunit syntax 2019-07-05 21:09:21 +02:00
Laurent Destailleur
fb69f23bba Fix phpunit 2019-07-04 12:10:29 +02:00
Laurent Destailleur
b065cbc6f8 FIX #11446 2019-07-04 12:09:04 +02:00
John Botella
92f6cef00f Fix unit test 2019-07-02 12:07:22 +02:00
Laurent Destailleur
51a1550dbb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2019-06-25 23:14:49 +02:00
Laurent Destailleur
441b279fd8 Add log to help track travis error 2019-06-25 18:03:12 +02:00
Laurent Destailleur
b0c76f48e1 error management 2019-06-21 09:38:26 +02:00
Laurent Destailleur
495604fa83 Fix phpunit 2019-06-20 18:16:49 +02:00
Laurent Destailleur
4295d707d0 More complete test 2019-05-28 22:21:00 +02:00
Laurent Destailleur
454316a5fa Fix getDomainFromURL 2019-05-28 22:18:22 +02:00
Laurent Destailleur
e4f3f4b547 Fix test phpunit 2019-04-11 18:06:27 +02:00
Laurent Destailleur
6e161a96c7 Enhance phpunit 2019-04-01 18:16:50 +02:00
Laurent Destailleur
23252ed646 Add a test to avoid SQL non compatible with postgresql 2019-03-18 11:10:37 +01:00
Laurent Destailleur
3716834b0a Fix bad var name 2019-03-09 01:13:15 +01:00
Laurent Destailleur
f0c2b3a151 Bette error message 2019-03-08 20:07:22 +01:00
Laurent Destailleur
b766031abf Try to fix error on pgsql 2019-03-08 20:06:09 +01:00
Frédéric FRANCE
906e1b8425 Merge remote-tracking branch 'upstream/develop' into patch-2 2019-03-05 18:21:46 +01:00
Laurent Destailleur
4aa93181d3 Fix phpunit 2019-03-05 18:17:26 +01:00
Frédéric FRANCE
0c2a77cb53 Merge remote-tracking branch 'upstream/develop' into patch-2 2019-03-05 18:14:15 +01:00
Laurent Destailleur
756b9ca07f Fix phpunit 2019-03-05 16:51:16 +01:00
Frédéric FRANCE
2f3c3aeb05 test 2019-03-04 21:24:48 +01:00
Frédéric FRANCE
16c73af0cb remove test ticketlog 2019-03-04 20:16:18 +01:00
Laurent Destailleur
1d6028dfb0 FIX PHPUnit 2019-03-04 19:38:52 +01:00
Laurent Destailleur
a5711a51ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php
 2019-03-02 18:30:17 +01:00
Frédéric FRANCE
40d34940f1 fix exclude from phpcs 2019-03-02 10:00:51 +01:00
Frédéric FRANCE
be8db31388 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-03-01 19:24:27 +01:00
Laurent Destailleur
1cb3bad7f8 Rename file 2019-03-01 19:01:47 +01:00
Frédéric FRANCE
81f2f99db5 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-26 21:16:01 +01:00
Laurent Destailleur
9e82c37963 WIP Start module BOM 2019-02-26 19:27:04 +01:00
Frédéric FRANCE
42a1387218 wip 2019-02-25 00:56:48 +01:00
klemens
beb2791dde spelling fixes 2019-02-10 12:59:09 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00