Commit Graph

83620 Commits

Author SHA1 Message Date
Jamie Slome
7359c95efa
Merge pull request #9 from spooky360/develop
Fix for Self XSS vuln in dolibarr
2020-08-10 14:25:31 +01:00
spooky360
a94fa93973 Fixed missing quote... => Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr) 2020-08-05 17:11:19 +02:00
spooky360
b9513255fd Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr). 2020-08-05 17:02:59 +02:00
Jamie Slome
2d9162aedb
Merge branch 'develop' into develop 2020-02-17 10:49:41 +00:00
Jamie Slome
1bbe4469f1
Merge pull request #1 from mufeedvh/develop
Merging fix - on-behalf of @mufeedvh, executed by huntr.dev (011-php-dolibarr).
2020-02-17 10:33:46 +00:00
Jamie Slome
59572f15a9
Merge pull request #2 from 0xRoM/develop
Merging fix - on-behalf of @0xRoM, executed by huntr.dev (011-php-dolibarr).
2020-02-17 10:32:57 +00:00
Laurent Destailleur
4b5cda5cd2 Code comment on OAUth ahtent 2020-02-16 21:16:00 +01:00
Laurent Destailleur
20797920d7 Fix phpcs 2020-02-16 19:35:52 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
52aebce789 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-16 18:16:05 +01:00
Laurent Destailleur
ac7a077c77 FIX Vulnerability in module from modulebuilder. Only fields with type
html can contains HTML.
2020-02-16 18:14:10 +01:00
Laurent Destailleur
5b87b12e64 FIX Vulnerability reported by code16 2020-02-16 18:06:25 +01:00
Laurent Destailleur
7cdfc3ca65 FIX HTML Injection 2020-02-16 12:55:32 +01:00
Laurent Destailleur
dc3a15945d Add method getKanbanView() 2020-02-16 12:05:00 +01:00
Laurent Destailleur
ed778bd28f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/public/ticket/view.php
2020-02-15 18:13:35 +01:00
Laurent Destailleur
9b6179850a CSS 2020-02-15 18:07:49 +01:00
Laurent Destailleur
f14cd9f49f Look and feel v11 2020-02-15 18:07:23 +01:00
Laurent Destailleur
2b3cc0d048 Fix add both public id and ref in topic 2020-02-15 18:00:09 +01:00
Laurent Destailleur
f47966a25a NEW Restore version of application on main screen for screenshot 2020-02-15 17:20:11 +01:00
Laurent Destailleur
6c9fb06292 Perf 2020-02-15 10:56:44 +01:00
Laurent Destailleur
824dac31d9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-15 10:41:39 +01:00
Laurent Destailleur
69bd616e73 css 2020-02-15 10:40:32 +01:00
Laurent Destailleur
a312adf2b0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
2020-02-14 19:57:31 +01:00
Laurent Destailleur
d3d572c8d3 FIX Avoid to download the export if we just press enter to refresh form 2020-02-14 19:55:50 +01:00
Laurent Destailleur
a7df72ee6f FIX #13067 2020-02-14 19:34:26 +01:00
Laurent Destailleur
58a2a71605
Merge pull request #13067 from maboelfotoh/custom
NEW add Opening Balance column to balance.php
2020-02-14 19:25:18 +01:00
Laurent Destailleur
35ada37d4d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/filefunc.inc.php
2020-02-14 19:14:26 +01:00
Laurent Destailleur
58ad62aa7b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-14 19:12:11 +01:00
Laurent Destailleur
3bc122ecf6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-14 19:05:58 +01:00
Laurent Destailleur
3faed758b3 FIX #13110 2020-02-14 19:05:39 +01:00
Laurent Destailleur
c033b00ef3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-14 19:04:19 +01:00
Laurent Destailleur
4d29cb17de FIX #13110 2020-02-14 19:04:08 +01:00
Laurent Destailleur
88f0cc1331
Merge pull request #13113 from aspangaro/9.0_FEC
FIX: Force FEC export to txt format
2020-02-14 18:56:31 +01:00
Alexandre SPANGARO
72e59e6fe2 FIX: Force FEC export to txt format 2020-02-14 16:07:06 +01:00
Laurent Destailleur
525219836a
Merge pull request #13097 from josemariagomezroncero/patch-2
Hook for dynamic price
2020-02-13 18:54:22 +01:00
Laurent Destailleur
886e76b6db Fix doc 2020-02-13 18:48:43 +01:00
Laurent Destailleur
921cc08743 Fix url 2020-02-13 18:41:03 +01:00
Laurent Destailleur
7e2e0b3986 Fix readme 2020-02-13 18:26:55 +01:00
Laurent Destailleur
f0596b4bcf Prepare 11.0.1 2020-02-13 18:11:48 +01:00
Laurent Destailleur
e0dd31389c Prepare 11.0.1 2020-02-13 18:05:02 +01:00
Laurent Destailleur
bb895cb1d8 FIX ref_client not visible in tooltip. 2020-02-13 18:00:59 +01:00
Laurent Destailleur
fc018d0063 Module MO is now stable 2020-02-13 17:24:29 +01:00
Laurent Destailleur
c196342fd8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-13 15:44:06 +01:00
Laurent Destailleur
ec30938a07 Fix phpcs 2020-02-13 15:43:53 +01:00
Laurent Destailleur
306b8d190f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 15:42:54 +01:00
Laurent Destailleur
c6c941e09a Fix phpcs 2020-02-13 15:42:41 +01:00
Muhammad Aboelfotoh
ce6cf04028 Add new view for balance.php that additionally shows opening balance 2020-02-13 13:53:07 +00:00
josemariagomezroncero
0d49211dea
Correction for Hook for dynamic price
Correction for Hook for dynamic price
2020-02-13 12:59:59 +01:00
Laurent Destailleur
82535291c0
Merge pull request #13103 from ATM-Marc/FIX_11.0_situation_excess_recieved
FIX: situation invoices: can't convert excess received to discount & bad previous payment amount
2020-02-13 12:42:22 +01:00
Laurent Destailleur
24290659b2
Merge pull request #13104 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
2020-02-13 12:41:13 +01:00