Laurent Destailleur 6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php

2015-02-23 14:59:24 +01:00

..

antivir.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

canvas.class.php

Fix missing test of action when using canvas

2015-02-16 02:02:11 +01:00

ccountry.class.php

…

CMailFile.class.php

…

commondocgenerator.class.php

Update commondocgenerator.class.php

2015-01-12 18:18:43 +01:00

commoninvoice.class.php

Type of supplier invoice was broken

2015-01-20 17:55:20 +01:00

commonobject.class.php

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

2015-02-21 12:58:14 +01:00

commonobjectline.class.php

…

commonorder.class.php

…

conf.class.php

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

2014-12-07 12:07:53 +01:00

cookie.class.php

…

CSMSFile.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

ctypent.class.php

…

discount.class.php

Add dol_escape_htmltag and start to adapt boxes

2015-01-22 00:23:55 +01:00

doleditor.class.php

Add hidden option FCKEDITOR_ALLOW_ANY_CONTENT to solve bug of editor not

2015-02-20 15:48:54 +01:00

dolexception.class.php

…

dolgeoip.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

dolgraph.class.php

…

dolprintipp.class.php

PHPCS

2014-12-21 02:21:12 +01:00

events.class.php

Maxi debug and enhancement of module batch.

2015-02-11 22:54:06 +01:00

extrafields.class.php

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

2015-02-23 14:59:24 +01:00

fileupload.class.php

…

fiscalyear.class.php

…

genericobject.class.php

…

google.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

hookmanager.class.php

better translation and typo

2015-01-01 11:24:00 +01:00

html.form.class.php

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

2015-02-21 12:58:14 +01:00

html.formactions.class.php

…

html.formadmin.class.php

…

html.formbank.class.php

…

html.formbarcode.class.php

…

html.formcompany.class.php

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

2015-02-19 00:01:26 +01:00

html.formcontract.class.php

…

html.formcron.class.php

…

html.formfile.class.php

Finished new module to manage expense reports !

2015-02-22 13:16:49 +01:00

html.formintervention.class.php

…

html.formmail.class.php

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

2015-02-23 14:59:24 +01:00

html.formmailing.class.php

…

html.formorder.class.php

…

html.formother.class.php

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

2015-02-19 00:01:26 +01:00

html.formprojet.class.php

Work on expense report module

2015-02-21 15:18:05 +01:00

html.formpropal.class.php

…

html.formsms.class.php

…

html.formsocialcontrib.class.php

…

index.html

…

infobox.class.php

…

interfaces.class.php

…

ldap.class.php

Misc Adherents PHPDoc corrections

2015-02-10 10:45:48 +01:00

link.class.php

Fix: [ bug #1533 ] Links triggers do not show trigger error message

2014-12-23 11:39:43 +01:00

menu.class.php

…

menubase.class.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-01-18 17:13:42 +01:00

mobiledetect.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

notify.class.php

…

openid.class.php

Fix: PHPCS

2014-12-05 20:18:30 +01:00

rssparser.class.php

Fix bad operator for and

2015-02-03 13:05:28 +01:00

smtps.class.php

…

stats.class.php

…

translate.class.php

…

vcard.class.php

PHPDoc and misc fixes for several folders

2015-02-10 13:32:00 +01:00

WorkboardResponse.class.php

Renamed WorkBoardResponse to WorkboardResponse

2015-02-16 23:52:49 +01:00