abb 23c0a0a64e conflict solved Merge branch 'develop' into abb-14 ...

Conflicts:
	htdocs/langs/en_US/companies.lang

2016-05-02 01:28:46 +01:00

..

admin

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

class

New API methods

2016-04-27 08:59:12 +02:00

group

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

notify

Update card.php

2016-03-14 23:29:21 +01:00

agenda_extsites.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

bank.php

NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown

2016-03-19 23:00:33 +01:00

card.php

NEW Mutualize code: Use one call of function "addThumbs", when possible,

2016-04-09 14:12:21 +02:00

clicktodial.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

document.php

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

hierarchy.php

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

home.php

Enhance css of search fields

2016-03-13 20:38:16 +01:00

index.php

Merge remote-tracking branch 'origin/3.9' into develop

2016-04-12 15:05:18 +02:00

info.php

Include the link "Back to list" on banner of all user tabs.

2015-11-04 15:45:35 +01:00

ldap.php

[Qual] Uniformize code

2015-12-21 14:43:21 +01:00

logout.php

…

note.php

Include the link "Back to list" on banner of all user tabs.

2015-11-04 15:45:35 +01:00

param_ihm.php

Fix to be able to use dolibarr with a smartphone

2016-01-03 19:34:19 +01:00

passwordforgotten.php

Fix param for username is $username and not $login

2015-12-21 03:01:37 +01:00

perms.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00