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

Conflicts:
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/CMailFile.class.php
	htdocs/filefunc.inc.php

2017-08-28 12:53:02 +02:00

..

admin

NEW Add last activation author and ip of modules

2017-05-06 20:43:14 +02:00

class

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

2017-08-01 10:22:37 +02:00

group

Fix translation done twice into field title of array

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

notify

Fix translation done twice into field title of array

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

agenda_extsites.php

Fix code comment

2017-06-10 12:56:28 +02:00

bank.php

Debug journalization

2017-07-15 12:37:31 +02:00

card.php

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

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

clicktodial.php

Fix code comment

2017-06-10 12:56:28 +02:00

document.php

Fix code comment

2017-06-10 12:56:28 +02:00

hierarchy.php

Fix translation done twice into field title of array

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

home.php

New: big refactorization of multicompany transverse mode

2017-06-06 10:23:33 +02:00

index.php

Fix translation done twice into field title of array

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

info.php

Add badge with nb of imported calendard on user tab

2017-05-06 12:43:45 +02:00

ldap.php

Fix look and feel v6

2017-07-31 12:43:07 +02:00

logout.php

Fix: remove unused old code

2017-07-23 12:07:20 +02:00

note.php

Fix code comment

2017-06-10 12:56:28 +02:00

param_ihm.php

Fix code comment

2017-06-10 12:56:28 +02:00

passwordforgotten.php

Fix: add resprint for passwordforgotten

2017-08-28 09:14:50 +02:00

perms.php

Fix: missing hookmanager init

2017-06-16 17:01:43 +02:00