Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
119,231 Commits 36 Branches 189 Tags
8b7eaf360e58693a9365544cb1520f28ced7e626
Commit Graph

1397 Commits

Author SHA1 Message Date
Laurent Destailleur
cffec01451 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	test/phpunit/SecurityTest.php
 2022-05-09 22:04:36 +02:00
Laurent Destailleur
ef18456724 Fix regression in dol_eval 2022-05-09 21:56:21 +02:00
Laurent Destailleur
822a0a37f3 Fix phpunit 2022-04-28 22:37:21 +02:00
Laurent Destailleur
d143b8bf6e Debug dol_uncompress and add phpunit tests 2022-04-05 17:19:12 +02:00
Laurent Destailleur
ea61e51730 Fix phpunit 2022-04-04 14:00:39 +02:00
Laurent Destailleur
7e34ce7245 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/main.inc.php
 2022-04-02 15:39:15 +02:00
Laurent Destailleur
9c00115abe FIX #yogosha9754 2022-04-02 14:32:53 +02:00
Laurent Destailleur
c2a088c5ff Fix regression in phpunit 2022-03-26 12:34:52 +01:00
Laurent Destailleur
592a277091 FIX ZATCA Encoding 2022-03-19 19:17:22 +01:00
Laurent Destailleur
cb93ab472d FIX ZATCA Encoding 2022-03-19 19:14:12 +01:00
Laurent Destailleur
b339e1a883 Enhance phpunit on sql code testing 2022-03-07 19:37:53 +01:00
Laurent Destailleur
d6852c31b8 Clean code 2022-03-07 19:31:06 +01:00
Laurent Destailleur
8655592aea Fix bad merge 2022-03-03 09:51:12 +01:00
Laurent Destailleur
4f17f45e99 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	test/phpunit/SecurityTest.php
 2022-03-03 02:17:53 +01:00
Laurent Destailleur
246474b39b Fix phpunit 2022-03-03 02:15:52 +01:00
Laurent Destailleur
0fed4dae13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2022-03-03 01:59:31 +01:00
Laurent Destailleur
3c3d6ab0da Fix regression. Add unit test to detect it. 2022-03-03 01:17:44 +01:00
Laurent Destailleur
72965fdb2e # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-03-01 19:13:28 +01:00
Laurent Destailleur
3e1580475c Fix phpunit 2022-03-01 19:05:33 +01:00
Laurent Destailleur
20a3a429ed Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-01 18:22:39 +01:00
Laurent Destailleur
2e38caa950 phpunit 2022-03-01 18:22:09 +01:00
Laurent Destailleur
12b2a10865 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-01 18:15:13 +01:00
Laurent Destailleur
883f13b388 Fix regression verifCond 2022-03-01 18:14:24 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
a08bbd6acd Fix regression 2022-03-01 00:11:30 +01:00
Laurent Destailleur
9cc79de31b Clean code 2022-03-01 00:02:23 +01:00
Laurent Destailleur
67881a7932 Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Laurent Destailleur
2f0040e9c1 Fix phpunit 2022-02-23 19:24:17 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Alexandre SPANGARO
0d1ee4e19f Fix stickler-ci 2022-02-14 11:51:05 +01:00
Laurent Destailleur
5294a9ae2f Merge pull request #19949 from hregis/fix_works_to_add_prefix_db_function 
Works on replace MAIN_DB_PREFIX by $db->prefix()
 2022-02-04 11:09:51 +01:00
Laurent Destailleur
3b8ece6c0b Fix php8 2022-01-31 21:46:35 +01:00
Regis Houssin
5f376685c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_works_to_add_prefix_db_function 2022-01-30 11:28:29 +01:00
Laurent Destailleur
ef70777cf1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/reception/card.php
 2022-01-28 15:57:09 +01:00
Regis Houssin
b537e888e9 FIX exclude link.class.php from Check string $db-> inside a class filee 2022-01-27 13:18:40 +01:00
Regis Houssin
b07fff5754 FIX Travis avoid error "you should use $this->db-> inside a class file" 2022-01-27 13:06:43 +01:00
Regis Houssin
f68a40b64a FIX Travis error - add 'db->prefi' 2022-01-27 11:16:26 +01:00
Laurent Destailleur
42f252b636 Add one more test 2022-01-26 12:39:41 +01:00
Laurent Destailleur
00eabded6d Fix phpunit 2022-01-24 12:43:42 +01:00
Laurent Destailleur
0ee0bfed85 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/fourn/commande/card.php
	test/phpunit/testvirus.txt
 2022-01-23 13:04:37 +01:00
Laurent Destailleur
4888d127e0 Make virus file no more detected. 2022-01-23 12:59:15 +01:00
Laurent Destailleur
db903ad64d Fix #yogosha8457 2022-01-19 16:40:48 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
b9b45fb506 Fix #hunterf1d1ce3e-ca92-4c7b-b1b8-934e28eaa486 
Conflicts:
	test/phpunit/CodingPhpTest.php
 2022-01-13 18:46:29 +01:00
Laurent Destailleur
4fe3650736 Fix #hunterf1d1ce3e-ca92-4c7b-b1b8-934e28eaa486 2022-01-13 18:34:15 +01:00
Laurent Destailleur
00108589fd Fix creation of fields tms into sql scripts 2022-01-11 01:00:31 +01:00
Laurent Destailleur
7ff30761e1 Fix for php8 2022-01-10 15:52:45 +01:00
Laurent Destailleur
eddc2a1a26 FIX #yogosha8272 2022-01-08 19:50:55 +01:00
Laurent Destailleur
956288081c Fix phpunit 2022-01-04 13:45:18 +01:00