Laurent Destailleur c573df4f0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/user/card.php

2017-08-26 22:33:56 +02:00

..

admin

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0

2017-08-23 16:11:51 +02:00

ajax

Look and feel v6

2017-06-21 11:37:34 +02:00

canvas

Fix GETPOST of lang_id

2017-06-27 17:27:01 +02:00

checkvat

Standardize code

2017-05-13 17:04:46 +02:00

class

Fix: missing entity filter (multicompany)

2017-07-12 11:00:18 +02:00

notify

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

tpl

Work on 6.0 look and feel

2017-03-31 17:41:20 +02:00

agenda.php

Fix remove warnings

2017-07-13 00:35:10 +02:00

ajaxcompanies.php

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-06-18 21:13:48 +02:00

ajaxcountries.php

Escape hml tags

2017-06-18 19:42:59 +02:00

card.php

Merge

2017-08-23 17:14:29 +02:00

commerciaux.php

Look and feel v6

2017-07-01 14:23:24 +02:00

consumption.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

document.php

Look and feel v6

2017-07-01 14:23:24 +02:00

index.php

New: getEntity function use true $shared value by default

2017-05-30 18:50:54 +02:00

list.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-08-26 22:33:56 +02:00

note.php

Look and feel v6

2017-07-01 14:23:24 +02:00

price.php

Fix remove warnings

2017-07-13 00:35:10 +02:00

project.php

Look and feel v6

2017-07-01 14:23:24 +02:00

rib.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-08-02 17:56:09 +02:00

societecontact.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00