Laurent Destailleur 546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php

2018-05-05 14:40:39 +02:00

..

activity

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

2018-05-05 14:40:39 +02:00

admin

FIX Can't edit option PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY

2018-04-23 21:33:49 +02:00

ajax

Create projects.php

2017-06-11 00:35:03 +02:00

class

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

2018-05-05 14:40:39 +02:00

stats

CSS

2018-05-01 10:42:09 +02:00

tasks

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

2018-05-05 14:40:39 +02:00

card.php

Fix syntax error

2018-04-13 13:37:43 +02:00

comment.php

Fix regression introduced with task comments

2017-12-15 20:07:35 +01:00

contact.php

Fix date start/end of project are day not hours

2018-02-15 02:02:32 +01:00

document.php

display user-friendly filesize

2018-04-12 15:29:22 +02:00

element.php

FIX avoid "Array" on screen

2018-03-13 15:29:52 +01:00

ganttchart.inc.php

Fix <br /> (xml) into <br> (html)

2018-01-17 13:26:57 +01:00

ganttview.php

css

2018-05-04 17:55:29 +02:00

graph_opportunities.inc.php

Fix for multicompany

2018-02-06 10:57:53 +01:00

index.php

Standardize interface

2017-11-16 18:33:56 +01:00

info.php

Fix look and feel v7

2017-12-04 20:17:07 +01:00

jsgantt_language.js.php

Clean defined constant at begin of pages

2018-04-21 12:00:55 +02:00

list.php

FIX label in getnomurl projectlist

2018-05-03 11:47:31 +02:00

note.php

NEW Architecture to manage search criteria persistance (using

2017-05-19 00:52:13 +02:00

tasks.php

css

2018-05-04 17:55:29 +02:00