Juanjo Menent f4ca6916cd Merge remote-tracking branch 'upstream/7.0' into 8.0 ...

# Conflicts:
#	htdocs/contrat/services_list.php
#	htdocs/expensereport/list.php
#	htdocs/projet/list.php

2019-05-11 17:31:23 +02:00

..

activity

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

2019-04-08 14:04:42 +02:00

admin

clean and update code

2018-06-10 18:29:04 +02:00

ajax

loadlangs

2018-05-26 21:11:25 +02:00

class

FIX Remane of project

2019-03-26 12:35:44 +01:00

stats

clean and update code

2018-06-10 18:29:04 +02:00

tasks

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

2018-08-23 19:50:58 +02:00

card.php

FIX content lost when editing a label with "

2018-10-15 11:05:04 +02:00

comment.php

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

2018-08-23 19:50:58 +02:00

contact.php

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

2018-08-23 19:50:58 +02:00

document.php

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

2018-08-23 19:50:58 +02:00

element.php

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

2018-10-19 14:27:15 +02:00

ganttchart.inc.php

…

ganttview.php

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

2018-08-23 19:50:58 +02:00

graph_opportunities.inc.php

Fix for multicompany

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

index.php

clean and update code

2018-06-10 18:29:04 +02:00

info.php

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

2018-08-23 19:50:58 +02:00

jsgantt_language.js.php

Clean defined constant at begin of pages

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

list.php

Merge remote-tracking branch 'upstream/7.0' into 8.0

2019-05-11 17:31:23 +02:00

note.php

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

2018-08-23 19:50:58 +02:00

tasks.php

FIX Warning: count()

2018-11-08 12:12:45 +01:00