Commit Graph

89531 Commits

Author SHA1 Message Date
Laurent Destailleur
4e2aff2cdc Fix sql injection when forging requests with IN 2020-09-18 17:28:02 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Laurent Destailleur
d75e1e5771 Fix #yogosha4525 2020-09-18 16:10:11 +02:00
Laurent Destailleur
72d5850a5f Fix regression 2020-09-18 15:45:26 +02:00
Laurent Destailleur
2697f604d5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/document.php
2020-09-18 14:58:16 +02:00
Laurent Destailleur
4decf20aaa Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-18 14:56:38 +02:00
Laurent Destailleur
5d3168c2a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-18 14:55:58 +02:00
Laurent Destailleur
37c9afebd9 Fix regression 2020-09-18 14:55:32 +02:00
Laurent Destailleur
cf8e8ee68b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/document.php
2020-09-18 14:54:20 +02:00
Laurent Destailleur
8740778aa8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-18 14:51:26 +02:00
Laurent Destailleur
f09aea90df Fix bad test 2020-09-18 14:51:04 +02:00
Laurent Destailleur
56a9f5c48b Fix 2020-09-18 14:49:20 +02:00
Laurent Destailleur
0b2aa2b01d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/lib/functions.lib.php
2020-09-18 14:48:40 +02:00
Laurent Destailleur
07556e061d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/contact/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/document.php
2020-09-18 14:46:23 +02:00
Laurent Destailleur
4e56115d2d Fix No CSRF for install module using GET 2020-09-18 14:35:30 +02:00
Laurent Destailleur
2fe9514b6b Doc 2020-09-18 14:01:00 +02:00
Laurent Destailleur
9134892c71 Fix remove useless code 2020-09-18 13:58:09 +02:00
Laurent Destailleur
cc5d648888 Enhance the anti injection layer 2020-09-18 13:41:50 +02:00
Laurent Destailleur
cddec2f4dc Fix XSS 2020-09-18 13:25:56 +02:00
Laurent Destailleur
1ad6461ade Fix #yogosha4500 2020-09-18 06:10:41 +02:00
Laurent Destailleur
a7a8ca0a6b Fix phpcs 2020-09-18 06:03:59 +02:00
Laurent Destailleur
b35db6b9dd Clean code managing canvas 2020-09-18 06:02:52 +02:00
Laurent Destailleur
b49211b278 Phpcs 2020-09-18 05:37:20 +02:00
Laurent Destailleur
ca2e79395c typo 2020-09-18 05:35:37 +02:00
Laurent Destailleur
05d85ee4c1 Update scope 2020-09-18 05:34:50 +02:00
Laurent Destailleur
bb55572abf Update scope of security 2020-09-18 05:11:29 +02:00
Laurent Destailleur
234b9f1f57 Fix CSRF 2020-09-18 05:07:58 +02:00
Laurent Destailleur
aa3f906370 Standardize code 2020-09-18 04:53:43 +02:00
Laurent Destailleur
534846c5c7 NEW Framework is ready for CSRF token protection on explicit GET URLs. 2020-09-18 04:30:24 +02:00
Laurent Destailleur
8d77bfacd2 Fix #yogosha4490 2020-09-18 03:07:13 +02:00
Laurent Destailleur
c94b3f6584 Fix transversal URL #yogosha4513 2020-09-18 01:57:23 +02:00
Laurent Destailleur
801712b423 Fix phpcs 2020-09-18 01:41:42 +02:00
Laurent Destailleur
11b1e0b420 Escape output 2020-09-18 01:39:32 +02:00
Laurent Destailleur
7704375ccd Fix GETPOST 2020-09-18 01:36:06 +02:00
Laurent Destailleur
dc22f3ca19 Fix phpcs 2020-09-18 01:30:36 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
fa1d14fc7d More complete phpunit 2020-09-18 01:01:01 +02:00
Laurent Destailleur
27d03a2034 Better support of SFTP for the FTP module 2020-09-18 00:36:24 +02:00
Laurent Destailleur
57ff4784b1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-17 23:17:33 +02:00
Laurent Destailleur
13646ff41e Fix #yogosha4516 2020-09-17 23:16:48 +02:00
Laurent Destailleur
f55ad8a51c
Merge pull request #14767 from Tim-Otte/fix-missing-hash-in-html-to-odt-converter
FIX: HTML to ODT converter
2020-09-17 23:07:10 +02:00
Laurent Destailleur
937d656f46 Fix #yogosha4515 2020-09-17 23:02:09 +02:00
Laurent Destailleur
7056c19cd2 css 2020-09-17 22:35:05 +02:00
Laurent Destailleur
9eaf2be9ab Prepare code for fix 2020-09-17 22:26:54 +02:00
Laurent Destailleur
9f0ca6f6fc Add file 2020-09-17 22:12:59 +02:00
Laurent Destailleur
5744b1e0a3 Fix #yogosha4512 2020-09-17 21:34:31 +02:00
Laurent Destailleur
a895cdcdf8 Fix dol_string_nohtmltag: the decode of entity must be done before split 2020-09-17 21:09:16 +02:00
Laurent Destailleur
f5908c29da Fix regression in website module to get javascript files 2020-09-17 20:55:20 +02:00
Laurent Destailleur
0f0e4feeaf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modSociete.class.php
2020-09-17 19:33:29 +02:00
Laurent Destailleur
caaf0d370a Fix #yogosha4474 2020-09-17 19:01:01 +02:00