Laurent Destailleur 38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ...

Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php

2020-01-04 14:20:25 +01:00

..

activity

Fix $_SESSION['newtoken'] must be newToken()

2019-12-18 23:12:31 +01:00

admin

Fix $_SESSION['newtoken'] must be newToken()

2019-12-18 23:12:31 +01:00

ajax

Move Gnu.org to https

2019-09-23 21:55:30 +02:00

class

Update images

2019-12-21 17:11:21 +01:00

stats

Scrutinizer Auto-Fixes

2019-11-13 18:35:02 +00:00

tasks

Fix $_SESSION['newtoken'] must be newToken()

2019-12-18 23:12:31 +01:00

card.php

Fix $_SESSION['newtoken'] must be newToken()

2019-12-18 23:12:31 +01:00

comment.php

Scrutinizer Auto-Fixes

2019-11-13 18:35:39 +00:00

contact.php

replace deprecated user->societe_id by user->socid

2019-10-31 20:46:31 +01:00

document.php

replace deprecated user->societe_id by user->socid

2019-10-31 20:46:31 +01:00

element.php

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

2020-01-04 14:20:25 +01:00

ganttchart.inc.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00

ganttview.php

Scrutinizer Auto-Fixes

2019-11-13 18:37:08 +00:00

graph_opportunities.inc.php

Scrutinizer Auto-Fixes

2019-11-13 18:35:02 +00:00

index.php

Fix $_SESSION['newtoken'] must be newToken()

2019-12-18 23:12:31 +01:00

info.php

Scrutinizer Auto-Fixes

2019-11-22 13:14:59 +00:00

jsgantt_language.js.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00

list.php

Update images

2019-12-21 17:11:21 +01:00

note.php

replace deprecated user->societe_id by user->socid

2019-10-31 20:46:31 +01:00

tasks.php

factoring token usage

2019-12-01 10:20:11 +01:00